diff --git a/Manifest b/Manifest
index 85e9f414e4e6..98cfc3080bb4 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29413 BLAKE2B 14d1a7208b757985a52d084d774ec1b8738584aa6af5b1973891f4770b34cf9f6e42bbc70823633a79adfbc7fafc13144cfc1ed425981f7df4836dd921707550 SHA512 92d6a135608c05e2eccc6c035ba4c36207aa152a25bd80033d6e80ffde6f8168aca73be0e2af6b6b1c4ae159bb3bd76d1525290bd19da07195a2c54818f3e5f0
-TIMESTAMP 2020-07-16T10:08:24Z
+MANIFEST Manifest.files.gz 29442 BLAKE2B be02ad57c59ca74d2b88257b3f63259aa0d3dca511c01afad7f19b9180ee21b8d278bebce27dc254c882d4e5c41cc412ec1a5f10d8f0188c9566576d95dd3d3c SHA512 7263c5275d838d673663419edce8648fbda2d09aae451f15a52fe5a46df2604f2cde76d1cea020ffce32954de874e8fdefca724cbad12ece860a36c6b2a46862
+TIMESTAMP 2020-07-17T06:08:30Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8QJxhfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8RQF5fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAquxAAjdwWZbbKVB9xmc2yHPOP+upRc+bwpegLy25hQwYRfn/SDYUEl62IqlBD
-ia0tcaRyuXApwExj+d8H9yzfzVQiTt6Hw4U1Rfd3bPdqND/yw+A+IFE+3na9qIlI
-h/Oipqbv8t+xNjaOTyRYT1pG191xX2Ugy4lbXkjakwQentt8n+iHTTnKIsNKiGqU
-t8xSG89U30pA1iiuFNvQIiWc41Sx3pToKM5ATXbXHkl0rW61VaxbjQTbXmC037sp
-ko5lv2gnCQc3hCuVi+mGfTO3cVFAKWws/u69teD8eDAzVeUKPhvSopS8tne3jVaA
-djAu5GtCEUC2FXY3QJyiq8akogyiemIHRpkVEd5TVt8c9jXQ8FiCFtEXQbr8Jrw0
-PHs2KE5lic6Cp4kiq+rMTx25L401bqd/hHSuiPMfpR9Q0iqrjEtcTdCV1TFA7XMJ
-RHA8BUmideKL5l0U0PhXhieas2DhGe3NLnvReQnvudLKBn1znO6CxB+gj4knLQGE
-ivd8e7NAdsl/Q3AQcf8hOxkLDimaZz7RcXhKM6t0xAgkkINRrs/9ZIkXf/BfZtHg
-G6bSTzN1qhKL5Ih2ECdXvIIAPmjyxTtbXshc4imtCgvhlJxq3a2OQ+Iz/ehnSbfx
-XsE3Ssr/GULCA8KlG17UQgm1b/M4f0U11J0yHH1zpOgx3OPaL7c=
-=zg0p
+klDi/xAAlvJ44xKV/wPDf3NUsXpLP6NeD++TIvMO3ilecm7v6NfxM3+S3ZsuysGY
+l6JdQEVl8BvMMTqoCP8Vq+Avi8kpWisjVKuMOFOfU/Sds8ypAWWKzVZeagNHKw6z
+qOdHoUwDq+3HKmhLvr/pciRwPrw2DYkv8lQFBTz87rtEvYdL/r4MF/JMRDmxhnpe
+gOw+ZGPizAGi/fcsquZsT9CjS0+vMzTsSu77RK+/TO1H0b8MLSeCtFXrREe0p7E/
+pPtyCZWpyRfxzcsxIXJGSrcysUiVAYOOfdaFyPNC2KvB6kmvOp8xMnZii5SJF2ng
+gzTZ6KUfP8XbZ/r/dUSqAeS7wau2txHxBU0QFE/GW13qSb2+L4Mq6JgoCmZZ+4oX
+69/2hd339hyXSRHeN8vtN07mFo6YreL/s0hlfEBhhwbhzeP65Yybp+O4tIIJzdTZ
+OIkz9M2bNCuQbDrwANgHhAsyATeZpjylp+HLcknZHXvid7VM1EIiHK5GexV7x7nI
+JGV1vRNlxJ2z/Ud+PwWrfUzlbvnMYEdIZ7w0rEDs5kQr9KY53UBbqnEP5QYZlc85
+fsyDOQu7jUro1cQjCg3wH7DlC0/owzXOxShqypd9OtR08fj/t18DDe5q4f69pPWo
+vq+M5koeENvO0EjcHm2vouwxuGOyBHuGwWFJZzD2mIF2g9FdQ0g=
+=vK9o
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 628baf5a941f..a83ce1de0646 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 428dc0d69afb..b31b3e9442cf 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/exo/Manifest b/app-admin/exo/Manifest
index f72c70a4cabc..8fd8274b4df4 100644
--- a/app-admin/exo/Manifest
+++ b/app-admin/exo/Manifest
@@ -1,3 +1,3 @@
-DIST exo-1.11.0.tar.gz 3805742 BLAKE2B 9b23e750545322510c56a3364b79a6a40c90c42a4bf41bcf1b23f77a5a90a9ff8944693e77fe4b4d9f9baec920af31528e52003d840f19e49911b441241c4400 SHA512 501752d896b0856681f5fc5d4072a0b7b3ac4c40c8a742ead26f94de33da374c43888e7112bcddebb37c3e02b3657e50c3f7d52097845cf8d38c1ebe31af6240
-EBUILD exo-1.11.0.ebuild 568 BLAKE2B ac4e2be4f39e1bfc63d5007b5940f334888b774773a073424992b3ae790c74375d2429869f56cf497c6629acdeec1ab2e79b049f3618f3469320b99071ee86c1 SHA512 e09154e545f36227c8dbf7785806f9c6710655dcce624b4585a30d78e11e8287b014d0434132691ac21d411f26ce2a9fae1dd28e9dded1184d6c8284e4026986
+DIST exo-1.14.0.tar.gz 4268326 BLAKE2B 5449003cf3b4828c40ecee2027174a407096a926807e781d847bf04fe5a10913da8308300bfe0b1bd444bb1696afb73369237a5e3260271c72239cfdf96d0c1b SHA512 ba8379580e1ae964e97b6f45f9f5c0c74803ce4ec6c0fbdef1885771c7ed0d30ebe332dcdbb45875365894c105136588880ef26fa8769f9a4c700cf67b3f1430
+EBUILD exo-1.14.0.ebuild 568 BLAKE2B ac4e2be4f39e1bfc63d5007b5940f334888b774773a073424992b3ae790c74375d2429869f56cf497c6629acdeec1ab2e79b049f3618f3469320b99071ee86c1 SHA512 e09154e545f36227c8dbf7785806f9c6710655dcce624b4585a30d78e11e8287b014d0434132691ac21d411f26ce2a9fae1dd28e9dded1184d6c8284e4026986
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/app-admin/exo/exo-1.11.0.ebuild b/app-admin/exo/exo-1.14.0.ebuild
similarity index 100%
rename from app-admin/exo/exo-1.11.0.ebuild
rename to app-admin/exo/exo-1.14.0.ebuild
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 1866b73319b8..e12ccedf5dc9 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -2,9 +2,11 @@ DIST sudo-1.8.31.tar.gz 3350674 BLAKE2B de5a968732fdd58933b4c513d13c43a08cb50075
 DIST sudo-1.8.31p1.tar.gz 3351312 BLAKE2B 85775ef574a3a1a9cc749809fe81f8350f7a4e3f46a905bc3392790b20bb7bc8e3c99fb504e01776f3a92aa6afa7972d3ff1c071aadd3a08ee1d2281f8b9ba50 SHA512 9344fd1d8a8445e8afb9c5628cdc832fe32ea29199f071f35fb6ec694371801556df560f4382afec199f468b1f3264ad5e3a89e964612e571b8d911f823724cc
 DIST sudo-1.9.0.tar.gz 3743850 BLAKE2B 47d557afb13eee300d379ae31aae34cf7cf1e5ad140c6d7e599f687cca2cc259ec17f9ec0b3ca6f0badef81bb6e9d659e3e2bb77d9994218a9a3d88ec7ff2c19 SHA512 f2a191ea5fc65865718b110d4aca187cb5e2cd55c9c891fab32f21401e56f825f34c373e346c55c64fa49cec4d802efb63ccebf3d4a4e31d9a433077daf013b1
 DIST sudo-1.9.1.tar.gz 3834744 BLAKE2B 835eaae5b61627da65f40f04646b261093c56f77bdfb1b64f746e569a4bfafcfbb31d88ab301bf8544a8714f43d3416a792ee8b0fdcb75d81dbc6fcf29551f0b SHA512 7994c7d8f020188eda51787bb5f6fe7668518cc89b711e7840470db7e5bac1219490ffccc73854fecb14ceb3ffaf0fc605f3438c87b83f27921ea3626365105c
+DIST sudo-1.9.2rc2.tar.gz 3885151 BLAKE2B fe221afe010e8d61e2d900521860bc217081170939d70b2ccb378b8fc02facfb4478dcd0dc7bbe2ac607a935e5d22ddad33c9f3c7da4528ad6f6f6d250179275 SHA512 6e9c1dee84fa760d33cc4e1011d54897fbe2eeebfeb4d19b2cb1ed7eca3f9e2df81c7c5305a0eb5218f38088e83d75dd1aae327a9f1f05b37db047857fc69cdd
 EBUILD sudo-1.8.31.ebuild 6863 BLAKE2B 605dcb95b2668e74e9fbc915c98aad1c787919036b450476e9c9d50e2151489154d2232d0c1e445bfc6647cccecc240f508c2ef636e64331fcfbce385025ad72 SHA512 ccf9c659c89e469ad9cd0282ef2165a549344734dd3638226506944e39a39574af5f56d96ff0108880571a56a9eb457077fd2e73889fbb9c27a0e766b88f9abc
 EBUILD sudo-1.8.31_p1.ebuild 6872 BLAKE2B df4b0b8974bebc5683f9e1e1331c1e25f8c2dea63bd8162a3906dda75c92197a35007d3fb3fb257cee91643918be81222cf0141ab13f28a3a789c0c96053cc1b SHA512 688162c59941c57261c7a15726bb5a368bbc40a990c98d18d7d46f67fd0aef3f1a332703a79691f0c133af0202beeaf0af1e8249a8ab6fad0879899698f40f89
 EBUILD sudo-1.9.0-r1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
 EBUILD sudo-1.9.1.ebuild 6878 BLAKE2B d6ad927f05ef58e372c5d26c9cae06df0b939a25148a89f981fd460078708b681fa4d76f99353bf7fc6187e027b2552d26d46835e119eba1edfd5d72a49d8986 SHA512 8c6f351b9d8e450878c6ad70f26a1f0305a5691e6480e8ccba14d4d22c78a68f2e79a95e85d5f63981652fd847064f04964faa27cbea525b81deb5f4b18715f9
+EBUILD sudo-1.9.2_rc2.ebuild 6931 BLAKE2B 3e606d2d8186da9b882969e864f90c34bb0b473589abd9e114550fe945a60076e159262085cb3766d14ba061806334ceba3665b2fc37f22e2f589c819335c9f6 SHA512 ff619dd0a8d6842a2bae2cf564cf58797c3ce63bb3acd1fbfe14ebfd511018ea8c3fe993002ed1278fda4403f9e413198c19a69623f0e6548dfb6597c554f357
 EBUILD sudo-9999.ebuild 6818 BLAKE2B 7e4ab79b53a510067f52d4082ba38331b12083104b61c53d737d701ed1edd7150d7dd4302b42bd958175307fb0374496bd41a4ab683f363fb94e9dd8fcd12944 SHA512 4e1ab7142549eab298f1ef450877789d405c425abf9e13cf8b739c1805ed1c71a0bd2651273a928b57e113bbcb73734af754b730d4cd114c905651e3b1633296
 MISC metadata.xml 1379 BLAKE2B 3fb47838664544236c2c5ce55ba77cda8fdef3ff1bd050a775878444040c76ec1d18fecd7ecbcc11121c90e76e9634f4c01da676dc178dbc7787b9250774e28a SHA512 81def82cf20eb6a57d38a1cced2fef18f5f5b56b6bb92a036cf925dec1c1b77f18e3c7b5997f4055ce840873032df65edae08810e6838bb0ab6309020a4a30d6
diff --git a/app-admin/sudo/sudo-1.9.2_rc2.ebuild b/app-admin/sudo/sudo-1.9.2_rc2.ebuild
new file mode 100644
index 000000000000..d0873828489a
--- /dev/null
+++ b/app-admin/sudo/sudo-1.9.2_rc2.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pam multilib libtool systemd tmpfiles
+
+MY_P="${P/_/}"
+MY_P="${MY_P/beta/b}"
+
+DESCRIPTION="Allows users or groups to run commands as other users"
+HOMEPAGE="https://www.sudo.ws/"
+if [[ ${PV} == "9999" ]] ; then
+	inherit mercurial
+	EHG_REPO_URI="https://www.sudo.ws/repos/sudo"
+else
+	uri_prefix=
+	case ${P} in
+		*_beta*|*_rc*) uri_prefix=beta/ ;;
+	esac
+
+	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
+		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
+	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-solaris"
+	fi
+fi
+
+# Basic license is ISC-style as-is, some files are released under
+# 3-clause BSD license
+LICENSE="ISC BSD"
+SLOT="0"
+IUSE="gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd"
+
+DEPEND="
+	sys-libs/zlib:=
+	gcrypt? ( dev-libs/libgcrypt:= )
+	ldap? (
+		>=net-nds/openldap-2.1.30-r1
+		sasl? (
+			dev-libs/cyrus-sasl
+			net-nds/openldap[sasl]
+		)
+	)
+	pam? ( sys-libs/pam )
+	sasl? ( dev-libs/cyrus-sasl )
+	skey? ( >=sys-auth/skey-1.1.5-r1 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	sssd? ( sys-auth/sssd[sudo] )
+"
+RDEPEND="
+	${DEPEND}
+	>=app-misc/editor-wrapper-3
+	virtual/editor
+	ldap? ( dev-lang/perl )
+	pam? ( sys-auth/pambase )
+	selinux? ( sec-policy/selinux-sudo )
+	sendmail? ( virtual/mta )
+"
+BDEPEND="
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	pam? ( !skey )
+	skey? ( !pam )
+"
+
+REQUIRED_USE="?? ( gcrypt ssl )"
+
+MAKEOPTS+=" SAMPLES="
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+set_secure_path() {
+	# FIXME: secure_path is a compile time setting. using PATH or
+	# ROOTPATH is not perfect, env-update may invalidate this, but until it
+	# is available as a sudoers setting this will have to do.
+	einfo "Setting secure_path ..."
+
+	# first extract the default ROOTPATH from build env
+	SECURE_PATH=$(unset ROOTPATH; . "${EPREFIX}"/etc/profile.env;
+		echo "${ROOTPATH}")
+		case "${SECURE_PATH}" in
+			*/usr/sbin*) ;;
+			*) SECURE_PATH=$(unset PATH;
+				. "${EPREFIX}"/etc/profile.env; echo "${PATH}")
+				;;
+		esac
+	if [[ -z ${SECURE_PATH} ]] ; then
+		ewarn "	Failed to detect SECURE_PATH, please report this"
+	fi
+
+	# then remove duplicate path entries
+	cleanpath() {
+		local newpath thisp IFS=:
+		for thisp in $1 ; do
+			if [[ :${newpath}: != *:${thisp}:* ]] ; then
+				newpath+=:${thisp}
+			else
+				einfo "   Duplicate entry ${thisp} removed..."
+			fi
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	cleanpath /bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/opt/bin${SECURE_PATH:+:${SECURE_PATH}}
+
+	# finally, strip gcc paths #136027
+	rmpath() {
+		local e newpath thisp IFS=:
+		for thisp in ${SECURE_PATH} ; do
+			for e ; do [[ ${thisp} == ${e} ]] && continue 2 ; done
+			newpath+=:${thisp}
+		done
+		SECURE_PATH=${newpath#:}
+	}
+	rmpath '*/gcc-bin/*' '*/gnat-gcc-bin/*' '*/gnat-gcc/*'
+
+	einfo "... done"
+}
+
+src_configure() {
+	local SECURE_PATH
+	set_secure_path
+
+	# audit: somebody got to explain me how I can test this before I
+	# enable it.. - Diego
+	# plugindir: autoconf code is crappy and does not delay evaluation
+	# until `make` time, so we have to use a full path here rather than
+	# basing off other values.
+	myeconfargs=(
+		# requires some python eclass
+		--disable-python
+		--enable-tmpfiles.d="${EPREFIX}"/usr/lib/tmpfiles.d
+		--enable-zlib=system
+		--with-editor="${EPREFIX}"/usr/libexec/editor
+		--with-env-editor
+		--with-plugindir="${EPREFIX}"/usr/$(get_libdir)/sudo
+		--with-rundir="${EPREFIX}"/run/sudo
+		--with-vardir="${EPREFIX}"/var/db/sudo
+		--without-linux-audit
+		--without-opie
+		$(use_enable gcrypt)
+		$(use_enable nls)
+		$(use_enable sasl)
+		$(use_enable ssl openssl)
+		$(use_with ldap)
+		$(use_with ldap ldap_conf_file /etc/ldap.conf.sudo)
+		$(use_with offensive insults)
+		$(use_with offensive all-insults)
+		$(use_with pam)
+		$(use_with pam pam-login)
+		$(use_with secure-path secure-path "${SECURE_PATH}")
+		$(use_with selinux)
+		$(use_with sendmail)
+		$(use_with skey)
+		$(use_with sssd)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use ldap ; then
+		dodoc README.LDAP
+
+		cat <<-EOF > "${T}"/ldap.conf.sudo
+		# See ldap.conf(5) and README.LDAP for details
+		# This file should only be readable by root
+
+		# supported directives: host, port, ssl, ldap_version
+		# uri, binddn, bindpw, sudoers_base, sudoers_debug
+		# tls_{checkpeer,cacertfile,cacertdir,randfile,ciphers,cert,key}
+		EOF
+
+		if use sasl ; then
+			cat <<-EOF >> "${T}"/ldap.conf.sudo
+
+			# SASL directives: use_sasl, sasl_mech, sasl_auth_id
+			# sasl_secprops, rootuse_sasl, rootsasl_auth_id, krb5_ccname
+			EOF
+		fi
+
+		insinto /etc
+		doins "${T}"/ldap.conf.sudo
+		fperms 0440 /etc/ldap.conf.sudo
+
+		insinto /etc/openldap/schema
+		newins doc/schema.OpenLDAP sudo.schema
+	fi
+
+	pamd_mimic system-auth sudo auth account session
+	pamd_mimic system-auth sudo-i auth account session
+
+	keepdir /var/db/sudo/lectured
+	fperms 0700 /var/db/sudo/lectured
+	fperms 0711 /var/db/sudo #652958
+
+	# Don't install into /run as that is a tmpfs most of the time
+	# (bug #504854)
+	rm -rf "${ED}"/run || die
+
+	find "${ED}" -type f -name "*.la" -delete || die #697812
+}
+
+pkg_postinst() {
+	tmpfiles_process sudo.conf
+
+	#652958
+	local sudo_db="${EROOT}/var/db/sudo"
+	if [[ "$(stat -c %a "${sudo_db}")" -ne 711 ]] ; then
+		chmod 711 "${sudo_db}" || die
+	fi
+
+	if use ldap ; then
+		ewarn
+		ewarn "sudo uses the /etc/ldap.conf.sudo file for ldap configuration."
+		ewarn
+		if grep -qs '^[[:space:]]*sudoers:' "${ROOT}"/etc/nsswitch.conf ; then
+			ewarn "In 1.7 series, LDAP is no more consulted, unless explicitly"
+			ewarn "configured in /etc/nsswitch.conf."
+			ewarn
+			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
+			ewarn "  sudoers: ldap files"
+			ewarn
+		fi
+	fi
+	if use prefix ; then
+		ewarn
+		ewarn "To use sudo, you need to change file ownership and permissions"
+		ewarn "with root privileges, as follows:"
+		ewarn
+		ewarn "  # chown root:root ${EPREFIX}/usr/bin/sudo"
+		ewarn "  # chown root:root ${EPREFIX}/usr/lib/sudo/sudoers.so"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers"
+		ewarn "  # chown root:root ${EPREFIX}/etc/sudoers.d"
+		ewarn "  # chown root:root ${EPREFIX}/var/db/sudo"
+		ewarn "  # chmod 4111 ${EPREFIX}/usr/bin/sudo"
+		ewarn
+	fi
+
+	elog "To use the -A (askpass) option, you need to install a compatible"
+	elog "password program from the following list. Starred packages will"
+	elog "automatically register for the use with sudo (but will not force"
+	elog "the -A option):"
+	elog ""
+	elog " [*] net-misc/ssh-askpass-fullscreen"
+	elog "     net-misc/x11-ssh-askpass"
+	elog ""
+	elog "You can override the choice by setting the SUDO_ASKPASS environmnent"
+	elog "variable to the program you want to use."
+}
diff --git a/app-antivirus/Manifest.gz b/app-antivirus/Manifest.gz
index 74cf8a01604a..67a8dd60b3c1 100644
Binary files a/app-antivirus/Manifest.gz and b/app-antivirus/Manifest.gz differ
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index fda172a1b477..3a60ce917567 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -14,6 +14,7 @@ AUX clamd_at.service 228 BLAKE2B 85181b02329a86495d0737308417dd873424da0bb1cd376
 AUX freshclamd.service 240 BLAKE2B 1b72ffee3b0b1b51811aa5f3c7a52678b3beb260f020dd326a437d6abf4bc515392d0b263eeb0773de128b9c0eff1c1f0b7b604dd14b9dffd50aba31909963e1 SHA512 28da28d633f487806448e17aec36648b6ba12f549549485704607e403e64643caea6ee9420e8101f11b3edebe62b651e6d6c338ab232f33b97b315d64b3789ac
 AUX tmpfiles.d/clamav.conf 33 BLAKE2B 447c5ad4ad79bc70fc386833fa763451d30bf30f1ae26434039a3926ca5aae9734e0152c83b5b9aa5bed87b17c1b685c4ea9f41c9cb6b3197b1e78e800b71fd9 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2
 DIST clamav-0.102.3.tar.gz 13226108 BLAKE2B 741c0cc6a088ffe880eabb7a59151b3c13c5754f9cb36582ffca9cbeea6b039e3c49b7155ba14fa302e9ee4bfa6adf8b98f0e29f2354ea8569b11b1ed2b2532c SHA512 d239718814b303fb0f1655d9bdaf3675d888eea57e786d927eafabb7b6f58cd7f5fb7dc149511c2af6f800dcc919f2e1d6954110d45b9e16619c632e8d2b37f2
-EBUILD clamav-0.102.3-r1.ebuild 6957 BLAKE2B a33b5a1a99a06c06d4e9587a6d4e696274a3c86f06f0dc3addfc546477c16d0afd8c3647097874bc7af572d61889bced836c69efdedf0b3a20c241c5bf3280a8 SHA512 676f419e033c37e18aeed19eb3c7372da0bf8b42092bb94c0097fff890fe8588ea800af003d5635b2e90d27af632bd3efe71f52ee5c51cefee116d9c237003d8
+DIST clamav-0.102.4.tar.gz 13234444 BLAKE2B 7109da3e2281472032777b8a9d14ca6ff345aead33e5aaf0b9d1ff4721459926062f789dd1f7e8637155e4b9f3bce9f78127bf450f32baf3f1006b8083d3431a SHA512 29893deb8d2d913dff72331875d3dc3a10356bfb254ddfe1c1933b3ea4f8b76c96a1b840f95e72be36cbc0e00b9ec35e395225ef264761f53e709bb1026a4f09
 EBUILD clamav-0.102.3.ebuild 6644 BLAKE2B 5f3f39406472f1917d80d35d66738b9fa3d5d96ac0d85406d3c81dcb1afb8a16e04e128e6aa4d2e43e7768d004bf0ac142b2863d54ce427b901b9d94730101df SHA512 9cbb25b6cba7be41360f2f72a652ce23bca8e7e03f873454fb31dc1c68a964d7c9bbb99881a322af6c300c22553e16e781f184b559c29ce50b1faada14b4ee55
+EBUILD clamav-0.102.4.ebuild 6963 BLAKE2B 4747ade9c3ae55af8947bd74de42f636edc695f87f9bd56274423aa2254464f8589c38d0f4cbb79b3241992455e3ace9c04ba0a168f1222f011f8286dd5b3f12 SHA512 f771e1a03b16341445f6351a53bd8bcb440838069e68f24966bf2abef4743cfba2043308f1473a39848f1c6f9e9f25aa5c8fefdb722eaa00b5fa9b2bed5b0242
 MISC metadata.xml 861 BLAKE2B fa97cb689d37536e3d128d2033038b1a6331ae3d8f435e39330506731c96f742b55f579ca02c678393c0af21fbab88189de8754d80b97fba35cf5a4f4eb2dd9a SHA512 5e2c58dfbb033270cfa014bc207d83799be06aaa02d1b490d6c202ffc151b54be72cd4e15380faffed2e3957c395e43b6853d1abfee99fa42de81159b7656a00
diff --git a/app-antivirus/clamav/clamav-0.102.3-r1.ebuild b/app-antivirus/clamav/clamav-0.102.4.ebuild
similarity index 97%
rename from app-antivirus/clamav/clamav-0.102.3-r1.ebuild
rename to app-antivirus/clamav/clamav-0.102.4.ebuild
index 09054b32b349..0a4fac640e38 100644
--- a/app-antivirus/clamav/clamav-0.102.3-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.102.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.clamav.net/downloads/production/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml"
 
 REQUIRED_USE="libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )"
@@ -51,7 +51,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.101.2-tinfo.patch" #670729
 	"${FILESDIR}/${PN}-0.102.1-libxml2_pkgconfig.patch" #661328
 	"${FILESDIR}/${PN}-0.102.2-fix-curl-detection.patch" #709616
-	"${FILESDIR}/${P}-system-tomsfastmath.patch" # 649394
+	"${FILESDIR}/${PN}-0.102.3-system-tomsfastmath.patch" # 649394
 )
 
 src_prepare() {
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index d03c62eb67a3..70da130d7991 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/certbot-apache/Manifest b/app-crypt/certbot-apache/Manifest
index 1458b201eaa3..5e57db434d3d 100644
--- a/app-crypt/certbot-apache/Manifest
+++ b/app-crypt/certbot-apache/Manifest
@@ -1,6 +1,6 @@
 DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
 DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
-EBUILD certbot-apache-1.5.0.ebuild 1068 BLAKE2B b3f72cb67e8eb10bbfab2f4badd1a15853526f1605cf4559191a67837d49118ab4bcaaf730bbfc164679f0732835bd274e1a8fdc56cf8fd8f3bd1bf46471e019 SHA512 a3d28f9dd5ae0a3e2eabf156636aeb835a2c5957bd5868f84cf1adc0d8b69c3c084981d756e6460d1d7a8fe157625a1c9785da5cd2a28a7b4455f83bc4fbd9e1
-EBUILD certbot-apache-1.6.0.ebuild 1070 BLAKE2B 7682b9837e69148d7ec9064322919f073a9965f8e04558ec578d63fa18ead49d87f5c454573dd64cfb2d720e97a4999a120985c64ac107219b092563d35744a3 SHA512 eb2df5510b51767aa37b77166ff9dbf7b6189d3464a4db1598a65d0766e7b21548bd9012bfb07e87f6413e8d67e29003b6a3e1df2426c282c509787466c58cc9
-EBUILD certbot-apache-9999.ebuild 1070 BLAKE2B 7682b9837e69148d7ec9064322919f073a9965f8e04558ec578d63fa18ead49d87f5c454573dd64cfb2d720e97a4999a120985c64ac107219b092563d35744a3 SHA512 eb2df5510b51767aa37b77166ff9dbf7b6189d3464a4db1598a65d0766e7b21548bd9012bfb07e87f6413e8d67e29003b6a3e1df2426c282c509787466c58cc9
+EBUILD certbot-apache-1.5.0.ebuild 1072 BLAKE2B 73e318d9dc7ecc5cf5ad2bff3d73d99e4eb9b8edc0ca730019180c7d4233cb2f05b895fef4652282c448fc9007bf0493f5abf879afa1b12a2c06cded5306e2e6 SHA512 a35d8194e596e1f793e50581587356521a76763c394ad41f710fa5fef870c26318b348b79ce48ac0cda71f33b0e6a56784d9d6a549361337a7fed4a328136a36
+EBUILD certbot-apache-1.6.0.ebuild 1074 BLAKE2B 0983132ac6377f462fcaad0510241c4c3005a6d0ae8eda4dfd732ea54c23517ad7840199cbc8597526930a85bd9d97b79a1d00919bc8ef4c8b4d7f073339f15e SHA512 ed4de8e9eff1fa01e58f159a024e97e86f0c06841fb6de51e6d4fd60817f892ad04480cfcd5734cc37f5aec890ca0c8b7c06f1e562fd40e57bd1e37b0003c29d
+EBUILD certbot-apache-9999.ebuild 1074 BLAKE2B 0983132ac6377f462fcaad0510241c4c3005a6d0ae8eda4dfd732ea54c23517ad7840199cbc8597526930a85bd9d97b79a1d00919bc8ef4c8b4d7f073339f15e SHA512 ed4de8e9eff1fa01e58f159a024e97e86f0c06841fb6de51e6d4fd60817f892ad04480cfcd5734cc37f5aec890ca0c8b7c06f1e562fd40e57bd1e37b0003c29d
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
index cc570860a3b1..13e5c5bec7ab 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild b/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
index 76ac8396ce17..323d9f35ff3a 100644
--- a/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-apache/certbot-apache-9999.ebuild b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
index 76ac8396ce17..323d9f35ff3a 100644
--- a/app-crypt/certbot-apache/certbot-apache-9999.ebuild
+++ b/app-crypt/certbot-apache/certbot-apache-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/Manifest b/app-crypt/certbot-nginx/Manifest
index 81992907e4fc..5b9c7292728c 100644
--- a/app-crypt/certbot-nginx/Manifest
+++ b/app-crypt/certbot-nginx/Manifest
@@ -1,6 +1,6 @@
 DIST certbot-1.5.0.tar.gz 1387959 BLAKE2B ad395e3bd9f7012b39692be48c28bef8a0648e17e42b7b4ada8024c7eb231f418f68b6388c6c3154232d38f82ba348bf056ddf8cdf349f4a83ad148bbc20243b SHA512 ea4f9fb06ed54e2bbc30a8a0aea436e1f35772d348de483cae5e696ee1176c9663739201569102ded385074ef7aa5833c43e543c0dbc1e8f6729167350bca6a3
 DIST certbot-1.6.0.tar.gz 3797817 BLAKE2B fe01c450e89f490c1b8d32401fe72d8eeedd2bf80ad29b59c9836eb44550b4753e0ec4da6f378aba12383fa7e2a38e5b7405634e695c8f9b150ab4899afc57d6 SHA512 490b9155e90f02aaf987840c7dd041c81913daa88df4a96528e3fe1c5342b64fcc19c02a76c0e94e705f7c68d0d63c25582fa474a270d2f98d454e036fcaa320
-EBUILD certbot-nginx-1.5.0.ebuild 967 BLAKE2B fc0874272d53d3c621d7d275096a60e3c783d68ff72dc806e19446210d9af93ef7e542fb7ee149232f95158a687a8fa29ae83176069ba22e0ad6573ab08611bf SHA512 894529f71f1515aa7971bb7487595b9276be582eb08b12af3ae2cfa8736282db68301befcd7d1d18dda00369f11e09f9b00928929ae1d2154c5e97ba37a3d4a1
-EBUILD certbot-nginx-1.6.0.ebuild 969 BLAKE2B fbe24cecaecdd36d79f18a492a9bdc4cef38c279101a1603360b766a02324b7bfc01f42317246f9afb9aae10270b20eb117f0762d3534d0cbf0a41faab4847c3 SHA512 d08a6d74a44091da81d8b70d65c24b43377a98eb23f3a7f0947bdd19b2638e81ae926e4192918badf934c76fb7e8b46abd3160d063c7ea4192c36faba45160db
-EBUILD certbot-nginx-9999.ebuild 969 BLAKE2B fbe24cecaecdd36d79f18a492a9bdc4cef38c279101a1603360b766a02324b7bfc01f42317246f9afb9aae10270b20eb117f0762d3534d0cbf0a41faab4847c3 SHA512 d08a6d74a44091da81d8b70d65c24b43377a98eb23f3a7f0947bdd19b2638e81ae926e4192918badf934c76fb7e8b46abd3160d063c7ea4192c36faba45160db
+EBUILD certbot-nginx-1.5.0.ebuild 971 BLAKE2B c8260b5ca404e7b48c4adef76f613f25b001200a0c10b91fdd86ea8a3164548a014e304bb929908e784bb92ebeb9e46f093338b836c2b3271eea0f26710efe70 SHA512 946a11ba13884e78bf781c9e1a0ef18182402f5cda67a4333b8778135b4ede4ea15114bd401e4d78688eed12799f1da5898e8955f1de9b9390556f66707e6ddc
+EBUILD certbot-nginx-1.6.0.ebuild 973 BLAKE2B 99723e412b2282e6ecb4f74b9d9b8a694c8ccaa9e4f0c4e38efde37e3745e076ed53e1a178c234be7cfad3034daf53b1b4af1439da2e15eed311e3ef832dd4f8 SHA512 bf912fdbca7c54e3928ea9758d71da456b324eca5dd47eb0a4d912bebd90d6b8be13e4a31d22ef72c399c9cbd1ab97ee032084c9122fd2c0bb45611e25a6cc67
+EBUILD certbot-nginx-9999.ebuild 973 BLAKE2B 99723e412b2282e6ecb4f74b9d9b8a694c8ccaa9e4f0c4e38efde37e3745e076ed53e1a178c234be7cfad3034daf53b1b4af1439da2e15eed311e3ef832dd4f8 SHA512 bf912fdbca7c54e3928ea9758d71da456b324eca5dd47eb0a4d912bebd90d6b8be13e4a31d22ef72c399c9cbd1ab97ee032084c9122fd2c0bb45611e25a6cc67
 MISC metadata.xml 334 BLAKE2B 4adbd04c0edcc84925da47b32fee63d4652bf2a1bf5222a56e0e1c7cfe8aaa34275a2652c4416f8a80de11fd88217d8626d610fa857f0615f18bfd773a279e55 SHA512 e3d6dda6c44557523fd48b464b6d39fc45b90ba2ecbe03fb300a655973c1b2e654a24d8d381b769eba00d0d80fb5881e1dfec1694e223cd83047abba9f01a44f
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
index 788549159e45..ef91a302cea1 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild b/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
index cf2c81af951b..1d92bc0c30fa 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
index cf2c81af951b..1d92bc0c30fa 100644
--- a/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+++ b/app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=(python{3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/certbot/certbot.git"
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index a22e77f605cc..794eed5fd68a 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 510eda947e7b..f1a534b5e294 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,3 +1,3 @@
 DIST mousepad-0.4.2.tar.bz2 696014 BLAKE2B 2591f177b59147e01502329939365c5f18031f3dc9100baa29cb1da04afbff26cc91cc612ea1e5ebbc2d15754375da6afbd4ae9d96399f41cf06191d7d8d7082 SHA512 f3266018ce61683dc62b6866649f3674cc363ea652de04d3f087341c61cf24fb5eb730411948e354d085792f88b59e3dba7e7712715d92711f750b33d8bfb69a
-EBUILD mousepad-0.4.2.ebuild 1142 BLAKE2B b40e37fd3724bdc4da85e4d903719e7874b238cdac06beb2e4e13106d8003cb986133fe2ff25e729676e362fed702ab4ccb11826f174ba2549bfee018517ba7a SHA512 57d209fbedf6b692464384e1ff84beb5eff47ed20e9a6a4fdfab51e58bef068d7419d12b875f5f98ff6aab5db5e8bd210e182a2cc297b85fb47c79b28500a1b5
+EBUILD mousepad-0.4.2.ebuild 1147 BLAKE2B 05c61f59b02d3fa600143f96e3135e4f0d4e3b7b2bb22e83005120c095477018dac9fac4d6895a7e01ff06a24edcf40862236ba3202898637446239b8e79c5e1 SHA512 91532dc7048428097cfccfa7b0444ef39a00cdd859842ec01d20029bd5fcab4e8baf3eea0993b0a7f29acb8fd00c40f7c57a9db7d69ba619c0c41a28f10b83fb
 MISC metadata.xml 320 BLAKE2B cacb0475fb17dcfcb37f6adea12ec9ccdf5e54e2efbe32b373b0a26eeeda3f16bd3e76b0b6fd5027fcd1e7d1d400f87d72f8befca6df302fd6747407c87d2a50 SHA512 b19e2d6452858183bf2b4c11c9f7230fa56aeea86af72584c12c0c5bd21a883ac96f8f409b27e7ba802d2ef109d49a5b7eb652529e6d753483a35f74aac84caa
diff --git a/app-editors/mousepad/mousepad-0.4.2.ebuild b/app-editors/mousepad/mousepad-0.4.2.ebuild
index de411259d531..d2e953338abb 100644
--- a/app-editors/mousepad/mousepad-0.4.2.ebuild
+++ b/app-editors/mousepad/mousepad-0.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="dbus +gtk3"
 # D-Bus code fails to build against GTK+2
 # https://bugzilla.xfce.org/show_bug.cgi?id=15755
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 7669c4039bd4..cde3488acd33 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index a973bdf348ee..412473f22c54 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -8,8 +8,8 @@ AUX qemu-5.0.0-ipv6-slirp-CVE-2020-10756.patch 1149 BLAKE2B 0ac27f524129e88061e5
 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e
 AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737
 DIST qemu-5.0.0.tar.xz 62426192 BLAKE2B 785d02ef79c95b5c4f0556186054885f9893d4e8a9f4b4f2d6199a4e1ae9c31d7c79dd900305469217f85d61bbe74134b601d5c6c1b0eee2b74792d010f1fd63 SHA512 21ef0cbe107c468a40f0fa2635db2a40048c8790b629dfffca5cd62bb1b502ea8eb133bfc40df5ecf1489e2bffe87f6829aee041cb8a380ff04a8afa23b39fcf
-EBUILD qemu-5.0.0-r1.ebuild 24608 BLAKE2B 6c63be1c37a004208e2c4342ede1b35b6b85dc150bfb3112192a557e6b89bd21193e63e5e789494b6ee3a22a642cbb6ba10db299e812f5a889e60e372ab40f0f SHA512 99595f2e7a5aec01b8750a4ae1b4f61be5b5967e2c58b9aaae044ff80a6cb5efa4393281e9b461f09f99ceef3ed40c6543c6b298e7f2449e74d6cd59015f9146
-EBUILD qemu-5.0.0-r2.ebuild 24674 BLAKE2B f76e9bd8d06398bc36aeec6661b51360d2466324d21f6e8b86023a69d66646cb3027ece401954ef4846bc3cf475169733c0913e550793937414bbe386aade01c SHA512 6e0c6f910df145a847f666e87457db81af308f4f4f95f69e9ddd6c72afd038f8b409ea714dcbd86188d7e908501dbf686ce0517e405bda2125361c467ac5e4b9
-EBUILD qemu-5.0.0.ebuild 24539 BLAKE2B 556790420f61cbc42129e0996b0f95a90faa1053469bdc4c6b006fdb9f76233267e899fafc58c1c64baf947d5239638fae9198ef4604f1cb7f6bcc5d005a0ee2 SHA512 83c7093c429fcbf8a1b582f8672c486f79f76e1fdf94c1014b4f3e895c8c08bf294dac511ea8bd46554758a0b8d2ec8d9d3d8fbc76f9b60613056810b53dc896
-EBUILD qemu-9999.ebuild 24564 BLAKE2B 59a04907ea6e28983d3b79c2aeca72f8425da04800b067799450abcc3f0796889bf39d2ce7763a4b115f084860ee16a34f72a9466c8ced6a3a72945c8ebabe80 SHA512 46498642d0fe9f90999155436bfa2b52e911ba4440c01aa9b25359cd7f7d5a78a88e3c2662491acd24576262d5655d4110660bb6b305b90a7414ef56903ae543
+EBUILD qemu-5.0.0-r1.ebuild 24609 BLAKE2B 96b06cf650f94f48a98ec793066fac3aff84fe25946cd9c09ed8e01fa6497a6594f3624acf9eb14477b8383cf558e31e377fc466f73d1280c91f13f29eb903a6 SHA512 6ee585aaecc40d1565cf269f95711543ea1a49566fe02e0c68fd092c2ba8021b431c37f577785d08222a279af172bfca330bfaf23bceb7b9a6fdf5158e02e34d
+EBUILD qemu-5.0.0-r2.ebuild 24675 BLAKE2B b3427bc4888e8c26366b9b47b067963878213ee09d288eef0cfc846661bb60c88f9ce41584f9b1c35f94360facef7e618d49acff4346b2fd9743147e58e5a140 SHA512 e9119b9e8212111f31d0f8c133c38099156e730f0f794d9990643c64529746480fdf4579cb792a8e19b1ea7490380d6bf36160e1b92dffa3a888db0ae49051e4
+EBUILD qemu-5.0.0.ebuild 24540 BLAKE2B 5a5d095ca0fe2b403290c50e1f9a1aadfa8f7cef5eb9fccbffce54a1d07808f3fb49259c3fcfb04ae4688e84dd35fc18210cad3b267b9ce992ae3c028406a304 SHA512 da407d83fa489acb5ebd5bdeb9265cbacc99d235107f47b87bbca38994250acf10276ee5c948a70ebbdd4f8859c63df2897c07a6f552724cffc30cccdf913969
+EBUILD qemu-9999.ebuild 24565 BLAKE2B d3c1440d1d4b4f3953137aaf913f433b25bd78bc4983c0684bd8dedd171c86ba6cf659cf2e184fb58737bba164ceddb4554dab5addc6d6e12cd4cab412f677ba SHA512 337099395d843d79e1fe50ca24bf1f60679ff0017a2a3c4aa9d5f4eca2b8238e12f54249be2c7f2ee1cdcc976e4be73f3f739d19b390a18008733ec7cc57f57d
 MISC metadata.xml 4552 BLAKE2B da4e95aba5cc8b47df692698d32f03a3ba788527172bdd45593ac5bc4aa0ba37626b968a06ffa95731d00917bd2f7490bd4b5181ff0fba8b98e22196543c65b2 SHA512 cbfd366e646eac523950aba8b4af87f3fb25753277fbbd43c9a9dffb411c35650d56ac9eba10051218b6f847884284c497f9f60095551dafe506446e10b808df
diff --git a/app-emulation/qemu/qemu-5.0.0-r1.ebuild b/app-emulation/qemu/qemu-5.0.0-r1.ebuild
index 0cfa9836a834..9329dfb0fdc9 100644
--- a/app-emulation/qemu/qemu-5.0.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0-r1.ebuild
@@ -281,7 +281,7 @@ For systemd:
 
 pkg_pretend() {
 	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
 	elif use kernel_linux; then
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
diff --git a/app-emulation/qemu/qemu-5.0.0-r2.ebuild b/app-emulation/qemu/qemu-5.0.0-r2.ebuild
index dd30807e9857..745a99669b8e 100644
--- a/app-emulation/qemu/qemu-5.0.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0-r2.ebuild
@@ -282,7 +282,7 @@ For systemd:
 
 pkg_pretend() {
 	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
 	elif use kernel_linux; then
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
diff --git a/app-emulation/qemu/qemu-5.0.0.ebuild b/app-emulation/qemu/qemu-5.0.0.ebuild
index 31bb16d73133..e9a2dceb35a7 100644
--- a/app-emulation/qemu/qemu-5.0.0.ebuild
+++ b/app-emulation/qemu/qemu-5.0.0.ebuild
@@ -280,7 +280,7 @@ For systemd:
 
 pkg_pretend() {
 	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
 	elif use kernel_linux; then
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index cf78c79fb472..f568bdfec832 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -280,7 +280,7 @@ For systemd:
 
 pkg_pretend() {
 	if use kernel_linux && kernel_is lt 2 6 25; then
-		eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
+		eerror "This version of KVM requires a host kernel of 2.6.25 or higher."
 	elif use kernel_linux; then
 		if ! linux_config_exists; then
 			eerror "Unable to check your kernel for KVM support"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index 52017a7eb0e0..6d11c264473e 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/aide/Manifest b/app-forensics/aide/Manifest
index ccecbd019135..49e6fb9c1918 100644
--- a/app-forensics/aide/Manifest
+++ b/app-forensics/aide/Manifest
@@ -2,9 +2,13 @@ AUX aide-0.16-add-missing-include.patch 512 BLAKE2B c3c25bbad549f8d2864b4ce91f33
 AUX aide-0.16-fix-LIBS-LDFLAGS-mixing.patch 874 BLAKE2B e61f6b269dcc3679d68714c315cfff8e8feb4146028abc33e780cb7429c4466c78b7e50c427fb78ffdc310335450a012f7a08b6ecd5aaf562b8ab18565c5f927 SHA512 930967c1c7be54d10beb26e4281083a0f7cf500a5f161cf2af6c0a7b377e9bce092942a3a88c6cbb080e3eab500ec8a7bec1ff295f774ef70146240837961a8f
 AUX aide-0.16-fix-acl-configure-option.patch 728 BLAKE2B a4edf60d7ffbae5f624645dd48f6cce0da6bd228d2b8aa04b08b1a2270fb9fb420175270a694ea225b2ccca6a1e4524001b042e12eb671b9758653c83893a7ee SHA512 65b93cd01ebfe6696e35872bc012126794e5e1e5756c2ce041d9a914722806f6079274b0fbb64bc795488f530c33106deba204ee2982a5a8d485b7cd88382497
 AUX aide-0.16-support-attr-2.4.48.patch 907 BLAKE2B 9d5c2c13a59c8ea1489e5353a2715926b7c0de2292050de166ea7959955a733487d68d047c23382370ccf2e91ea25dd5e4ffc6c55f47768e58da25775843133b SHA512 ea12a1aadc8ac8720dd5495318a0706f720422cdd0a7e7f6d794db4291b9a735468b7a1783922a1e489b738436a5d6e324d3ec66dc40b9b2b09d08ce4b3409e0
+AUX aide-0.16.2_p20200614_define_hash_use_gcrypt.patch 1174 BLAKE2B 694c7859a43f814f1b9ab18c0e0fa458bdbc6ebc0fb1d076cf51839cf48c341f13b84ae08c2ef419a62b53ffe12879fa2b230f546e57c89a5816fd4d2bff902b SHA512 ec31e674141feb03fbe4eb94c82f2c7b366bd31c4d845818650303c7e971ff9c814de8112c818da9de78bb32ca087f75ff313f35d18301775915ecc8b9975e52
 AUX aide.conf 2713 BLAKE2B c6868a81450bb3e66d73a60df258e0c6e1166fb0126a0664cf78db021fb4c32049d92032f8ba92b0c08b58e0267ccafcc6e948daed69a856db2703991776f977 SHA512 cf6c17ab40b0bf9a0fb21ce015c6c35a8f7a595fdeb7d67e793424ed5243660a56cb33c1169038f4b116463cb055a48232f33db8ed497181be4e084449632b28
+AUX aide.conf-r1 3194 BLAKE2B a911d5623adb4122cae21494c5e7542adbfa787bda78f840e1385219adfec19c5a3079b34e16f2c8e9afbe8554b6fc2ae291f7bdd1728b8ac77c7b16135260ae SHA512 24f6af48767e4edd69c4b806c418501583f03574f05bbf87e98659ba36b64acf8e95a772ce690175071127910248a9c6761392ca889cfee235a475341d3a7a77
 AUX aide.cron 5997 BLAKE2B 2273eb902b9ba8fc5e999375d0dfa59e2c5c56a919bf3bd06e7b638213332b34c4a1240c717c2189f787dc249847f7115e2a21ac139b5db1df2151ade9f5a154 SHA512 0931c1b9185e0b9a563c3589858b0ba20716344f29d6d1fc7226498f3c744af1d3c3fd72824f101f9b3e08710f443c9fdad312e28c0bcb93665d1dcb076f4b47
 AUX aideinit 2949 BLAKE2B 244aaec9a38f19c6a7af706572a896e922215d6321aee4537ef5ce47326f41fd84880331a86ec71dcf7ee4e2ac2a11bf979ce66eff73dd2e8a2072e9eb7e8aab SHA512 a6bce52432251458b977fb363d5801206c273fb9404c55f7bcb82b9d5a65aa19d1660d61d457c9af87f1a8fada95e2f8203489b1876b2b2a259e6374e15cdc57
+DIST aide-0.16.2_p20200614.tar.gz 144202 BLAKE2B a2533eaf0dd6caa82718eaa89878ddc101f64767788eeac3a250ceb584a2c5958ef8a5481b89eeb720e21af07da8f3576fb46d8ee9966fd2361354a35a7eaa6e SHA512 f5f83b8401465471043c60aeb6314f7bcab24c9f962f6ce550445bec8d866a5c8c00eba9e9f157f1223cde58631de139533c7de64fb3c861a5d8e7b5e367e106
 DIST aide-0.16.tar.gz 391009 BLAKE2B 8769d8c6bdf72f307b75f3c1feaa2effdeaead00a0c65ab25bbb50dc6f7c7b53fda4d0a3a54dd5030de1444a34a81c294437d45193aeb8aec7ef0af83a173d47 SHA512 29ad97756e3e2fb21dc332ed03b494a1c73e621266f8622ec80bdba23092a38ee975b97f3cff2330e4c16e64e2f672259eea9291ca706a4009e7399b4e14e6a7
 EBUILD aide-0.16-r1.ebuild 3710 BLAKE2B 0be0b1ecc9c7bec42d475c2ccdf79b942572777af15addd5a524affd8dfd329f21ecb2b7fa18238270a9c67cf520127496056f6a7c3dba2682ca064024e3d8af SHA512 5acfa1daa419af465a3c1f2f305f4edddf38e095d18849565d7a41ba55a98c40d3f86bdf6888d48c9f05fd2d71a27086a3577bd78e9ef80947cfb0ebccc11b04
-MISC metadata.xml 432 BLAKE2B e7466cdb1d65c8c56f2fdd287d5a0d2182e749946f51fd3ae44dba7416f279c413aa8f9a507edc402d515670a68eb4a6058eb17c03faa065c66a84fbf89b76dd SHA512 0b365eae19d5fcf28beaba0858430a0b02ac06991c24bb4b6bf01e43ad9b53d0d5f883b3830f0d0e9bb9d4225502a5d38b2e703e61d2cb0fa7a209bb6c147edb
+EBUILD aide-0.16.2_p20200614.ebuild 4326 BLAKE2B bcd8d1f30b15da37fbf5eddacf177d81ad0468ade3a2772d8654df707a86b489193cea15a176be6559226f256d8722743de61d994b9232de90da021a402db7d9 SHA512 0bf37916431339fd506fb1a6cdc03de4bd45e1554e02752c8348898ed71e9bbbd9df6b6835e81d28d81c49b7dedeae098412c1de36a9ea7cbaceba1bf79282a8
+MISC metadata.xml 819 BLAKE2B ea807e78f806beaf63b28b99d5dd95054e247333612d35ea6004bf4720699d4c5a503ca893e0df172086935dd927c6e165410df74c51949108ee6d2fa5766af9 SHA512 22792dd087461ca8b147db6a03a5198127f19ea8473ce5691d9630e36655365a9dde4377f6d62e0457b65a634e23c0b2852db9dadc7d00c3fcec4a84e21b3054
diff --git a/app-forensics/aide/aide-0.16.2_p20200614.ebuild b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
new file mode 100644
index 000000000000..794fd0db7d74
--- /dev/null
+++ b/app-forensics/aide/aide-0.16.2_p20200614.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools readme.gentoo-r1
+
+DESCRIPTION="AIDE (Advanced Intrusion Detection Environment) is a file integrity checker"
+HOMEPAGE="https://aide.github.io/ https://github.com/aide/aide"
+
+COMMIT="7949feff20501724a43929ee7894b005812ffb4f" # 20200614
+SRC_URI="https://github.com/aide/aide/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="acl audit curl e2fs mhash postgres prelink selinux static xattr zlib"
+
+REQUIRED_USE="
+	postgres? ( !mhash )
+	static? ( !audit !curl !postgres )"
+
+COMMON_DEPEND="
+	dev-libs/libpcre
+	acl? ( virtual/acl )
+	audit? ( sys-process/audit )
+	curl? ( net-misc/curl )
+	e2fs? ( sys-fs/e2fsprogs )
+	!mhash? (
+		dev-libs/libgcrypt:0=
+		dev-libs/libgpg-error
+	)
+	mhash? ( app-crypt/mhash )
+	postgres? ( dev-db/postgresql:= )
+	prelink? ( dev-libs/elfutils )
+	selinux? ( sys-libs/libselinux )
+	xattr? ( sys-apps/attr )
+	zlib? ( sys-libs/zlib )"
+
+RDEPEND="
+	!static? ( ${COMMON_DEPEND} )
+	selinux? ( sec-policy/selinux-aide )"
+
+DEPEND="${COMMON_DEPEND}
+	static? (
+		dev-libs/libpcre[static-libs]
+		acl? ( >=virtual/acl-0-r1[static-libs] )
+		e2fs? ( sys-fs/e2fsprogs[static-libs] )
+		!mhash? (
+			dev-libs/libgcrypt:0[static-libs]
+			dev-libs/libgpg-error[static-libs]
+		)
+		mhash? ( app-crypt/mhash[static-libs] )
+		prelink? ( dev-libs/elfutils[static-libs] )
+		selinux? ( sys-libs/libselinux[static-libs] )
+		xattr? ( sys-apps/attr[static-libs] )
+		zlib? ( sys-libs/zlib[static-libs] )
+	)"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	prelink? ( sys-devel/prelink )"
+
+HTML_DOCS=( doc/manual.html )
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS="
+Example configuration file was installed at '${EPREFIX}/etc/aide/aide.conf'.
+Please edit it to meet your needs. Refer to aide.conf(5) manual page
+for more information.
+
+A helper script, aideinit, was installed and can be used to make AIDE
+management easier. Please run 'aideinit --help' for more information."
+
+PATCHES=(
+	"${FILESDIR}/aide-0.16-fix-LIBS-LDFLAGS-mixing.patch"
+	"${FILESDIR}/aide-0.16-fix-acl-configure-option.patch"
+
+	# Remove not available gcrypt algorithm 7 DB_HAVAL
+	# See: https://sourceforge.net/p/aide/bugs/105/
+	"${FILESDIR}/${P}_define_hash_use_gcrypt.patch"
+)
+
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+pkg_setup() {
+	if use postgres; then
+		ewarn "\nWARNING!"
+		ewarn "You need to choose one of the postgres versions before building"
+		ewarn "\nPlease select a target postgres version/slot using:\n"
+		ewarn "    ~# eselect postgresql list"
+		ewarn "    ~# eselect postgresql set <version>\n"
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e 's| -Werror||g' configure.ac || die
+	echo "m4_define([AIDE_VERSION], [${PV}])" > version.m4 || die
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}/etc/${PN}"
+		--with-confighmactype="sha512"		# Override default weak MD5 hash.
+		--with-dbhmackey="sha512"			# Override default weak MD5 hash.
+		# Disable broken l10n support: https://sourceforge.net/p/aide/bugs/98/
+		# This doesn't affect anything because there are no localizations yet.
+		--without-locale
+		$(use_enable static)
+		$(use_with zlib)
+		$(use_with curl)
+		$(use_with acl posix-acl)
+		$(use_with selinux)
+		$(use_with prelink prelink "${EPREFIX}/usr/sbin/prelink")
+		$(use_with xattr)
+		$(use_with e2fs e2fsattrs)
+		$(use_with mhash mhash)
+		$(use_with !mhash gcrypt)
+		$(use_with postgres psql)
+		$(use_with audit)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	readme.gentoo_create_doc
+
+	insinto /etc/${PN}
+	insopts -m0600
+	newins "${FILESDIR}"/aide.conf-r1 aide.conf
+
+	dosbin "${FILESDIR}"/aideinit
+	dodoc -r contrib/ "${FILESDIR}"/aide.cron
+
+	keepdir /var/{lib,log}/${PN}
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if use postgres; then
+		elog "\nDue to a bad assumption by aide, you must issue the following"
+		elog "command after the database initialization (aide --init ...):"
+		elog '\n    ~# psql -c "update pg_index set indisunique=false from pg_class \\ '
+		elog "          where pg_class.relname='TABLE_pkey' and \ "
+		elog '          pg_class.oid=pg_index.indexrelid" -h HOSTNAME -p PORT DBASE USER'
+		elog "\nwhere TABLE, HOSTNAME, PORT, DBASE, and USER are the same as"
+		elog "in your aide.conf.\n"
+	fi
+}
diff --git a/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch b/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch
new file mode 100644
index 000000000000..e643a0017de8
--- /dev/null
+++ b/app-forensics/aide/files/aide-0.16.2_p20200614_define_hash_use_gcrypt.patch
@@ -0,0 +1,37 @@
+diff -Nur aide-0.16/include/md.h aide-0.16.new/include/md.h
+--- aide-0.16/include/md.h	2016-07-25 22:56:55.000000000 +0200
++++ aide-0.16.new/include/md.h	2018-11-21 14:07:01.347479021 +0100
+@@ -48,7 +48,7 @@
+ #define HASH_GCRYPT_COUNT GCRY_MD_CRC32
+ #ifndef WITH_MHASH
+ #define HASH_USE_GCRYPT (DB_MD5|DB_SHA1|DB_RMD160|DB_TIGER|DB_CRC32|\
+-                         DB_HAVAL|DB_CRC32|DB_SHA256|DB_SHA512)
++                         DB_CRC32B|DB_SHA256|DB_SHA512)
+ #endif
+ #endif
+ 
+diff -Nur aide-0.16/src/md.c aide-0.16.new/src/md.c
+--- aide-0.16/src/md.c	2016-07-25 22:56:55.000000000 +0200
++++ aide-0.16.new/src/md.c	2018-11-21 14:06:05.602295496 +0100
+@@ -55,10 +55,12 @@
+     r=DB_TIGER;
+     break;
+   }
++/* until libgcrypt-1.8.4 not implemented yet, see doc/gcrypt.info-1
+   case GCRY_MD_HAVAL: {
+     r=DB_HAVAL;
+     break;
+   }
++*/
+   case GCRY_MD_SHA256: {
+     r=DB_SHA256;
+     break;
+@@ -219,7 +221,7 @@
+ 			if(gcry_md_enable(md->mdh,i)==GPG_ERR_NO_ERROR){
+ 				md->calc_attr|=h;
+ 			} else {
+-				error(0,"gcry_md_enable %i failed",i);
++				error(0,"gcry_md_enable %i failed, see /usr/include/gcrypt.h enum gcry_md_algos",i);
+ 				md->todo_attr&=~h;
+ 			}
+ 		}
diff --git a/app-forensics/aide/files/aide.conf-r1 b/app-forensics/aide/files/aide.conf-r1
new file mode 100644
index 000000000000..87df5e168c80
--- /dev/null
+++ b/app-forensics/aide/files/aide.conf-r1
@@ -0,0 +1,133 @@
+# Example configuration file for AIDE
+# See more: man 5 aide.conf
+
+database=file:/var/lib/aide/aide.db
+database_out=file:/var/lib/aide/aide.db.new
+
+# Change this to "no" or remove it to not gzip output
+# (only useful on systems with few CPU cycles to spare)
+gzip_dbout=yes
+
+# Default: 5
+#verbose=5
+
+report_url=file:/var/log/aide/aide.log
+report_url=stdout
+#report_url=stderr
+
+# Here are all the things we can check - these are the default rules 
+#
+# p:   permissions
+# ftype: file type
+# i:   inode
+# l:   link name
+# n:   number of links
+# u:   user
+# g:   group
+# s:   size
+# b:   block count
+# m:   mtime (modification time)
+# a:   atime (access time)
+# c:   ctime (change time)
+# S:   check for growing size
+# I:   ignore changed filename
+# ANF: allow new files
+# ARF: allow removed files
+# md5: md5 checksum
+# sha1: sha1 checksum
+# sha256: sha256 checksum
+# sha512: sha512 checksum
+# rmd160: rmd160 checksum
+# tiger: tiger checksum
+# crc32:    crc32 checksum
+# R:   p+ftype+i+l+n+u+g+s+m+c+md5+X
+# L:   p+ftype+i+l+n+u+g+X
+# E:   Empty group
+# X:   acl+selinux+xattrs+e2fsattrs (if groups are explicitly enabled)
+# >:   Growing file p+ftype+l+u+g+i+n+S+X
+
+# Defines formerly set here have been moved to /etc/default/aide.
+
+# Custom rules
+Binlib = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
+ConfFiles = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
+Logs = p+i+n+u+g+S
+Devices = p+i+n+u+g+s+b+c+md5+sha256+rmd160
+Databases = p+n+u+g
+StaticDir = p+i+n+u+g
+ManPages = p+i+n+u+g+s+b+m+c+md5+sha256+rmd160
+
+# Next decide what directories/files you want in the database
+
+# Kernel, system map, etc.
+=/boot$ Binlib
+# Configs
+/etc ConfFiles
+!/etc/mtab
+# Binaries
+/bin Binlib
+/sbin Binlib
+/usr/bin Binlib
+/usr/sbin Binlib
+/usr/libexec Binlib
+/usr/local/bin Binlib
+/usr/local/sbin Binlib
+#/usr/games Binlib
+# Libraries
+/lib(64)? Binlib
+/usr/lib(64)? Binlib
+/usr/local/lib(64)? Binlib
+# Log files
+=/var/log$ StaticDir
+#!/var/log/ksymoops
+/var/log/aide/aide.log(.[0-9])?(.gz)? Databases
+/var/log/aide/error.log(.[0-9])?(.gz)? Databases
+#/var/log/setuid.changes(.[0-9])?(.gz)? Databases
+!/var/log/aide
+/var/log Logs
+# Devices
+!/dev/pts
+# If you get spurious warnings about being unable to mmap() /dev/cpu/mtrr,
+# you may uncomment this to get rid of them. They're harmless but sometimes
+# annoying.
+#!/dev/cpu/mtrr
+#!/dev/xconsole
+/dev Devices
+# Other miscellaneous files
+/var/run$ StaticDir
+!/var/run
+# Test only the directory when dealing with /proc
+/proc$ StaticDir
+!/proc
+
+# You can look through these examples to get further ideas
+
+# MD5 sum files - especially useful with debsums -g
+#/var/lib/dpkg/info/([^\.]+).md5sums u+g+s+m+md5+sha1
+
+# Check crontabs
+#/var/spool/anacron/cron.daily Databases
+#/var/spool/anacron/cron.monthly Databases
+#/var/spool/anacron/cron.weekly Databases
+#/var/spool/cron Databases
+#/var/spool/cron/crontabs Databases
+
+# manpages can be trojaned, especially depending on *roff implementation
+#/usr/man ManPages
+#/usr/share/man ManPages
+#/usr/local/man ManPages
+
+# docs
+#/usr/doc ManPages
+#/usr/share/doc ManPages
+
+# check users' home directories
+#/home Binlib
+
+# check sources for modifications
+#/usr/src L
+#/usr/local/src L
+
+# Check headers for same
+#/usr/include L
+#/usr/local/include L
diff --git a/app-forensics/aide/metadata.xml b/app-forensics/aide/metadata.xml
index f661f6e69f05..c7da79793a7f 100644
--- a/app-forensics/aide/metadata.xml
+++ b/app-forensics/aide/metadata.xml
@@ -1,12 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="e2fs">Enable support for checking file attributes on ext2/ext3/ext4 filesystems</flag>
+		<flag name="curl">Use curl for http,https and ftp backends</flag>
+		<flag name="postgres">Use postgresql library for storing databases</flag>
 		<flag name="prelink">Bypass prelinking when calculating checksums</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">aide/aide</remote-id>
 		<remote-id type="sourceforge">aide</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/app-metrics/Manifest.gz b/app-metrics/Manifest.gz
index bb1e05fe95b0..66b85ab0a590 100644
Binary files a/app-metrics/Manifest.gz and b/app-metrics/Manifest.gz differ
diff --git a/app-metrics/nginx-vts-exporter/Manifest b/app-metrics/nginx-vts-exporter/Manifest
index 2f2e4c2cfa88..1384527a87df 100644
--- a/app-metrics/nginx-vts-exporter/Manifest
+++ b/app-metrics/nginx-vts-exporter/Manifest
@@ -3,5 +3,6 @@ AUX nginx-vts-exporter.initd 637 BLAKE2B 9fb8c9e1908846391ef0afc4b586f40a0ae1341
 DIST nginx-vts-exporter-0.10.3.tar.gz 149578 BLAKE2B c73a8cfdb875fcc02d3b7d66f5b436b9e3e8d516c8a241062721e3124452722e9e30abefd5c79e89772a480fad005d0cf25d0359dd253a39d7ae5a20495f074a SHA512 0ee97be313dc829ae9e23bc836d7e11106c4843306583ff8baa38fa10bd9d56396ae3f6ce12cad4e08a383047c3179013962284aef6e627b23b89c72c564789e
 DIST nginx-vts-exporter-0.10.7.tar.gz 436116 BLAKE2B 0b6306f20c429fb30e166a6862d7b050f80f6fa47ef2db07d9cd883dfc92e70e2099b99bcab2e7530f1350da955abd1abbbf538613691d2ba76bcccaca2837e7 SHA512 54145aa7c4298e1ab65087c42258b690649e0e374d7bcc4abc426a128878849921afecd4bd25cca67ca2b3c65e3abb2786c09d4ffe811cbbec65e7257fe9a043
 EBUILD nginx-vts-exporter-0.10.3.ebuild 1135 BLAKE2B 0e91a3523bdd45e6e8000f027fb07832ef7beed1524b710ebdf01d3de8b996a326e421021763dd08815307243119a5112dfb3637be305508ff969bcb3315deea SHA512 2e84e5f6c1bb58f2ef8668f9bb75e34d3d4515991fb85996278f39d14239671c8c4948b87115a0984941f698fe437396b1322037eb6cc0241951f25b3c3367ad
+EBUILD nginx-vts-exporter-0.10.7-r1.ebuild 1049 BLAKE2B d2a10e147a6c27be6d0fad224f7dc3f7285c7a4e8d88cae5c13fa9f1870cb28a553287ed3f184e1307ec09f2fb9b01cf877d811dab5190fa737efae87ba73fd3 SHA512 d44d9eb728872c13babe0a320de54b62d2819d74f9c756772341708fdedd2d200c0f8fe3d706598cc413346ac6f72b458c7c975b541644824f9fdeed996fdd66
 EBUILD nginx-vts-exporter-0.10.7.ebuild 996 BLAKE2B 47c2c5edfbe432eb5004227834d7e5bc3f0be6696f8ca8fc71e818f065122f0e3bbdde1b4298678ae53d6ce878c3276edca06a39cc72695c193fc0a852809b42 SHA512 1f0ac85412515c99b74605cf5ac753ac2b23a070615163e8f6f293a9bd7e995d10867891d1d72e4d9c4925bed16622a23d76c3c4e3ad70739372082ea1dc1ed4
 MISC metadata.xml 339 BLAKE2B 1b216bbb5dfeb52eb16a2c95103ac2d04a9d28e93a48d594de97f63c75a97d02b934bb5df0f10d180b0e0f566c82b9b9e8fa324a28a93932052d0b6954b6cfd3 SHA512 e7803bea6cc496fb46cec4293fce2d7fc3dd05b93165806f57cb695184fceea78f4df2b911da2a9344000ae2de5a9ec5982a0fc2335bb2fed8fc7f45ed6d2efb
diff --git a/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild b/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild
new file mode 100644
index 000000000000..73b7421fdceb
--- /dev/null
+++ b/app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+EGO_PN="github.com/hnlq715/nginx-vts-exporter"
+EXPORTER_COMMIT=b935b793fbd8478d3feea529b036e753169ddabd
+
+DESCRIPTION="Nginx virtual host traffic stats exporter for Prometheus"
+HOMEPAGE="https://github.com/hnlq715/nginx-vts-exporter"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="dev-util/promu"
+COMMON_DEPEND="acct-group/nginx-vts-exporter
+	acct-user/nginx-vts-exporter"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e "/-s$/d" \
+		-e "s/{{.Revision}}/${EXPORTER_COMMIT}/" \
+		.promu.yml || die
+}
+
+src_compile() {
+	mkdir -p bin || die
+	promu build -v --prefix bin || die
+}
+
+src_install() {
+	newbin bin/${P} ${PN}
+	dodoc README.md
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 1176ec050eb0..55da06c5bdb0 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/figlet/Manifest b/app-misc/figlet/Manifest
index d6a3cbf2fc85..c62c79805cfa 100644
--- a/app-misc/figlet/Manifest
+++ b/app-misc/figlet/Manifest
@@ -1,6 +1,7 @@
 AUX figlet.bashcomp 1376 BLAKE2B a0e07ba26e97890bb0a6df473c609d40e68bd31a1ede5369eb2e4f04bfafdfdb680d6fc62670f1299db6978add0298c833afd6471ff26992db96fbd0a78f6874 SHA512 1a9d06139bbb105c9d909d1e7bfb64b04d6ccba6e0ebfa0968f75264da5582c2f449ad5759f36ec90bf068e69005c2eac2d0565765b02a13044531601b7b9d18
 AUX figlet.bashcomp-r1 1214 BLAKE2B b2f521559b9f3f957d1fe060e72dffa3b2342f389e5c1791dadd94181ef215344de2d909cf4abd5de1beef7f03a637576401db68ec1d537b569a89e0a9bb3a6f SHA512 7140cfbacbd99f0f4e9463bb024ead73ea1a3f6ddf9cb5806134ab711e772f32c57e69596f63f125cf13941cff51f84ccdb9f0288ca8614c99b9f1890d3d3e69
 DIST figlet-2.2.5.tar.gz 233201 BLAKE2B 9d7a8b518ee91bd937d7fb81d782c894bc2a1738b696b03d948c1319e68aadde9ff1ea291ee77f9e79bdd950c68fe98c9e4539e7e76ef5f9e758c16b968966e1 SHA512 bb9610fd89a51dd3e65c485653fe1292f47dbca7cb9a05af4ce317f5d776bb346ae455aec07fc37c290f6658639920fd7c431c1135a0f4d456a21c0bd25f99fb
-EBUILD figlet-2.2.5-r1.ebuild 943 BLAKE2B 9b276954a7ed1fa392d2d7ec13cc822bab67d289884cfbf170a4ed0a98fa166fee19c6221a683b02c57ec11caea41821487c0b89b5f1804a4fc56eb5f5a5c4cf SHA512 4d6075b0a369bba1e95074fde136be5edd9eb01aa6906ee4385e08b73311315c80c5d24f467bb0783084f12097e4a1ca8be65b183bdb66752ed62642e7d3a104
+EBUILD figlet-2.2.5-r1.ebuild 937 BLAKE2B 24ee90a610c28ed3fec048256774012785eda68cd4dfcc0d681d80799ff88b9a9bcd0948828f0be20a74e6bd115ec44ac9de78742397b5f9515a05717347a043 SHA512 55c09a2aa1e8c7a8449f53be03e98e709144224d68554e76b783f394cd0105f9c90be3b6c17a6287033a7ac379816a7fb32aa738c613db664c5425a3e9f04c30
 EBUILD figlet-2.2.5.ebuild 934 BLAKE2B e5479f3a0e0a066e17cf129646c2c42b3f74b86abece508563c4c49d5ee854a081d3ac5d2e569a01623f5a3939a27df0881c1328df8225d6b6d2b4fd79416e37 SHA512 1c3a768808eb9ad13ae8b107a3e91fdeb4ae0fc8af4472bd7fb29ae7d017d678cf5798e21c2f2807ffb610fc361d1b3cefceefdda4dc9bc05ddd5bdff19ff222
+EBUILD figlet-9999.ebuild 805 BLAKE2B 9562e2503c2395d88e78e832c5ae1fb5fc2a49c83871cd868cda802138db038f685dcbe60ffe77d9cfcea7b75281fb5596bee641d8ad9da28167452b4a127302 SHA512 1486ee9197ebab6a17e781366037f5e8cd24ead017dd2c87de373321f18bf3e908e952f983b2e9be6bda7914e51938324e8fe257487ccb015cf180495b1c7304
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/figlet/figlet-2.2.5-r1.ebuild b/app-misc/figlet/figlet-2.2.5-r1.ebuild
index 953d8c4cb93e..f78f205dab99 100644
--- a/app-misc/figlet/figlet-2.2.5-r1.ebuild
+++ b/app-misc/figlet/figlet-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,17 +16,17 @@ src_compile() {
 	emake clean
 	emake \
 		CC="$(tc-getCC)" \
-		LD="$(tc-getCC)" \
 		CFLAGS="${CFLAGS}" \
-	    LDFLAGS="${LDFLAGS}" \
+		LD="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
 		prefix="${EPREFIX}/usr" \
 		all
 }
 
 src_install() {
 	emake \
-		DESTDIR="${D}" \
 		BINDIR="${EPREFIX}/usr/bin" \
+		DESTDIR="${D}" \
 		MANDIR="${EPREFIX}/usr/share/man" \
 		prefix="${EPREFIX}/usr" \
 		install
diff --git a/app-misc/figlet/figlet-9999.ebuild b/app-misc/figlet/figlet-9999.ebuild
new file mode 100644
index 000000000000..30e2a9d7e973
--- /dev/null
+++ b/app-misc/figlet/figlet-9999.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1 git-r3 toolchain-funcs
+
+DESCRIPTION="program for making large letters out of ordinary text"
+HOMEPAGE="http://www.figlet.org/"
+EGIT_REPO_URI="https://github.com/cmatsuoka/figlet"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+src_compile() {
+	emake clean
+	emake \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		LD="$(tc-getCC)" \
+		LDFLAGS="${LDFLAGS}" \
+		prefix="${EPREFIX}/usr" \
+		all
+}
+
+src_install() {
+	emake \
+		BINDIR="${EPREFIX}/usr/bin" \
+		DESTDIR="${D}" \
+		MANDIR="${EPREFIX}/usr/share/man" \
+		prefix="${EPREFIX}/usr" \
+		install
+
+	doman chkfont.6 figlet.6 figlist.6 showfigfonts.6
+	dodoc README figfont.txt
+
+	newbashcomp "${FILESDIR}"/figlet.bashcomp-r1 figlet
+}
diff --git a/app-pda/Manifest.gz b/app-pda/Manifest.gz
index d7bd3bb21d78..41558ed7b3aa 100644
Binary files a/app-pda/Manifest.gz and b/app-pda/Manifest.gz differ
diff --git a/app-pda/libimobiledevice/Manifest b/app-pda/libimobiledevice/Manifest
index 0b783a58b8a1..71de8dd1025d 100644
--- a/app-pda/libimobiledevice/Manifest
+++ b/app-pda/libimobiledevice/Manifest
@@ -3,6 +3,8 @@ DIST libimobiledevice-1.2.0-userpref-GnuTLS-Fix-3.6.0-SHA1-compatibility.patch 2
 DIST libimobiledevice-1.2.0-userpref-GnuTLS-Use-valid-serial-for-3.6.0.patch 2014 BLAKE2B 8a6e51af145cf9983aa92ad7febf8d48a64b81f4f4664079ee7df3d433626141e10af6700ad38aad81bbbf3be03d6b35bae4f10a595e97f6998a06b6b2a4fbd4 SHA512 1c6002f8da5524603b989613fc1b14e526bc6fcbf515890f8c4976fe5e1b3801f04f6b210264624990ff7dd7de01063ad53dbf9ec506a0645098692a948216b9
 DIST libimobiledevice-1.2.0.tar.bz2 631495 BLAKE2B b04d87906615710e9e143013d27f4a0735e444160cb9dad464cb63d568470397f504680b3faca3995932cc8a80970a5923128d356fad9c98372af4981373ed69 SHA512 0de5f768aeb5d62445892855d84ceaff776f6667733c351ed6c34bf9d500802762d1a06e5efdf57f33cafc9ee788041cd9b6748fb9bad6c2e4ae2f9b9aa93589
 DIST libimobiledevice-1.2.1_pre20200220.tar.bz2 193582 BLAKE2B 7fab2101ee96a5fcc5dc68bad1a6c9fef25d87f25660cbce9aef45f8830c0162179f07e3d8a0f1d7d60bb7a219b1c4ee2513d43f98e8e4ea0d891686600c370e SHA512 f9d04941685f1cb0e982d061a6ea92d88d1d90157a789460e09e6af72954ed7a7f0448efbef3fe3cbca380195ffa658f7d8119e812f8ba8003c1e8a242976865
+DIST libimobiledevice-1.3.0.tar.bz2 733949 BLAKE2B 40717280bb3424c7431aa93d06d10de817e6761acf2b19948d80b691cfb4dd4ef0e31b81c8458eed29a43c8c8aa256da7baa3648fb785cfbdb7316daaba119a3 SHA512 7b22040552a6561729c79c0846f571b0e608abb7c297567d2ecfdd1718ce86df08a5e34ba51f209bdee96a1917da15e7ba3aaef1d289a951d1d3470b1f89e6a8
 EBUILD libimobiledevice-1.2.0-r1.ebuild 3251 BLAKE2B 4250165b98dadb3c8c9c40205cfdc2751faa8a6865e58be8fb933b560d1001d9e4f41a81adea9099ed38cfc58f9a1fef61c1a61a1c84389f1436c713170acc30 SHA512 742efd5fdb8bcab38ac94af62e5a6c22f18128e43345d444cd96777a1fda4d46ca5bbb87b47a3fb3bcdb6011633e75ca876e372ce16969fe14394068b4f395d3
 EBUILD libimobiledevice-1.2.1_pre20200220.ebuild 2599 BLAKE2B 7378479cb0050d0c9ce2fbbe07b1aba1976e6c1d275753bf33d644230c49834865f721ad86aa84b86ce7247c8766363d2f03bd5aed1ecb5816d1d6431938bbde SHA512 ea49d0257645a50966102b5cd72950db1c84daf3a82327e3e2d2de3e9540a655999541dc628c59b4ebb7461dab593e2e3b3409a3120202453626d308006ba190
+EBUILD libimobiledevice-1.3.0.ebuild 2494 BLAKE2B c0d0d7d5f040b478e1cb27dd3c72aca7406663df0bcbf0e979798fbecf9831088beef52c7537b880dd2bf38184669e911a20bc8a420abcae39bac54b0338a90b SHA512 58fc161e22369554e4115b93216b41aaf7f5e149ddb1e9a4d91c1717c9c43af18162f42758eaee2929b79c5eb82d555079ec38814a8a2948e1f715d60589b8ce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild b/app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild
new file mode 100644
index 000000000000..a2811ac14075
--- /dev/null
+++ b/app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit autotools python-r1
+
+DESCRIPTION="Support library to communicate with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://github.com/libimobiledevice/libimobiledevice/releases/download/${PV}/${P}.tar.bz2"
+
+# While COPYING* doesn't mention 'or any later version', all the headers do, hence use +
+LICENSE="GPL-2+ LGPL-2.1+"
+
+SLOT="0/6" # based on SONAME of libimobiledevice.so
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc gnutls libressl python static-libs"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=app-pda/libplist-2.2.0:=
+	>=app-pda/libusbmuxd-2.0.2:=
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=dev-libs/libtasn1-1.1
+		>=net-libs/gnutls-2.2.0 )
+	!gnutls? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= ) )
+	python? (
+		${PYTHON_DEPS}
+		app-pda/libplist[python(-),${PYTHON_USEDEP}] )
+"
+
+DEPEND="
+	${RDEPEND}
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	local myeconfargs=( $(use_enable static-libs static) )
+	use gnutls && myeconfargs+=( --disable-openssl )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		# Bug 567916
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
+	}
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:$1/cython" \
+			imobiledevice_la_LIBADD="$1/src/libimobiledevice.la"
+	}
+
+	emake -C "${BUILD_DIR}"
+	use python && python_foreach_impl python_compile "${BUILD_DIR}"
+
+	if use doc; then
+		doxygen "${BUILD_DIR}"/doxygen.cfg || die
+	fi
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" install \
+			DESTDIR="${D}" \
+			VPATH="${S}/cython:$1/cython"
+	}
+
+	emake -C "${BUILD_DIR}" install DESTDIR="${D}"
+	use python && python_foreach_impl python_install "${BUILD_DIR}"
+	use doc && dodoc docs/html/*
+
+	if use python; then
+		insinto /usr/include/${PN}/cython
+		doins cython/imobiledevice.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libplist/Manifest b/app-pda/libplist/Manifest
index 84bd77f0ac20..ba2674669268 100644
--- a/app-pda/libplist/Manifest
+++ b/app-pda/libplist/Manifest
@@ -1,3 +1,5 @@
 DIST libplist-2.1.0.tar.bz2 120602 BLAKE2B 8abfe3c295c4ebd242f2c4d49c80d1f214097df84f1d2fcf2696519bbbca4e8a5ce13c04690ac64fd981f84d585df25fc65c268a4e4f4092319053583e67736c SHA512 23156e882835bb0b894a05b57018b5e76f9f8f8f4b1d3fdad7b1970d2ef695033c98de74a1fa81bdf0829742a058fd65075cebc1512313d2be42e2f5367274be
+DIST libplist-2.2.0.tar.bz2 126808 BLAKE2B 7c3ec04aaa52eca33ae28851a6524c9ea531df939feef0f10827c8c2de78a6ccd856ea4d8a568b146ccb5de96f70dd5accec34aa2fdd61f9e6eba01256c0b518 SHA512 641bfd3ec0565f104d3a2d1ebdf6137bc9252b67ce90550e24ab0deeee4e820e119ba4f8f1ba04a0358d995d196fa61e35f2f0ee8ba37fc0270752ae842ab1f5
 EBUILD libplist-2.1.0.ebuild 2145 BLAKE2B 666212cfa479b9855390170df691006230daeebad437fa6599427fea3f7b6f25db4079cbd47d87453ad23eacfa8103f45e834d8c472db3b4cc6ce4a37c0fa9ed SHA512 f73c7808e738a970fd5edd8ef657558dcf97ac73cda3b2470ba3856edb0aa831e9338d349ce35330caa1c56a3713fd1d3d5046c965ecc8715f837479596a5a47
+EBUILD libplist-2.2.0.ebuild 2146 BLAKE2B 73d1c6345fb46bdccadff39b150a52f172ecb8d5bd2367cb31845077c077515e7de06fd1c8a94fe5a19ad32164f82cd7768433322ac4a98fb72ec4be188295eb SHA512 83c81c3fa733b9f90f177fe81bfe06db9996b70982042b5db0b9ce8c88fd6047311f301bf07b9d5ae58a6521d15092427dd7c78601cd41a56157980068040c4b
 MISC metadata.xml 329 BLAKE2B accbb4a0f223b37358e54635e61f1488abf2148d89e166e4a68e8ddfc90e0d4c3438c52d75c24aeced91c2246e537cb0b1d64e6e9c63425c6392148cbc3bcd58 SHA512 69d57118df488610f977fe8722d463bb858e8329855cf439ae3c1c7c52260dec96505535e9424041d71d000951db199312e382d24f66296c9c408113ead5219d
diff --git a/app-pda/libplist/libplist-2.2.0.ebuild b/app-pda/libplist/libplist-2.2.0.ebuild
new file mode 100644
index 000000000000..7c1f430c30fe
--- /dev/null
+++ b/app-pda/libplist/libplist-2.2.0.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+inherit autotools python-r1 toolchain-funcs
+
+DESCRIPTION="Support library to deal with Apple Property Lists (Binary & XML)"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="python static-libs"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( >=dev-python/cython-0.17[${PYTHON_USEDEP}] )
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DOCS=( AUTHORS NEWS README.md )
+
+BUILD_DIR="${S}_build"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+	local myeconfargs=( $(use_enable static-libs static) )
+
+	do_configure() {
+		mkdir -p "${BUILD_DIR}" || die
+		pushd "${BUILD_DIR}" >/dev/null || die
+		econf "${myeconfargs[@]}" "${@}"
+		popd >/dev/null || die
+	}
+
+	do_configure_python() {
+		local -x PYTHON_LDFLAGS="$(python_get_LIBS)"
+		do_configure "$@"
+	}
+
+	# Don't prefer clang.
+	tc-export CC CXX
+
+	do_configure --without-cython
+	use python && python_foreach_impl do_configure_python
+}
+
+src_compile() {
+	python_compile() {
+		emake -C "${BUILD_DIR}"/cython \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			plist_la_LIBADD="${native_builddir}/src/libplist.la"
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake
+	use python && python_foreach_impl python_compile
+	popd >/dev/null || die
+}
+
+src_test() {
+	emake -C "${BUILD_DIR}" check
+}
+
+src_install() {
+	python_install() {
+		emake -C "${BUILD_DIR}/cython" \
+			VPATH="${S}/cython:${native_builddir}/cython" \
+			DESTDIR="${D}" install
+	}
+
+	local native_builddir=${BUILD_DIR}
+	pushd "${BUILD_DIR}" >/dev/null || die
+	emake DESTDIR="${D}" install
+	use python && python_foreach_impl python_install
+	popd >/dev/null || die
+
+	einstalldocs
+
+	if use python ; then
+		insinto /usr/include/plist/cython
+		doins cython/plist.pxd
+	fi
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-pda/libusbmuxd/Manifest b/app-pda/libusbmuxd/Manifest
index 4f6e6c83ef48..88f228cbffa2 100644
--- a/app-pda/libusbmuxd/Manifest
+++ b/app-pda/libusbmuxd/Manifest
@@ -1,5 +1,7 @@
 DIST libusbmuxd-1.0.10.tar.bz2 292649 BLAKE2B 7ec9a576cb20f7e87cf1f31e57e66100c496e5809142d225df9b3cc295a71546bed2d90f41df3144f7316ce0aec5f08fad850c528e27f336bf96e9578bcffd04 SHA512 180cde2e9d0860d07d29813e68abf8ca807f75e98424b50acfc1ce941ba4260922959e1047a7d2bc754470c08ed55d0a15c9367487bd41c635a52b4fbf8ff535
 DIST libusbmuxd-2.0.1.tar.bz2 37373 BLAKE2B 3d7d8b4ccc5331f1f3868e67ac9726281dccb8eabc58cf78d4b8a921c403095adb18cd8ec4f156c06297abb8566daae04300709fd1afd35c57dbda155db03c0d SHA512 c2a977898ccd28d32f7754bac08829b57bc87ad958febded2c95087a06cb0b5a73daf087b3a00630701a7313fd3900f916846b77b4794321c90e6aa9f9246ed3
+DIST libusbmuxd-2.0.2.tar.bz2 43162 BLAKE2B e3559583e691a5f87a61ffece0ebf944d4aed48d37f83a504ee4d7a245e05511c6620c4a82d29bea2a10686910a14f7a730afec0f2cfc9435f748499e35df433 SHA512 3086ce1a05026afeabcdb5364ec30f4a6a5c84fe6f09e15ef6ff438bd3dfdb262ebdff94e5e0d0828b6d946bc8bdf01760271ba0d1fbf98d743dce149764a519
 EBUILD libusbmuxd-1.0.10-r1.ebuild 937 BLAKE2B a5c8eb29f27bc1a75a13c81e916eee108803a6a0827ba57edb76e2d06c89655852d021ef164efcd11e95c59ff95210b52bd417cb33404fff243d0b916553f44c SHA512 66a0254d202427c87f8188076a2602b200da3ba7e31b19e88c573269126ca075574e8d8b02da451c3f6bb348a74341365736b738271d8ab49d7d6060f8b9fc8b
 EBUILD libusbmuxd-2.0.1.ebuild 859 BLAKE2B fa38081bd37fe5f5f5d674623dd549e5456db0cd5586e29d2e1422e4b0e7d1507e6ea8cb6f87147204a44d6dcc097c0f536fa6304e01f05a64fbc67746ff24db SHA512 1ababb683971d59ddddc67fa34e3adf37af52a8ba805337e74f262175c7451307517a774911fb7f7a6cc4bfcb6d8008ba659e4ac209a23a64a0d6df4ee664746
+EBUILD libusbmuxd-2.0.2.ebuild 834 BLAKE2B 0e3e2f38e3fbd4175ee66ca9b487993e4e7abde51f227d29060b487f132ea7b600c4668aefb1b3a4c71ee9aeeafd81f29c0e3b08769ad115a3b3a365acbcaf8f SHA512 aee5121ac62389fd8c0646808a24076fc6b8cf09cbd1088a9e7ed9c5a0d5a5a7146226637cab27ea1a1bc0dfce47a8e53cf43a0f043203d520ca9b75d3a87a4a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild b/app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild
new file mode 100644
index 000000000000..9c0bb1c26cbf
--- /dev/null
+++ b/app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://cgit.libimobiledevice.org/${PN}.git/snapshot/${P}.tar.bz2"
+LICENSE="GPL-2+ LGPL-2.1+" # tools/*.c is GPL-2+, rest is LGPL-2.1+
+SLOT="0/6" # based on SONAME of libusbmuxd.so
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	>=app-pda/libplist-2.2.0:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable static-libs static) \
+		$(usex kernel_linux '' --without-inotify)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-pda/usbmuxd/Manifest b/app-pda/usbmuxd/Manifest
index edd4cdf7ea6d..8cbc1a31b018 100644
--- a/app-pda/usbmuxd/Manifest
+++ b/app-pda/usbmuxd/Manifest
@@ -1,5 +1,7 @@
 DIST usbmuxd-1.1.0.tar.bz2 321897 BLAKE2B 3ca5d1da222e457ac01f3e87fb7573c6405e51fd5d270a2b3dab7601118f21be22232d5100b4d027273fc837e6a57f7a7d17d2c41ae59d7c5aa41f76bef5a03d SHA512 66aa0c40e912bf596b819098b87d88e9cf30b2e6352e607eeb778bd4f23bf9bb123fb6a6ecca2d4e4be3171e35d66200d632d2c9c80b1f2462bb45be8aa6912d
+DIST usbmuxd-1.1.1.tar.bz2 345290 BLAKE2B 580dd4e2fb05d6c4803d774f7d43c8399219d8f0ce4191428cb4fccffcc941894d0381d5f0746997570dd24e395af3dda340b1910827f9c5ace7e2d9cc176c6a SHA512 0e8829c93aac147a6b949fe95592d6ad9ea36e1c04676cb85accb4670a65b31065706fc438556def17b55850081d6c07deb325ca02b9853335b6e0b1049ba1da
 DIST usbmuxd-1.1.1_pre20200121.tar.bz2 51859 BLAKE2B 339d53904f7484bebb6d7524313ee065bf5a244efab16c77b30b8932071012105f21aa56083d82667b06088af83464ea8c86e3c28c5a45cb9abbe574a634533e SHA512 cc113b054e8e04d228af740ec43d2dbf29c015dc9d8e1cdd0eaf84bfcaa9838d5b1bf6db2efed30ffb84c35c88db5469983a115ffdbddbb6acd0df9fd2a5182f
 EBUILD usbmuxd-1.1.0.ebuild 854 BLAKE2B aff005e1ff9c9ea91d8965bc28662f579562b0ecbdb8bf7d4b728da685cdb1c9567ce79a060aabe202c5e3b7d272bdddbf32be00a6f2ed69e8ca10ff20c5f563 SHA512 779d1bfec159db90b531400dd6d505145673b5f6db6a0afdb00a598d66036bf240e2115155bcb0e27499625929a9a8b278b98832506dee8a9a56a239a40ee7fd
+EBUILD usbmuxd-1.1.1.ebuild 894 BLAKE2B a5b8146af410fa067ec7bf4e285c1dd89c4a774d3c0dc925ca889fef9cb8ac08065be760566f704bf49c1be92caeb31eb548f50f55fc91704f9fe4a18ecb6cbc SHA512 41756f1a50f53ff306ed91834e22823d3604d70d3ac3035e64613456553dcc53f566b28fb6a48dab51c4d6a7b24e541f543cc44b1754b72b03c48f6e91d6de66
 EBUILD usbmuxd-1.1.1_pre20200121.ebuild 999 BLAKE2B 2ee05606bfec58b686d5c9391b0374e2a525614bb94ba239b04517032da709c58f3eb51b5fd906db68d059c56f6604d8a91fed43aeda88984ff5d754ca2c7848 SHA512 d7149fa395b79a097eaeb8db5cd68cdbbb42a792b6be2e1ec513232aee7be2eac1ac426b9db10eaed66b6a7360c27c04f52e8d370474eb3279d8cc7c95f9c18f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
new file mode 100644
index 000000000000..bd3f64d7f7e2
--- /dev/null
+++ b/app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd udev
+
+DESCRIPTION="USB multiplex daemon for use with Apple iPhone/iPod Touch devices"
+HOMEPAGE="https://www.libimobiledevice.org/"
+SRC_URI="https://github.com/libimobiledevice/usbmuxd/releases/download/${PV}/${P}.tar.bz2"
+
+# src/utils.h is LGPL-2.1+, rest is found in COPYING*
+LICENSE="GPL-2 GPL-3 LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="systemd"
+
+DEPEND="
+	acct-user/usbmux
+	>=app-pda/libimobiledevice-1.0:=
+	>=app-pda/libplist-2.0:=
+	virtual/libusb:1"
+
+RDEPEND="
+	${DEPEND}
+	virtual/udev
+"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with systemd) \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		--with-udevrulesdir="$(get_udevdir)"/rules.d
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 9f1301c5c7fb..cb6bafc83228 100644
Binary files a/app-portage/Manifest.gz and b/app-portage/Manifest.gz differ
diff --git a/app-portage/nattka/Manifest b/app-portage/nattka/Manifest
index c2c662d9b27e..a575a7533781 100644
--- a/app-portage/nattka/Manifest
+++ b/app-portage/nattka/Manifest
@@ -5,6 +5,6 @@ DIST nattka-0.2.9.tar.gz 90735 BLAKE2B f10d3af19785d835e059647e758541c3df5141efb
 EBUILD nattka-0.2.6.ebuild 987 BLAKE2B d5960c7995290e5f7083d76762c56bb0cf651df6377f3be076ed98a8d5f20fdef6ede487d7c9bf46dc5e492a2920c9c4d0031f0533cd5cdee5e1f1d25a5b693a SHA512 0419b7f478d373819fc3b929fdb41462c5224ceecb479a19b43479e124588b7729f9f00f15143d093d8a9186adc692c496cd54a19a7275eff166f2f0003e8bf4
 EBUILD nattka-0.2.7.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
 EBUILD nattka-0.2.8.ebuild 934 BLAKE2B ea2707d51ddad62f8841323fc04d8610c3a17f06878ffb52e06416906c806628639335f91dc3f10ed9e8400c5278239ad86c7d9e0e496d02ebfb528e7ff816b8 SHA512 12397bfa83da3df1bb94bb7242618b94a01c31173f6178e7772ed9d8cc8b72b5d358b2a0dd3a10c321faaedc9a4f42959a99c3968ed82136e303d5358b58bbc8
-EBUILD nattka-0.2.9.ebuild 931 BLAKE2B f90535ed9a31869e45d34d7692b7c944b351b3417ba152256951853bcefabcff654051f971d3a3e93497593578e3ada47fd006af96def9fa0fa542eb764870f1 SHA512 a82966aa4312bace63cce3498a786296b78821246bd2b57e9439aafe0f04cf4b513f8909536a7aea42d9189ae3e5761b65ee73e1bc01af52e0550e597885774f
+EBUILD nattka-0.2.9.ebuild 930 BLAKE2B 014af738c0295bb91a3e4beb5e41259365b9f7999c59403fba148f8c72e85f547614a3f853e9f68b32dcb1689ba8b83f9b0f235e10689fd606be8882ad6f06dc SHA512 b20a1221faa29863651d3a886f1791fa1e402603efe1458152733022e6166cce687d65bfbdbf72cae6d60f91dc13f9c93e37589b8c2d48fc5349ad9601c1e588
 EBUILD nattka-9999.ebuild 887 BLAKE2B 79540de21b995147dc8b7c7d43e3ff14a685bdaca82b667b8a1ecc61643341f34e422d7f710a098854faa445242f2a0f8161df58371b9a4412dd9a27c8073644 SHA512 6ebd99d4f683bd6e217b076303d4e3cc46bba3d09e3265b8a9f7a42ae7d8456c37699e405ae3fc60c0adcc9340881ff6beb7ac1bc8757fdb1c32e842f620e33a
 MISC metadata.xml 360 BLAKE2B 81f9162a3ddac3a0f333ee1e33f3012305054a7039b3bab7dedc68caa08d44c355aa40a2e9f61e789ba28fc0c28829a74024fa72476281dc492ef5d39ec62eed SHA512 674f911e11525336a229d3fe80baafa37963479e582ab847d74f70c817b126a10a602ef3f6bf67529b6b2b3d3e576afdc92ab3d2c1e8d1e75407db7a2007f01b
diff --git a/app-portage/nattka/nattka-0.2.9.ebuild b/app-portage/nattka/nattka-0.2.9.ebuild
index d6a11499a7dc..50b3f5c466f6 100644
--- a/app-portage/nattka/nattka-0.2.9.ebuild
+++ b/app-portage/nattka/nattka-0.2.9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/mgorny/nattka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="depgraph-order"
 
 RDEPEND="
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index 30bb706e96c9..10b1211125d9 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 33dccd2932a6..991211e3d0e8 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -13,5 +13,5 @@ DIST sqlite-doc-3320300.zip 9772933 BLAKE2B efd72c18d0398c103e3f9c4cfeb03e7794fd
 DIST sqlite-src-3310100.zip 12510166 BLAKE2B a856695e8552b8b4dcb28452fdbd48305fdb9072f9d6587f4b1f4445daf386e920eb936dcb50fdfe41a49f84b26a7c5fedcffea5acf3ba3fa935c36695d4b8ee SHA512 af92a00877bcd90372d6f83a27fea12b4fe8d1155b223a6bccbccc31bb8e3d2269cd9e68f329bc55f70d1068ccbf220ff5abccea6f593fd7a3a4bdd732d1cdbe
 DIST sqlite-src-3320300.zip 12461750 BLAKE2B 59cce74d284191cfc69ac09b6014701ddd2b7b3d7ebaad5da4ad71cc200e70285b3b201ff174819aa8dde5f610589d7947f547450334f0f17149014078316185 SHA512 7e027c7163a760fb9b6dbfd2e4ccffb39d4972280583fb0d7f8390017101dfed3b12a36653b3130a548ae4d04c6abb11c0a1921b6f09c54c6ae1e72fbdcb2fd4
 EBUILD sqlite-3.31.1.ebuild 11937 BLAKE2B 32e22c2f51ca1c7ab5b28e51e5145a466822badbbe0c1e8efb38cee965ee68ca058bbafdab5f783820642a728428a3b051ccf2fe4bbd2aef58d9602a1e98f128 SHA512 1319964321ba94e21ab2de05af22a12777ec2fa6bb835aa67c29618139f144f1a3f0cf848a7cda8c7112a12691dd40dcd8036b73b124d8a2781276ee22efa870
-EBUILD sqlite-3.32.3.ebuild 10430 BLAKE2B 93f3b0bb7f2008e385acf6795d1e5accb1ae959c54b24465725f668fbb9895b6ff77ac88879ab634e605ade0c3728ed8fc4666d21ae5d1ac774b9fc3ecae8197 SHA512 2f602a9b7c61771ebe1ab35ffb740e1d1189d155eaa313a6738c0aa21aed751bec9db4897a80c388671692821c50037986b349f6746ee7773bdd956f2549af85
+EBUILD sqlite-3.32.3.ebuild 10429 BLAKE2B 0030e1690b0fc19b65c3eaae531afed264883c0a1e775475f607867ae4dad0b3224ad8a5e3169961abe182f81fcdb696d8bdd03eaa062e007a0162f9a139c71b SHA512 4b9af979d940a48f88519311e83990432561d12fa2de1c69d9a42d6497e1e8493c650bd9618b433fda0c3a53b698d54f3e61d017a69d227fb3f3214a6d477dcb
 MISC metadata.xml 748 BLAKE2B c58da3e33e12b7747bbadacfd1a6137cf847fd5bd0525fc02ef854eb5bcad7bad0b29739257b632e19190995659768fdea418ffa7e485e55ef15f40f58b8382c SHA512 66f3f134065f76229b74a7ab7b469066a93da737a9037435e6fe78e85f45c980ec561537f2bb9b95db9de026bad025d8b06682187c97dedd2741717e893d43da
diff --git a/dev-db/sqlite/sqlite-3.32.3.ebuild b/dev-db/sqlite/sqlite-3.32.3.ebuild
index e56ca3b47888..f396f2c80d25 100644
--- a/dev-db/sqlite/sqlite-3.32.3.ebuild
+++ b/dev-db/sqlite/sqlite-3.32.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 if [[ "${PV}" == "9999" ]]; then
 	PROPERTIES="live"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index c577c995e9a3..d6da60bddb2e 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/iso-relax/Manifest b/dev-java/iso-relax/Manifest
index 6e748ecf59bf..bb6e1ec64718 100644
--- a/dev-java/iso-relax/Manifest
+++ b/dev-java/iso-relax/Manifest
@@ -1,3 +1,3 @@
 DIST iso-relax-20050331.tar.bz2 696665 BLAKE2B 4f366818bed5e31fa8fc2f8759a38dddda26b8d379c4ba81ff3679228826890f7383606901440f51d958a2401943822bcb3a03bde9be1a647245563d58316526 SHA512 c327b461785ce647f9913afa6f5b77c41440e806d566884058be76e14a118d14fa305a1bc0157ee150b199b573e75af954311dc79eb8535599544f094526320a
-EBUILD iso-relax-20050331-r4.ebuild 726 BLAKE2B 49b1abfd191e4296c40c316ed544f9c7e4db1163cdb4b4bfc688a57cded852ded42c25d548591f3347971128e4ddc8cd15b0c6cd68c867515fcd6e679b089ca6 SHA512 951652fce95d1943108e54ec8fafe431d2a568cece0b20c6d8e961499c4177ad6aec67260c0dde64d950367f5862aafef07ff389a98b1b7f62617adf1c7c519d
+EBUILD iso-relax-20050331-r4.ebuild 731 BLAKE2B a2760f3a62bdd11a3b08b4be9e60a3d3831d1ca180c956e662018286fe58657872f00207ebffee212309454c944c4abe0d2477c9336228755362e5286fcc879f SHA512 552149d44170f556ee4fce26f4bbf3784075153fff7160030b2229257780c1981e5b048552970d8ad84125a0af6c133a8dbbf20b08b8d57c355b32a93f96f575
 MISC metadata.xml 315 BLAKE2B 0c45e5fc5f64ce3a8d20de0be018eda7220ffa15c3880d54e49e8a6ac6cb9de770f5ce66e3e113ee6a6406324b440dee40fa6b98dbf4c2920b8c4c714a891a98 SHA512 08eaff739d58710deda145cdac32ab148112f2364f3f5a898095f0f135bca602354287ebc40ee9ab73d80e344330b810caa87b16b86b3c5696040e16d3a54fd9
diff --git a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
index b202adc2bbe0..16a588c00679 100644
--- a/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+++ b/dev-java/iso-relax/iso-relax-20050331-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index a740d70455cb..1c4cbca5e985 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -4,4 +4,5 @@ DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f5719357
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
 EBUILD java-config-2.2.0-r4.ebuild 1063 BLAKE2B ad07cf002078f3adba19c4c59d00f084640349d64a728758bfe968eedd372e3a6e47ef0ef9b45751ec9a51c17851c764e6edd5a1d6ccf063fbc2beae25165f52 SHA512 e2976feaf12b9e208f39b33457e72a410bc74844e1ac283efefb989d0028083c6c663f96b5eb1ac15c2b13214dfe18b44c1f8621bf2ed6b82ec1ac58713825b2
 EBUILD java-config-2.3.1.ebuild 977 BLAKE2B 7d64a9145f01bc7d1503b3a298b2bf70c4fe2aeb9b8bc0b6880f3733b664bd2791292bd7aeb1301c825d962c5596e976a3c5aefb25bb3df0d57d5f85ea2245e5 SHA512 cecb6e7434838fdf43c835ea73afd83707ef2dd1820eee5ec9ac1e2c28ffb3d023500a82244d440f5f8a856225fac01b756207d1e1d1bc73db7e80186fff662d
+EBUILD java-config-9999.ebuild 1104 BLAKE2B 830f732cd34402a73b926f689e7e2812b6653eba77e9a8989c89f62a56a36e517132072b1c3f8f2afef1dd48926b0449b2d6ac14d5efd4345ec20d005823e033 SHA512 ddfa3421ff2c657f49e1d5db449988e0a1156de2e232521193bc139f86852557ae91b40e8233fd253a6f758f996cec60d5a9746b1fe31193bf64e00ed7c6299a
 MISC metadata.xml 560 BLAKE2B a2cc44cb88cb8e0b80ef1fb56ed610fc10257a0858725fc01f793ae9275fc5ef6e37708c377ccf56425c08eacceea6e52a84eee35a7b2c239484080b6203c4d7 SHA512 9bd085048548f98faa638b23333ee0cf83b870c962b1aba62fa2df897393ce37c2b2e60736c988230252f29fc42e9dbe58ab8e720f7ec05a3e0b3d4c999e2c8a
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
new file mode 100644
index 000000000000..e60c556878bf
--- /dev/null
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+if [[ $PV = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	!dev-java/java-config-wrapper
+	sys-apps/baselayout-java
+	sys-apps/portage[${PYTHON_USEDEP}]"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# This replaces the file installed by java-config-wrapper.
+	dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-java/jdom/Manifest b/dev-java/jdom/Manifest
index 2ae27c15ffae..abaf7abe38eb 100644
--- a/dev-java/jdom/Manifest
+++ b/dev-java/jdom/Manifest
@@ -2,5 +2,5 @@ AUX build-xml-2.patch 1529 BLAKE2B 37aee7dc0ab5b130c16a67b2470e8e3d4052b73c9cc94
 DIST JDOM-2.0.6.tar.gz 8344114 BLAKE2B 0b9a568fe4de1fb9afc5a547d75aa1d3556bf497c76e3d32d1ebd7658634ea02e4fafa3c6261b64d9b803fc6e78ae013fb8a366bcbd5024e8ab0aced83f58e33 SHA512 d585b39159f0887485b2e681609b51113de6bc7c43627c42d7e81eb06ac65c507b43cf3d81c5df4399b1e3abf454c8852264a84567940bc5ba0c358eb9c0c4a1
 DIST jdom-1.1.3.tar.gz 4233403 BLAKE2B 9e4afacc6f10d2be1d793bd3b9f438f79e8e27f50bcae83eac5054df806c01c211ac493465bcda58ac204e796663ffb8aedf43a177f23c23a69af399243461a0 SHA512 a693fcc0d5c8ab3cf086a7904c7fb711e7deedca542089b84c6d011584e0d889495a58843033bff25272fdf130b1347419e31b9a4650c85ce9dfa19022dc0278
 EBUILD jdom-1.1.3.ebuild 1246 BLAKE2B 3ef43cd51122845127dce0d1df9dc6917ed9fddcdc33531ce526cd0ed6084594af4af0bb4ab870e14b44a14b5042277dc2337589b94c6bdb984c7cbc5c7aabff SHA512 5d76371202339ad4de3e1562676b075790c76377642ee3dc0e27c508dfd4389d7c9fb5e40c9449fb7b4e1aea1949d78e7324977a2925ea8dd9ac44cbac0f645d
-EBUILD jdom-2.0.6-r4.ebuild 1382 BLAKE2B 3c600a0e572d247b11bd180987000c5b7694bb1b6fc6fe143497e5522f9f4241ad8f94164e4ae49523834122dcbe69e8c0dfffaf7f32b1804e67f8d1fcf62975 SHA512 2db797004eab417c2d8aea1771a36504c8b2c5eeb960efe80e414cd7f2747e8eea1d487be4d3fef21dd82659e87256c3897c3bb9fbc012cdbc89163e8b28386e
+EBUILD jdom-2.0.6-r4.ebuild 1387 BLAKE2B 51aeb34b9ce2dea72a3545171943f011591f03e73558e327c2e78016616eef0b893d11d3d2c1596252f0390525836e36d19ce522cec6b413a208bc2881c1973d SHA512 b845c203f14f2d80ef077239940190129bf705a558a6ec3c065a0ceaa586d0613723f8bdae60913ade544c9abc4284bca0b335253f81b7a9ac577e796725349c
 MISC metadata.xml 318 BLAKE2B cbcc3f9c0ce67aa9619d21197006bffc71f6ae3d0707a5bdd3902a0d51f90724f3ce81e21c80f6a011885cd036f397d2cb679335d05a0e1bf7e4bff3470c9019 SHA512 1587f961d80cba775d94e97a9c41516766d6a502f9b144f401ebcd0ee0b21b2e04220730c03a44986af8bc860a0311acdd6e721d4de201defcbc89599df5803b
diff --git a/dev-java/jdom/jdom-2.0.6-r4.ebuild b/dev-java/jdom/jdom-2.0.6-r4.ebuild
index 518050c95023..8b29afa8593b 100644
--- a/dev-java/jdom/jdom-2.0.6-r4.ebuild
+++ b/dev-java/jdom/jdom-2.0.6-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hunterhacker/${PN}/archive/${MY_P}.tar.gz"
 HOMEPAGE="http://www.jdom.org"
 LICENSE="Apache-1.1"
 SLOT="2"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 0650f468a0ba..e42858ee3d90 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -10,9 +10,13 @@ DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.7_10.tar.gz 193346198 BLAKE2B 506fc32
 DIST OpenJDK11U-jdk_x64_linux_hotspot_11.0.8_10.tar.gz 193398310 BLAKE2B 079f48381bf58edb7b9b75f4305df72184710c90101588fccce4edb0535b976b2f6332b66fdd8cf8b442eebbeee5a6044e0445519f9bbd8ed20b02f50e9fc203 SHA512 115b5627d6d1245f8393e3cd869bdb7accb42c35bc0e9030fb60701f61253ea8ce382edec75ded85ff5b0a0c8bbfbecdec81b16aef87fb6fc76c684628abf1e5
 DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u252b09.tar.gz 102238546 BLAKE2B ffa0aec56e4f6fe03cab88e0423e5b1ee24ccbe9eb0bd37d37449c596095d69e7fcb9044c0846a750d3d1a842c2f719d18a28510bd226a8aa9b383e4ae29993b SHA512 a6ef9864cde15e96abcb94f2e72db77f473e609fd162934fc3d35225223a20e20c464e44ce0c022dbf15f6d68d25bf2187271d8643e5cff2894f1839929050ae
 DIST OpenJDK8U-jdk_arm_linux_hotspot_8u252b09.tar.gz 96925784 BLAKE2B 3e294a9a38729e453dd74d691bad4abd043fefd2a850a1d8fa142e5e5c2b908a1c7a0d9f2ebf1760ecf065cb615a59a930c84e86e86a339da01a794f1f3319ed SHA512 a361cb07b43ebaf7d1aa277c15ee41493fb25ff78dcad1801436ef68a54c4a89f2361c3f57ce328c507b9f36c81a301d95d9315d32aa888163d533d7d741effd
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u262b10.tar.gz 97642302 BLAKE2B 0bc6d676eaa4efb1ff2b9358f8ddf2b578223d390f59a2deb1269dc55d2be4e39104680c8cc5608c7d8ba1350a289cc5d5673d1df5f6b495739df0cdac563ebd SHA512 7abb787dce0d5ed8c0a6f4cb0c7036e2c341b90b1a967e3c2b45d1c33bf88bb08a6cccecde1579edf811f304d5dc287816becd60ab429dda6a913f37511f4c68
 DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u252b09.tar.gz 99444051 BLAKE2B 87f691298c7335c0adb285db6eff8ecb3897bb7b229bc6491b992375bd63c93eef126702ee461609b3a781240747d3f1372b4ed711a420cca1248878a82a2b6f SHA512 875d0d74088744a0a56a4706cd86a78ef2c5eb1a5792ba94ef2f51bf894a94123e761ab8fa0e5e74272c2f350a881073e4054e9f1c504421f43bb93b837d26a4
+DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u262b10.tar.gz 100454023 BLAKE2B aa76a05f981b72b0e5a976c1fc50e857ebbab731cc97c4e1f1f91bbd81ea305a6c85ab88ffa78fe4f3e6da3c2e197817aecbf2f52104ab9fa8b0d27de0e61509 SHA512 656da319bccaeaed88e60618e17d2efc5e1b0de89d50c5214710ef0b1257eec9607574b3b4df28d42ca3cb4f63e06efedf338de2abd2392e9195ef2054fe712c
 DIST OpenJDK8U-jdk_x64_linux_hotspot_8u252b09.tar.gz 102170196 BLAKE2B 529630d67553064d302a81079eb61f10da8fc7fbcb69375020f5572fa4e9a46a679e6b0de99b7f67d9f40305a5347e9337cb6dec1c3cac5576671f52866beb2e SHA512 923a3122aa15db27f1605d1f988efa4a5bc920ad132121ba906f9d4cea11b8bfdcfe5b777ea7f37f5789e0be85135f24f1ddf7cbdff40594336fde7fc0474a6d
+DIST OpenJDK8U-jdk_x64_linux_hotspot_8u262b10.tar.gz 103200089 BLAKE2B 8d747c7ebcf29690dafb7e87a45c602077e22ed626a8b88843c8fcf080a691328aea244f7a4f499d824954a4758ced5e5255521e8b81b238afd19cd5bc741d5d SHA512 3ea2c2638c858a05e520d38493dfe240ee67195fd831a216e28a030ccaa17f890f64f1c723cefca1cead412c602a8cbe42f845345ab01e6d5ab1bde9825980fc
 EBUILD openjdk-bin-11.0.7_p10-r1.ebuild 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
 EBUILD openjdk-bin-11.0.8_p10.ebuild 3154 BLAKE2B 0bc992ac9a262043a1e1cd7289ceed6f58d9f64580358e8c8d78cff313cad0d8b8fff602e62743cbb05a3bf33994fd0d70dc43ff45d0b4d6daea14e28d1490ff SHA512 70b4fe98021cbe4dc671b2229c82bbfb05a15acf1bbcfd523335851d4af58970dd2b70f78594c3ff7c47a959b0eb9197585659ce57c1da10ff17bf23f966c6a6
 EBUILD openjdk-bin-8.252_p09.ebuild 2155 BLAKE2B d5832197b20177c54ea2fff0f636695f9755ebac665fb7eb72e2c010bda94d71aef30152ef41ffa6970292a56c73999587c3edee859cea7378da44a4c19417a8 SHA512 798bdc975d8b4073da3ee575b0a17ba929da4da9ccbbcdbbae0ec6fb32aed37f894707a3c16ab51ed3f61a6126d84a03b38ae6f6f988c9dc52e1cf619fc76e66
+EBUILD openjdk-bin-8.262_p10.ebuild 2132 BLAKE2B 8069af39d569ca7b89bd6648bf9aeb861fda9274fdf3b1fbff835c60ac6ac6ec7df102dc37dd8c422277c99d102f00504fc019b680237a9cb31ea2ded4dfae76 SHA512 947aa7610949efeb2e4bf62ad2f0f32705bf6c5ac34dc66bff263fdd1621da1fe573e11a7cd9a5d21e2a73c2338109f89411410ee6599ef36deff5487d64cb71
 MISC metadata.xml 1025 BLAKE2B d7678bc38651044e8551f51b82f628f6c682cd15305fbe4bc9a9fa9b8f66417e526da18d46ff092d1b82a13a83465d060ef6ffbcfa562ba82bfe6fb9e59de60e SHA512 809731d43dcecd74f45e328780e35ba70b4ae384aea3a28c796a84c6ce2ad8bfc7cf0a6920f150cb4096f61147e9d5326128aeddcc14836752694cf5cdd6e7e0
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild
new file mode 100644
index 000000000000..75ae37d81adb
--- /dev/null
+++ b/dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jdk_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri arm)
+	$(abi_uri ppc64le ppc64)
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+IUSE="alsa cups examples headless-awt nsplugin selinux source webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv jre/lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v jre/lib/*/libjsoundalsa.so* || die
+	fi
+
+	if ! use examples ; then
+		rm -vr sample || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr {,jre/}lib/*/lib*{[jx]awt,splashscreen}* \
+			{,jre/}bin/policytool bin/appletviewer || die
+	fi
+
+	if ! use source ; then
+		rm -v src.zip || die
+	fi
+
+	rm -v jre/lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/jre/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-java/openjdk-jre-bin/Manifest b/dev-java/openjdk-jre-bin/Manifest
index c25d12fc7729..bdd7f1833047 100644
--- a/dev-java/openjdk-jre-bin/Manifest
+++ b/dev-java/openjdk-jre-bin/Manifest
@@ -3,7 +3,9 @@ AUX openjdk-jre-bin-8.env.sh 675 BLAKE2B 66fb3b2690af2cb8bfb959bdd6edf66e130cd5e
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.7_10.tar.gz 42917723 BLAKE2B c5635b3727e10462396891cab89e257ded57c59f56e9bcb84a3d040ce8a27d7d67d6b78e5f55b63806dd93f6151b767df42e4428d12e763f9722196ca0736a08 SHA512 a776dd9168e3c2635a8492405d58628713e646292d7ee16454681d46866e7ea41afa712227e94ed2e8ce52c727e445f4631db63a02408aa817f1c79af8057dbe
 DIST OpenJDK11U-jre_x64_linux_hotspot_11.0.8_10.tar.gz 42904191 BLAKE2B cfd04b2a422e95465cd2938449f7632d29fe655eadadf5745045db6eb74625dffa0e02d8713a93e0bc8fa7da6dc57116fbbd9217a9b30723becd5b9eaceefccd SHA512 55ab4c6122422f4765542df747bce5c65bc78e0e5f4fff4b7efc95342d81eb34d72dbdc13c820781c626f92a2c3687161d0c7edfbe4f83c455c75fcecf8ae3d0
 DIST OpenJDK8U-jre_x64_linux_hotspot_8u252b09.tar.gz 41104123 BLAKE2B 52a9f288054c4a96ed5d70c2c9c6cf14ceb32262ec3a38f547286518ccc14a4695d330adc19e272436c0a7154771cddd9b0672b05beb6d5013c44c69be0ad25a SHA512 b1b0627e8495b11e0ef3e4ecb387d92537bb97b3f3045213658d48b6f2dffa0bc975b1bc92e84c487152b43d1f0ee0449730bf84dd62d98d13354bf73d3a0a20
+DIST OpenJDK8U-jre_x64_linux_hotspot_8u262b10.tar.gz 41755965 BLAKE2B b417d12ba18f58fec1e692a567bd5c0551fcbe023370fe52c2e525692d0d2151d4c296f86e6f4e3b1178e8f933ec6ddb9559e358c5d080cc2dba94ce38680ab5 SHA512 63d65c576d40b798dbbf2c6923151d07ba74312d8e8b6dc722d4358c38855a3a5c9e9e7c267569d390065c4dcc7f4bcfddc3f78e8388b4faef1a61501e2b7b8c
 EBUILD openjdk-jre-bin-11.0.7_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
 EBUILD openjdk-jre-bin-11.0.8_p10-r1.ebuild 2789 BLAKE2B 6268a58c4546fae96623f74b6b1b9a79ab620f281def5be76fd5bf8b9f002624815fde2a4d0a94f4746b3c915ff40024efa7541bfd903b88e9230fe242c89fc2 SHA512 95c655d90572b0fe94c95fa71af5e6623045ef291c2b350c533a6979c464a968c0d03454f72ce37a11ffd191e87dac86f8020c825b9773482821926c0178f4d5
 EBUILD openjdk-jre-bin-8.252_p09.ebuild 1934 BLAKE2B 4886fad419ce981cc39af9c791c00fa4fed1aff50a55fa26c4c607d7be35cfedfd1ad583e8502a01e3edbd568fe3ec32f9897d3e9f110271d4cc5735a654cd89 SHA512 4cca4b3bd3ec8958e8cf0cbe9873b11727d75a92a1edbe174e9d7275b6febe5cf273a4414fdf1b649d48d8c62d7e93a7267f5b78440189d4815634c853da3768
+EBUILD openjdk-jre-bin-8.262_p10.ebuild 1935 BLAKE2B 820f2a92594f10becc0214e63bb9ab33599c80692bbd3528c64e864f4de284f108b8e7644b0061016d0501f124b887be3e037fc927fede74ab6316f74fcc9c81 SHA512 834f46981819d4c5aac9689e1437333cdd55914608a04a98a4047d144f5b9b417c8a17a4c5aff03a297073f2a3e4eaf4b639abcbed7ac87ef4d3e7c89796bed0
 MISC metadata.xml 980 BLAKE2B bedd68b0facaa23d89578762fc5fd80dea94a3dce51e8afdd70dde4fb949168694e633564384a506afce44de11f81bc46ad33c324ff2e8e4c37b2fafd246bac3 SHA512 fbf6411ee2bf3f0aa6d7f475a883c7316b87fe20c54ee43200034268a7f57f8454e1aba5ce272645e08ef41dc35e61a4b965543215ed8278c4b8606fdbaf5f00
diff --git a/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
new file mode 100644
index 000000000000..a38a136210d8
--- /dev/null
+++ b/dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eapi7-ver java-vm-2
+
+abi_uri() {
+	echo "${2-$1}? (
+			https://github.com/AdoptOpenJDK/openjdk${SLOT}-binaries/releases/download/jdk${MY_PV}/OpenJDK8U-jre_${1}_linux_hotspot_${MY_PV/-/}.tar.gz
+		)"
+}
+
+MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
+SLOT="$(ver_cut 1)"
+
+DESCRIPTION="Prebuilt Java JRE binaries provided by AdoptOpenJDK"
+HOMEPAGE="https://adoptopenjdk.net"
+SRC_URI="
+	$(abi_uri x64 amd64)
+"
+
+LICENSE="GPL-2-with-classpath-exception"
+KEYWORDS="~amd64"
+
+IUSE="alsa cups headless-awt nsplugin selinux webstart"
+
+RDEPEND="
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	>net-libs/libnet-1.1
+	>=sys-apps/baselayout-java-0.1.0-r1
+	>=sys-libs/glibc-2.2.5:*
+	sys-libs/zlib
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	selinux? ( sec-policy/selinux-java )
+	!headless-awt? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+	)"
+
+PDEPEND="
+	webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
+	nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )"
+
+RESTRICT="preserve-libs splitdebug"
+QA_PREBUILT="*"
+
+S="${WORKDIR}/jdk${MY_PV}-jre"
+
+src_install() {
+	local dest="/opt/${P}"
+	local ddest="${ED%/}/${dest#/}"
+
+	rm ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README || die
+
+	# this does not exist on arm64 hence -f
+	rm -fv lib/*/libfreetype.so* || die
+
+	if ! use alsa ; then
+		rm -v lib/*/libjsoundalsa.so* || die
+	fi
+
+	if use headless-awt ; then
+		rm -fvr lib/*/lib*{[jx]awt,splashscreen}* \
+			bin/policytool || die
+	fi
+
+	rm -v lib/security/cacerts || die
+	dosym ../../../../../etc/ssl/certs/java/cacerts \
+		"${dest}"/lib/security/cacerts
+
+	dodir "${dest}"
+	cp -pPR * "${ddest}" || die
+
+	java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
+	java-vm_set-pax-markings "${ddest}"
+	java-vm_revdep-mask
+	java-vm_sandbox-predict /dev/random /proc/self/coredump_filter
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 9a95d25c860c..0d2a5a3f615b 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 0f3b97bf08c9..3b651f5ccef4 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -12,12 +12,20 @@ DIST go-solaris-amd64-bootstrap-1.8.tbz 54926326 BLAKE2B 0a45312f090d81ebf46fe59
 DIST go1.12.17.src.tar.gz 20725913 BLAKE2B 2eef7374195302656268a42409619445dfeb3ede1f9218ae4eab195916876b97f7510cc62585a0bfdd9f86dddf8a74000032a84b29bc9891d84fc69db94f0274 SHA512 069f8f445d9d2268ebb14b2446fab34843d56283c04561636d122fd8b4c1ea0b63640a84437db7a7be71039440ffe170cd3f8025b03b0acf95f2a56fa2febec6
 DIST go1.13.10.src.tar.gz 21702804 BLAKE2B 586494604455594c552d25a207634d70ae7f5ad142e18e22f5ef462c6488327cc01630c0bc99a4ede9dee0d649982802cf79f34f35ad7f810ca0701c35a7d555 SHA512 9e020dd89ab6201c4cbb893caecc0b077d5fbb2e10381e1b76a29ddc18c141d8db67a1b0f607ed915b0e9c40c4fb2c65b0319472535892534a31ad962e72fe05
 DIST go1.13.12.src.tar.gz 21703700 BLAKE2B d503b864edd753d838ab2776c00ee29d79c4dadaa8f9414291d7fd9ef420950361e676d78111db171d4d7bad9f28d23897333720d77c259691231cac81aa7b2a SHA512 85ffe18171cd131fc5bdfaa8f5e944643399ef1f270a599cdccbe0212f1d1651a87075d11877220466d18ff590bb9eadeac48851b630ab9f0e06c199c0286cc4
+DIST go1.13.13.src.tar.gz 21704330 BLAKE2B 462a8c7a438c5638158645d012bcf361f5033b94209ee3b89b15b066c6a92ae7b632d9fa295be2bfd2ed20398471a3e9531eccea1c67f511901f6a7f77242557 SHA512 1bee57e6b5d7154e7d93ccf33b9bd8ccacb005d3de1f0dc2272d4d431ab171707a57fe81d65ff17f6016f5c94d5bec6618c13174d43538f7c370d923958529c3
+DIST go1.13.14.src.tar.gz 21704891 BLAKE2B fff860b45b296359cb226f123279b3351f654336d267f8d60607fb0eb9f555e99d2e8250331510ddcf40de43235a864867af4b16db153b3f0827a3ccff045c19 SHA512 49dd28394333eaa7676fdf530d2fc18a645546c814fbe9247c9613e36529eb23634816b5c84574fea1cd9191fa86e684130e75dc70545344851c6b47c846558d
 DIST go1.14.2.src.tar.gz 22454649 BLAKE2B edd8a1081e7da6988532b9fefe6d6f789a7d336562d61d5e585a8b881fb45d77721bee9837ae79318295471aea138e175650c2138175a587f0b7957988e8e209 SHA512 3f6804e1a60df6a7c55c294fe4147b2d6f028c619ad4ae5b1ae8793c6be637a1e6a62721cc7ce0b28918ab3441a89fa9acda72cb5450bf5af8d7872411d28015
 DIST go1.14.4.src.tar.gz 22535243 BLAKE2B 8dc44b2144587e24ef53adcffdf335ec03dbcbb1101e38ac54611eb9e6216d3a676f5a24daab24342018b549b7de2a8730e556abfda5e18199c55d266ac3a44b SHA512 b0d657ea33331062db5a4da0aff14798f292ca967a53665af1a93e04eba7a03e49a3dbc4768c4f099ec5ff25a31885750f7658f819057057093e2d7bfb085575
+DIST go1.14.5.src.tar.gz 22533577 BLAKE2B 4e07fd46f977e14cf493d92a3c3e2d61c8eadf8f6e07b2de3eec7442d2ee0c736ac99f75eaaf405a48d1751144f4ae770692c3a1db9bc8e27e7c48e89fd74540 SHA512 1019b86304925fe60ebd81289349c4582e2e5932dc3ed35d9dc7b36ac293ee583ab6dcf3ae9a96f0f60274f24c295fb0662a8f4d06b717f624fa695c2b40e29c
+DIST go1.14.6.src.tar.gz 22534714 BLAKE2B 9dacb150108dc30fe3600c6fdc1df3cd2c36f701518f402d2ad8cd2e4ba51203176e5097adf66ac9223181197b1bea7de625933c570567d9e7dddf485bc2c204 SHA512 5c865c8272fb0dc8eab1514732b0200dbc867276512714dd30afc658a0d2afac6bd758e00c6f576d8d254e411418a52a564c895399b56cfe06c2b1785271a8fd
 EBUILD go-1.12.17.ebuild 6443 BLAKE2B bf7195702527ae108363ae3cc083f9b65e57eaed8075f5ecf43796d5286c160f8c6c334a5cf5be97e3ff26c8856b97bf1c74d832984285b41666a843563c8da0 SHA512 814bf79fe77e729d6a3270455f526ecab2709400dae766ed8b27714d80b45f9d3113e5c086c862dbd45dfa0fd9267ea2daacd0f994a0264b67af1bf6401a6156
 EBUILD go-1.13.10.ebuild 4411 BLAKE2B 373fd1adf67feddfe122adadbb80da23c13c6ee2b3c1342490ce9f7734c5d2e2f2339f4c26b7fe0dc3372a000cbf55d276a8d4adb13468d99ac7081ddacfd106 SHA512 98d4b8b3f68d6f5609eb6a7c05cd3107877bc0195d475ed27072f34f77776a9f7f92760f29115bc83bff4662025281ab2fed93ab7cba75a6294559f16771ac1f
 EBUILD go-1.13.12.ebuild 4416 BLAKE2B bef2da5b7d1736d7f58c56aea31ce691bf3d4be39af0b331c78f7b42da150206f15c5235f57118097f4ab2451fd7d22661cb0419e080165baea707938ea00c52 SHA512 2e9aa42c5430ce2f955b5119c1f290a64649699de4578d9935df433b8d39d6c13a5dacffc5fe929f277bf579f39dda94da441a10f3dc154762d0f4f6f1d850da
+EBUILD go-1.13.13.ebuild 4412 BLAKE2B b45b6972757fc85d9b646dbd6c216317deeb54941b3e6d89cc74e76ea3bdbe019c61eeac05b1c8d8b06744228ea1c778b3a73c81a5ee7b8560f2eafc5b42514c SHA512 77f6b6614a4a2db0e8003f5095e8d905500e2c935881b8c51db1c4459bdbf2ed57716eb93a15a0108d0002620a865875946fc3122d031a839d78a5e852bf00e2
+EBUILD go-1.13.14.ebuild 4416 BLAKE2B bef2da5b7d1736d7f58c56aea31ce691bf3d4be39af0b331c78f7b42da150206f15c5235f57118097f4ab2451fd7d22661cb0419e080165baea707938ea00c52 SHA512 2e9aa42c5430ce2f955b5119c1f290a64649699de4578d9935df433b8d39d6c13a5dacffc5fe929f277bf579f39dda94da441a10f3dc154762d0f4f6f1d850da
 EBUILD go-1.14.2.ebuild 4158 BLAKE2B 5a926f9e19bb18708d525c84bec0b4d7b6c148f9184bbe39bdca048fccdcd1f6c9cc8b7fef57cb72122a2285691a3972803d1fd53eae265786a634719dd5ae36 SHA512 e22bad602b65f4268e4fa3baf4776bb0dc68605566979a061cfb8d9c1d5e68cac14a8b2ec9241925937b15d3ad72a0daac9c02a61471bd6e05e48a8ea0412d42
 EBUILD go-1.14.4.ebuild 4163 BLAKE2B 49dad3ec3547dff65943360a84a39f4d5ff534973e1497ba642256d45ba77c652804e53c634440d876d3785fed2cd4c348afc307d11910c2761e4a10821377f6 SHA512 ac7161342580de56f1569d7ce8c57a117b02bdd11aefea60a881e57a3eedf116db24199364a154c62983b86522548c03e0c150089e0fdabec1d1945fc4826599
+EBUILD go-1.14.5.ebuild 4159 BLAKE2B 18faeb2f28708e1c90cb145610342545a47dd0e2cf1418e67fb89fad439a596806707ad6b929457455935a86ef7a7877b901844ea61afd261cdeb9a99de531cf SHA512 288a0e5de80fde6a66408c0f0774162e303e7d92c8d9d89165104ec6637fb96dfab89241dfb8847aec11934c5d1581eba104bf17d7aadfe93918d6f99e00c7cd
+EBUILD go-1.14.6.ebuild 4163 BLAKE2B 49dad3ec3547dff65943360a84a39f4d5ff534973e1497ba642256d45ba77c652804e53c634440d876d3785fed2cd4c348afc307d11910c2761e4a10821377f6 SHA512 ac7161342580de56f1569d7ce8c57a117b02bdd11aefea60a881e57a3eedf116db24199364a154c62983b86522548c03e0c150089e0fdabec1d1945fc4826599
 EBUILD go-9999.ebuild 4163 BLAKE2B 49dad3ec3547dff65943360a84a39f4d5ff534973e1497ba642256d45ba77c652804e53c634440d876d3785fed2cd4c348afc307d11910c2761e4a10821377f6 SHA512 ac7161342580de56f1569d7ce8c57a117b02bdd11aefea60a881e57a3eedf116db24199364a154c62983b86522548c03e0c150089e0fdabec1d1945fc4826599
 MISC metadata.xml 663 BLAKE2B fc92966e1b4a155b4d442842988d0404c0148b029d187ab7294d49dabad771296d63ca3184128ac27cea4e74e7d6cfc8852084ca8f1d15a1d0755586a0bf68de SHA512 f67b7e312cfb2a896552ae73e835d53ffbb0a7c71c30f0a7cb44c65e2753055e185e7a5c48e2cfff33a42609629cc3c32ee56a9d8f61d8429798c1e8424e36bf
diff --git a/dev-lang/go/go-1.13.13.ebuild b/dev-lang/go/go-1.13.13.ebuild
new file mode 100644
index 000000000000..0175c07a3525
--- /dev/null
+++ b/dev-lang/go/go-1.13.13.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/*.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/go/go-1.13.14.ebuild b/dev-lang/go/go-1.13.14.ebuild
new file mode 100644
index 000000000000..d71bff70d905
--- /dev/null
+++ b/dev-lang/go/go-1.13.14.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		# The upstream tests fail under portage but pass if the build is
+		# run according to their documentation [1].
+		# I am restricting the tests on released versions until this is
+		# solved.
+		# [1] https://golang.org/issues/18442
+		RESTRICT="test"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# These test data objects have writable/executable stacks.
+QA_EXECSTACK="
+	usr/lib/go/src/debug/elf/testdata/*.obj
+	usr/lib/go/src/*.gox
+	"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+REQUIRES_EXCLUDE="/usr/lib/go/src/debug/elf/testdata/*"
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/go/go-1.14.5.ebuild b/dev-lang/go/go-1.14.5.ebuild
new file mode 100644
index 000000000000..b00f3c4303fd
--- /dev/null
+++ b/dev-lang/go/go-1.14.5.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* amd64 ~arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/go/go-1.14.6.ebuild b/dev-lang/go/go-1.14.6.ebuild
new file mode 100644
index 000000000000..fa07749bdeb3
--- /dev/null
+++ b/dev-lang/go/go-1.14.6.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+
+MY_PV=${PV/_/}
+
+inherit toolchain-funcs
+
+case ${PV}  in
+*9999*)
+	EGIT_REPO_URI="https://github.com/golang/go.git"
+	inherit git-r3
+	;;
+*)
+	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
+	S="${WORKDIR}"/go
+	case ${PV} in
+	*_beta*|*_rc*) ;;
+	*)
+		KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		;;
+	esac
+esac
+
+DESCRIPTION="A concurrent garbage collected and typesafe programming language"
+HOMEPAGE="https://golang.org"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+
+BDEPEND="|| (
+		dev-lang/go
+		dev-lang/go-bootstrap )"
+RDEPEND="!<dev-go/go-tools-0_pre20150902"
+
+# Do not complain about CFLAGS, etc, since Go doesn't use them.
+QA_FLAGS_IGNORED='.*'
+
+# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
+QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
+
+# Do not strip this package. Stripping is unsupported upstream and may
+# fail.
+RESTRICT+=" strip"
+
+DOCS=(
+AUTHORS
+CONTRIBUTING.md
+CONTRIBUTORS
+PATENTS
+README.md
+)
+
+go_arch()
+{
+	# By chance most portage arch names match Go
+	local portage_arch=$(tc-arch $@)
+	case "${portage_arch}" in
+		x86)	echo 386;;
+		x64-*)	echo amd64;;
+		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
+		s390) echo s390x ;;
+		*)		echo "${portage_arch}";;
+	esac
+}
+
+go_arm()
+{
+	case "${1:-${CHOST}}" in
+		armv5*)	echo 5;;
+		armv6*)	echo 6;;
+		armv7*)	echo 7;;
+		*)
+			die "unknown GOARM for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_os()
+{
+	case "${1:-${CHOST}}" in
+		*-linux*)	echo linux;;
+		*-darwin*)	echo darwin;;
+		*-freebsd*)	echo freebsd;;
+		*-netbsd*)	echo netbsd;;
+		*-openbsd*)	echo openbsd;;
+		*-solaris*)	echo solaris;;
+		*-cygwin*|*-interix*|*-winnt*)
+			echo windows
+			;;
+		*)
+			die "unknown GOOS for ${1:-${CHOST}}"
+			;;
+	esac
+}
+
+go_tuple()
+{
+	echo "$(go_os $@)_$(go_arch $@)"
+}
+
+go_cross_compile()
+{
+	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
+}
+
+src_compile()
+{
+	if has_version -b dev-lang/go; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
+	elif has_version -b dev-lang/go-bootstrap; then
+		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
+	else
+		eerror "Go cannot be built without go or go-bootstrap installed"
+		die "Should not be here, please report a bug"
+	fi
+
+	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
+	export GOROOT="$(pwd)"
+	export GOBIN="${GOROOT}/bin"
+
+	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
+	export GOHOSTARCH=$(go_arch ${CBUILD})
+	export GOHOSTOS=$(go_os ${CBUILD})
+	export CC=$(tc-getBUILD_CC)
+
+	export GOARCH=$(go_arch)
+	export GOOS=$(go_os)
+	export CC_FOR_TARGET=$(tc-getCC)
+	export CXX_FOR_TARGET=$(tc-getCXX)
+	if [[ ${ARCH} == arm ]]; then
+		export GOARM=$(go_arm)
+	fi
+
+	cd src
+	bash -x ./make.bash || die "build failed"
+}
+
+src_test()
+{
+	go_cross_compile && return 0
+
+	cd src
+	PATH="${GOBIN}:${PATH}" \
+	./run.bash -no-rebuild || die "tests failed"
+	cd ..
+	rm -fr pkg/*_race || die
+	rm -fr pkg/obj/go-build || die
+}
+
+src_install()
+{
+	local bin_path f x
+
+	dodir /usr/lib/go
+
+	# There is a known issue which requires the source tree to be installed [1].
+	# Once this is fixed, we can consider using the doc use flag to control
+	# installing the doc and src directories.
+	# [1] https://golang.org/issue/2775
+	#
+	# deliberately use cp to retain permissions
+	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	# testdata directories are not needed on the installed system
+	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+	if go_cross_compile; then
+		bin_path="bin/$(go_tuple)"
+	else
+		bin_path=bin
+	fi
+	for x in ${bin_path}/*; do
+		f=${x##*/}
+		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
+	done
+	einstalldocs
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_name for test object (binutils_test) on Darwin, it
+		# is never used in real circumstances
+		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
+		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
+		install_name_tool -id "${libmac64}" "${D}${libmac64}"
+	fi
+}
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 79fe3ddeeff4..f48072693973 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -11,7 +11,7 @@ DIST php-7.3.19.tar.xz 12117968 BLAKE2B 84172d2aad901cdca97a6f4c3405d3f4f25c7205
 DIST php-7.3.20.tar.xz 12118188 BLAKE2B add1e0dcc264cd12ea9ee000becb83c42b2607c0c9ae828994856a183ae94e9a580226559ccfa28dece225ad9a1c6bd4989ada08f09bbc461b33f0b1b30b12ea SHA512 4d035e7420ceb64d912a1936db5d311c06c61d09c9d4665c27fba9709fe45b30d5771bb485fb24393d9ee689a0f7ddcbc577e9ee7a7b31341b0203f1b805b886
 DIST php-7.4.6.tar.xz 10284824 BLAKE2B 83bbbb536e48c6ab6ef357283d2f99a0f1825fdbb1867598514dc87cb8a7181298aa1e6d45659b7a4343fdacdacbbfec9e4cca89f85fe53c9e48696e534da710 SHA512 786634d53ed100cc7638e64ca340efdd42405c258638f3f97fcd1816d4f0c643dc8d8b2b0f60d36904343dc8c2af7f9b8e4a652ea66ec2fe324290c72bc09c13
 DIST php-7.4.7.tar.xz 10286580 BLAKE2B fb297cc5847012e1d222479e00132c8838cb990a5face43620ced6fb82cabeb544c0de230e24e25ed5449b3050158e836743e514197180b40ebf240ceca45db6 SHA512 5b3ba690e610e0511675f06a10afe9edbcfa90b5b16956d22aab225cdf140b55e5a8a551e7b189d30404981c94c6921b8c4aed00102546cfa38784a719704b80
-DIST php-7.4.8.tar.xz 10282248 BLAKE2B 809f6f474ee2c013d2a344b09f710fde8566c6f7a5a78346183852ca8a89fe257e06e765ab33f4a8ee867d6bb1587bb26fb285841b47c42e2562b554798ee279 SHA512 81c26675d88377c7ae9b168e9c2bb622120deb796cb54c5c65d0b2eb6a0b6e465669b0f5345e553afe1acf86ff68c535ff9a2d2df47301b8aa6be01cdc3984c2
+DIST php-7.4.8.tar.xz 10281976 BLAKE2B c85dfacd259e78de69348c3af7c02c866622a414cbb78ef5f53aa739bcf150921c272b26f578f18734dc6f566f19f4d890b6a64aabf04ad9e6b53f11757c3b8a SHA512 cfb23eac731a0eabed83908d7c056a123cd9a73ccc091d92b8601366da4cd95ded8623156eaa0458405f23d8bb9dc244d117bd99876f916ef582e3966dc78b44
 EBUILD php-7.2.31.ebuild 22650 BLAKE2B 85d53142d43bcd67e568a7424e731a5a2a55872dfa5f5e3ec10673e527357d26d1986c4a61dbf049e17b5a5db7b09fef77424da713953fb3153338e68a79e200 SHA512 7f0454f2dba27d443c729663a338dd0d5c746b572a3ccccde3b19a54ce2cdecda9f98ce1df5ef5c7afede8726234de3c1e1c1fce65bee95ad97ca5ec621abe97
 EBUILD php-7.2.32.ebuild 22657 BLAKE2B 05cee5bbb528670ee4d0051be87ae4d08a3f2485d0cc32b75bdf141285f66ea22deda02e342052657c9de071281cc1ea4a241ba1baf13a39cde80d6b7310c501 SHA512 12be7da8a25c08c0cb314e66016876903ac812dd66af457e2694c9b79ac946fea9f58aa9c53af958fe4569b0b2dcc1f52a6811fe39eabf3241b54699aff56916
 EBUILD php-7.3.18.ebuild 22663 BLAKE2B 43f00a48372e83b81e10ddafd965d7aa3a2945c6858d75dc1fbcc4d07a51d22151b02d2e2e50cb91b1e398c77e93adf2eecaecf495453e8c15ae81a70ca323c2 SHA512 ebb57617c9e08b08b717a7458f79c246700aea64b9f407e5c52eede291c7d12a80eb4bedf50a2d7880f2cf73e36391f7db01a40c0622631d15bcdd2e0e8ab64f
@@ -19,5 +19,5 @@ EBUILD php-7.3.19.ebuild 22671 BLAKE2B 9fbccafac097a447241ed68db51ecf147059b1b55
 EBUILD php-7.3.20.ebuild 22670 BLAKE2B e1189c3f64654db130f965393c62dc068345700bb695c85271417d9e7bd11bb1456f4fac6c68a776bd558df6174c6ca7c277a045ef381dfa74d9d1018c62e55e SHA512 4f968b9b704b10c1c5193fcd3b9c5fe1321471083ae175754b02a36e8b59ec914782f364b1f984fe08663b14d3cd2f1e3565acddc38649489f1452b09c2aed52
 EBUILD php-7.4.6.ebuild 21374 BLAKE2B aeb27c63cff434dd9a735631bbeb29a2540546d2416aecdd636e2b6769070615ac148139a3891b708cf6528ac557080c7096dda95d75bfe3812495213126eef3 SHA512 2b67de7efc5dafefc1f95e9b7c22c60bca6b6c2c922857695a5c027929669b9a62068e19784a2059e28e91ff16ad0b47ee691785124bf99ead6dff12239fa4fd
 EBUILD php-7.4.7.ebuild 21382 BLAKE2B 936caa37281c2b79d2d7550de422c32a0dbf41e2f1530aa5709dfd6a0d92f7c5c6b82ead5b14f27a314df5311dce7c726a6571ecdd9aa497812c0e9e71f397fe SHA512 380075433cbb7d639765fa6907c3006612901b051d48311cabd85d653b8e8105044f703a129b8d90bcfd48a29a8365de3053bad81d9561dafc5c5974d7420082
-EBUILD php-7.4.8.ebuild 21381 BLAKE2B 86be9680b1334db0443be21f10df242cea9e3911b4c5ce79a3ffe82c8cd46fc6d4c9c82870a03265688389fc393fa8d2f24ad0806742f2d0b072440ae1fdf365 SHA512 42d942827c680bf97d67fc5556744cfa96aa26ad1070adef9497f3e72a267cd62aca7b0264ab3e0b5eb69235ec93d9e7b95a7b12ae5bf95fe7bdd493abbede2b
+EBUILD php-7.4.8-r1.ebuild 21381 BLAKE2B 86be9680b1334db0443be21f10df242cea9e3911b4c5ce79a3ffe82c8cd46fc6d4c9c82870a03265688389fc393fa8d2f24ad0806742f2d0b072440ae1fdf365 SHA512 42d942827c680bf97d67fc5556744cfa96aa26ad1070adef9497f3e72a267cd62aca7b0264ab3e0b5eb69235ec93d9e7b95a7b12ae5bf95fe7bdd493abbede2b
 MISC metadata.xml 3216 BLAKE2B 6118c94f2ac3a2f283eb035cbbacb12343476b4ce22594a00cb7ebf063abb106a0ed5557d311127b8c1e2a53263103ded790cd12d20c6b410ab6f7d218d95ed8 SHA512 ffb0b46b30b1add0fc166e3afe1317e70041a0fe849d4c05ceee011c1b5e130fbde3b86eaf876a4c8a2d23fbd7824f95299642b4f60e129436befb00f4b124cc
diff --git a/dev-lang/php/php-7.4.8.ebuild b/dev-lang/php/php-7.4.8-r1.ebuild
similarity index 100%
rename from dev-lang/php/php-7.4.8.ebuild
rename to dev-lang/php/php-7.4.8-r1.ebuild
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 809e4eeefa46..f3c47424776e 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -22,11 +22,11 @@ DIST python-gentoo-patches-3.9.0b3-r1.tar.xz 8860 BLAKE2B 87636ad5f1e2e92b2b12f4
 DIST python-gentoo-patches-3.9.0b3.tar.xz 8592 BLAKE2B 261dc9a5c7b370eb3f693f5bfb15562a5ee8b24b038db1b16571f096ff0d451ef8830c7f51db53366ebcf6e378dfab57e186f1789dc3ecc95e65595708f4428e SHA512 4c630b1b15e752ae154bfc9d0f5c8a17ac02127f96ccf114469bb92d02fe7d2ac13acd2415bfe6af0169c823b4aec09e2d6886c031df8e8c809ccb94efa60b62
 EBUILD python-2.7.18.ebuild 10593 BLAKE2B 8e0f4c58a44ffe10533a7e534bb28a642e258468a4d546a77e39075d1c8ff63d2b3e9d99858eb1d93f84b40101f9cdc2b1db0e45ab6755167da486e5f9468e59 SHA512 5f880a3e0a47efb13d0f9f7f9e7ad01f78c46d772d9de999c3bb67b68adca05a1e01dc2fff8b21b8daaba9e0b9cdb44642c35e04a98217b04d5e2ee3fda2719e
 EBUILD python-3.6.10-r2.ebuild 10333 BLAKE2B 550cfb681267f867d7454097faabf278517f6dbd93b64b879d08251ca5d018456baa4097c632be29885ed6f89de82482c282b15f9777cfc21ec5b342a25e6836 SHA512 568baa3112199ef0d3beab20ab37fa7e7c54e25b91285b86f27665a987f3303258ff78fe2682b67c22cabdd3db0724387a9d85f6284b1c059ec709c113194e1f
-EBUILD python-3.6.11-r1.ebuild 10336 BLAKE2B 6ce06989dca4003010fce9972f7a4e3a4e73f99159d3046cbdba8f5ba6adfcd25ba01519137c5701b30116c7456c904a4417923331a0f588411583e6258f3b8b SHA512 64087206a964a584fb8ed262212d1666a5d22eec20d84ac9692b73c22f9a1a35fda94ed8216a961ba44ed8242b4c61ffbe3b94b9939e06e1f2183215332d2849
+EBUILD python-3.6.11-r1.ebuild 10335 BLAKE2B c2af149f87f0c3a3f4b25181ba2eded07438c7df2b9780212b0e00c9ec85b1a251d35fbbfb4c58c48e7b7a5dfe6da11d8c3aab2c6033569841306499a6ab3a75 SHA512 db15e6baec752a9d1e0659a94f9ec35f52c414689eafd9289815ee254b45544d7979ecc0ab3344834b24a72c116ed595044eff045461823a3b83e074314f71f9
 EBUILD python-3.7.7-r2.ebuild 9877 BLAKE2B 182391402d72a38090801f4ea95ddcc26385bfb6174d7fffe6d0acb45fc735ca62d561ba64b324f2e6d64761f51ec18dfc1c4f04abe131138ebe8985b927fd2d SHA512 39fed5b175cf581371ae4150c539e4a2d1a3d5f7f247d92147c49fd8cd7eb231688d7507b1efb10194683834b37697c5f4e6721bffd592ca8698355fe9670a58
-EBUILD python-3.7.8-r1.ebuild 9883 BLAKE2B d186206109919641f04faeb10efa7208b458919c1e20e810fe24ee5e08af4f46489d135247fa13c7e0b167eac792b975b7aa83e21b5bb80e12b4b9b9658faa53 SHA512 35a34ae35268959cddde481069e52970da22e52e863d3abd506115177695d0810cb97bf621d09dee509850c566454ec16361480a5c174b4ba7eeaca013df02b9
+EBUILD python-3.7.8-r1.ebuild 9882 BLAKE2B b451a22889d8849c3cc49f90209419758c8772bd8734f7f0e26980e4fcaddf33d7e678e000bcbba24484fa717e36b6ae5e51201c0bf7529994e468caafda2f90 SHA512 6c24bf8d22bf85f4e24d44869c5fd760f154187bb07e4f118c2264c318de8161eb565fc6e985f607dc927315db67fdae3ded7ed7de4d2f0b58a41878703ae683
 EBUILD python-3.8.2-r2.ebuild 9928 BLAKE2B e131852b497fd24ecf3768cfaff2188e499a0ca0700443a146b26a0b2e38c1c83a0438455f22afa45f7eaeb96e744bdce9a1530ad831fe929ed561f3f0cc84a5 SHA512 b43d77bf74b18d4d758df5b6399cc38e5edfd52d1652f5b5c0d6083f22ebd5f880e4e5a12244895300aebd284863e77d0318c053b0e87e7e6572e88ec6b5c15b
-EBUILD python-3.8.3-r1.ebuild 9931 BLAKE2B 93864070b2bf1f2a83c9e17d19f95340101eb3786f608e529b987026e86b8ad20bd678fbb7b2020ce62d9901a7800aaa277f7d02085af0a93471d6bde6139179 SHA512 de0c7bbc277cf8f99174bbb3f685b0b57d33e290e625387582d35f1cca78407500474bbe593f04a2c78e42ba749d5bb36d91f4a6dbf86510b42f14cdac5dda87
+EBUILD python-3.8.3-r1.ebuild 9930 BLAKE2B 44e32d284c6a9ffb92b793479a883a8cf4a8ac515a0a6d0a2bfe1afd63013a30e958b97c9365e9097db64761c258c464a1092ea67c4d3a4ace9b2badc9a42a87 SHA512 10ef3bc8946672dcb7fa0c1a39822ed126a6994d7c6cc27845174530b7a65d15f5cb1d18365178d06ffd6306c033b7aa44712e7736943a975299440f6fa96edb
 EBUILD python-3.8.4.ebuild 9937 BLAKE2B a16018acc8270224ebc33c2b5b0f23a569557cf7080d866bfb259f38bd80e0cccddf4a4fa68ea518ec704387229f87625f2f618ab7894c0cba50fd26a51597ef SHA512 02ce06f3ab7d4c5d09eaf4aee0a1868bd96d06ef8cb7df639926f1d2399d8aa1a8c14d14da620c0d380764e220c6184f6afa3bca60e7408901d55472368caca2
 EBUILD python-3.9.0_beta3.ebuild 9219 BLAKE2B 7901178a271e7e6bcb8cdc8d7dfa39475fe1f77c298d6222e0aa1a9dc32f999b49691c14102ebb755bf9fef85717fefe1a10b5bf6d2988f8783b6944cb56c989 SHA512 7d05c62b192e2df79c0ed74ca13054f45ddd9c0f2fa77aea0c0ad805cf70274678f8282a6fe7d7f890cae52a07971497c471510e1f1fb1555ee7177b93ccdefe
 EBUILD python-3.9.0_beta4.ebuild 9222 BLAKE2B 35a889a4990665a32752a74f2a7a5888fcf47e80b71e8a3f895b67de9f905b2567039a539f1e487d1ff6c9af1fe69302dee9cff6e3b37e11e1e6b3cbef4b9095 SHA512 7f5d82dd55149efafe6e2194f19b0a46564eed26e63ba4e0c530c932df6a8d46fdf3424f414dcb505db6a112235d83f42528fd67237f54ba1280494af5a977b8
diff --git a/dev-lang/python/python-3.6.11-r1.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
index 5c1a2754fdd0..de6b80a6766f 100644
--- a/dev-lang/python/python-3.6.11-r1.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.7.8-r1.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
index d93f4007b1e6..164cc433d959 100644
--- a/dev-lang/python/python-3.7.8-r1.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}/${PYVER}m"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/python/python-3.8.3-r1.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
index e0ea8b4c4022..9547e2cf12f0 100644
--- a/dev-lang/python/python-3.8.3-r1.ebuild
+++ b/dev-lang/python/python-3.8.3-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d6d81a914118..75e74d80f0b2 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest
index 0bf3ec0b3a99..7b4bfbeea0d1 100644
--- a/dev-libs/iksemel/Manifest
+++ b/dev-libs/iksemel/Manifest
@@ -2,5 +2,5 @@ AUX iksemel-1.3-gnutls-2.8.patch 488 BLAKE2B 7834ca7b056b44534cc1c3301c9b58b6603
 AUX iksemel-1.4-gnutls-3.4.patch 1656 BLAKE2B 83d8e5f2e5aa7fca4721e35be46ee08cbaf8f6ab66be86e1d01766c567fbf8762ed7e7d13d729afc2b44b460e0fddcc9474e61af3c81fd2696fbe1ed71f57c1f SHA512 305990e760218b1ce59e55aefb31126174f6a8066b9ef20ed3073332ad4e925871709e4c5b52d1e3fcde7b2fc9776dfd3f74a763e897cba4eb45657d3946d518
 AUX iksemel-1.4-ikstack.patch 955 BLAKE2B 62223a269c7079fe40a0b835c1a6d2a34d0dd9b3424ae45e0f14712d388547321e66cbce2763bb73065ed53df626a572e6a72d4550e85801e3390a5a61dde7ca SHA512 d97dc724c9b41983e91889e742d604ad9cf752536b012c13a5667c59baa1f5467dc02e7e390e4eba02475e5c994484428c26079351f8e9450b7de14e08eb0cbd
 DIST iksemel-1.4.tar.gz 515581 BLAKE2B a0e9b8dc6f9dadc04d17d2952034b56c4665c7a9c0549bfb52e3adfbc7fb6af17d1b0de978835081e0d39c8200e41d5528f6b3e1dbf51a4fae160f59d5c474fe SHA512 902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc
-EBUILD iksemel-1.4-r1.ebuild 883 BLAKE2B f96459bc3115e09e135b52cd143ef7612533351e07db143e071191e4edf4ed28f08ee588ab2e72f7fc65034ff1158398261a2ea1ed6908df6f05240409d0250a SHA512 5107af3aee778cc1fd5a41ba227c5d1ea2eae30a7cfd2643761c3cc70373e9626b3a93d51836496774e3fc2c62ef55774e7abe743ab022d060e3131559aafa9e
+EBUILD iksemel-1.4-r1.ebuild 887 BLAKE2B 7815ba77c6255e2c1bb1581911c4a7bad0bafe52d1e86009843517f3b2ffec97279cfc293701f3867344bb8b278e60ea253def8d8b4bf596661f23c42705c717 SHA512 1f5afd5be35e8aa1d554d288ada15658a09501ba4b7d0eae8ff9c61bd9b542799a0fe9f66cb4b454f6abe1af03fcfe457b19b1e8790f756c62d19a7e7f64b140
 MISC metadata.xml 301 BLAKE2B e3de81d61c491692f64943d6478ab64332cccceac5947b522a6d6b62127217792205e16c2ea9d04de150772b3337a38793a79e950500b43e837f309651cbcd6f SHA512 91ac21f435ad0c2943e17058fec736cb0371690f38427302eb360a284b48017841b807cf5f6f13c6c837af9d1c330dc9a7980ff77a5699e2efe399b01ca840c0
diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
index 50766b4d7e71..2f1d27b52bf5 100644
--- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild
+++ b/dev-libs/iksemel/iksemel-1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 IUSE="ssl static-libs"
 
 RDEPEND="ssl? ( net-libs/gnutls:= )"
diff --git a/dev-libs/keystone/Manifest b/dev-libs/keystone/Manifest
index 4a83047cea23..4a524243c2f7 100644
--- a/dev-libs/keystone/Manifest
+++ b/dev-libs/keystone/Manifest
@@ -2,4 +2,4 @@ DIST keystone-0.9.1.tar.gz 4326151 BLAKE2B 2d41388f4beeff3c424386c77cb75eeca613c
 EBUILD keystone-0.9.1-r1.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b
 EBUILD keystone-0.9.1.ebuild 1740 BLAKE2B f1266df26be8551da6310d93d6e4972458c0692136ba02d2741dbb7cf75de629c0190f48ce58e8a630e662fc165605e708a4420edddcf3025c0ddd2834d7e421 SHA512 e3941b5166ef543cba6d6247e21aa6a8b0c49aa7faa72a0b28375012160134bcdb2f7029ead47b13e604fc373d3b948729e37b395c5485554c580ada86b5a9fa
 EBUILD keystone-9999.ebuild 1990 BLAKE2B 58a06e5983847c4e0c67ec4b84628eaf62e5fab8acdafd60e7b18a4b03d518c545fe372304bec7ac286d70456a8fce993515eea3520d72b7f4ccf7723e6c6e15 SHA512 08a33874baf524cd32526c684c5f9b66bdfe7054b09def953e952bece51a2bfc3a6dd462a001f4104e510c412dca32627b7d5aea43d6bbfb209e68c90412916b
-MISC metadata.xml 464 BLAKE2B c4a2f085ab1343377cc2f2579511924578e22d74b1204ed517e8cebfd163455b36bae21cf6454ae5a723b52d50a7fb228db363f38d0de032ab1ee5e84c6ccaf1 SHA512 b1b21373ba08d12d1e6508dc7aea5f65922436cd71eb864f20da08214e93d419a181da6af4a59397e632cdd27d279efaaac3bdf91e28c1b6145f61fdf2ae4490
+MISC metadata.xml 256 BLAKE2B 3e4f2745a843bada1b6d70aa80041aa3235d81b928ad329e3e01d8dbfc65c4408e73b7f0a2ed11b838fe25dcd6c20e2ef6461a3a9a08a81176eca079e22e203d SHA512 2d6b8edd67d5030357e85c8262e76ef07bae042f07c1061f4883554436236790086cf77b27d0fd107ebeeb2f4d9f30f47be0d831c907e4cfc84c2e99bda188d5
diff --git a/dev-libs/keystone/metadata.xml b/dev-libs/keystone/metadata.xml
index 4283547f970d..0e605aea5762 100644
--- a/dev-libs/keystone/metadata.xml
+++ b/dev-libs/keystone/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nemunaire@nemunai.re</email>
-		<name>Pierre-Olivier Mercier</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">keystone-engine/keystone</remote-id>
 	</upstream>
diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest
index a6c916169490..5cfc5e4e30d6 100644
--- a/dev-libs/libffi/Manifest
+++ b/dev-libs/libffi/Manifest
@@ -6,6 +6,6 @@ AUX libffi-3.3-ppc-int128.patch 2309 BLAKE2B 5b0c89e8f9f63329d2cb796d23b3a22c48b
 AUX libffi-3.3-ppc-vector-offset.patch 1425 BLAKE2B 334ed26ea082c603cfbf43d37e9cf64ac34a7054857743a9fbf5d05c7226402dfec4fd955cc3dc5652f57712bbaadcd0551ff727cfd8f8305edf38daa9814be2 SHA512 742ef73d95e39eefcbcfb423c4729966a31bf88ff00d20eab6c4db1db04e97f53784bf29111c57c577d1f6264735ee4ed797b4537a74d0ae1753de2990cd3ce9
 AUX libffi-3.3_rc0-ppc-macos-go.patch 2100 BLAKE2B 7ae1309b08be9293acee042d141bb632b0763af9e14200ef7206db763b01e289a68ce544709c8abc5a86adca5f1c0c895c6bf24f667429b118bf660ffa95bb39 SHA512 4684b87f1d36a0098ebde7996e4417718b3535eb66ec7c619be74fa30e4446849c246b491cad3aea1ac44bdf9e9fbf6e952000cb85299faf5b1d8598136b184b
 DIST libffi-3.3.tar.gz 1305466 BLAKE2B cddc40729a30a9bd34d675809f51f8d1b4ccaffa54bc6dd6f7e965f4e260edd34754719f9f6247c8957aeb7cf154d56ce1fe16a54c3f1ad39afbebdf41d23caa SHA512 61513801a156f11420f541d325de697131846487122d6bdcf5491b18b4da788589f5c0bb07e88e396495d3be5830d74e9135595e2b8ddbfe95c448d8597fbd6f
-EBUILD libffi-3.3-r1.ebuild 2792 BLAKE2B cb9ff2ba67aaa92522f8e7a4d808db29c006bad4bd2eee00f1ddab0939c8a6bbb2ac05cd98d09a990787f12cf284523264daec11c50acd79c383f9af96c0094c SHA512 90c1e7e9f7d186f6100dc0d5a4c4bbc45c14cc6dfc4bc803bc1853c6b18a3ac5ce17ed30a84967ddee59881c3e2c8764efb4092a844ed81eec01ad7d20d7c6e0
-EBUILD libffi-3.3-r2.ebuild 2893 BLAKE2B eb5d3abb302a119444b09992058f4f9822fb71a08bc800bab8a30cdb634dd083e691920c35631e3f736902e3f84f3b5295dc2f297a795e77acd72cf177e6bfd1 SHA512 0021922e2ce7963d31d2267bd63179c5b899149544f078b57c66f6be3400d1ef4ec91368f453f9656f2c6f51aef05a6a3fdb6ddb2471c4e4bfa8ba66bd768b45
-MISC metadata.xml 2034 BLAKE2B f63969afac51937e2c761f164de6a40addd97871037f20e4c6fa0da80bc67d6e7580d3a1eb51b943e0195bb7f480abbf461d00da6e2317eade55d2ceeb1cb3fa SHA512 c1c48a13ac9818b7e409180b27751f172800c217d1a37db954490478abb0a3e8b585631a25507b1ac85b11f41da95b15ecf139b6880801b6a8ea805749efc1bd
+EBUILD libffi-3.3-r1.ebuild 2609 BLAKE2B 36fbde1f703bc2e49882a24f91f5d039972f0825bc2ea864c5a110ff033b897051fa9d675f2fd61624d8f523d3532f0028b2f5b6144d2779ba9f992a2a706a35 SHA512 966a1a6d4b98de9a0eb7b54fb2e54eb7fb7caf9f574806740304cdf002fae5694a0e519c96bc77e6feda9eb90bc9489e51f29acfa6afb771cb35ab41652d2c8b
+EBUILD libffi-3.3-r2.ebuild 2709 BLAKE2B b526c8df322b2b12be670d70d81932c996720f4e6565754335c3b831dfa5895f0d6a9090858e730bc8ab32a3e69e584876b727f7b7e234f4273eb9d33af7d2fe SHA512 8ed4b3eb3c6596f394d894f61ce5de692af7d5d37213a8788614570e7fba0252bfb1758cf7dcd67800986a52d9b34ae721b22c1f471f5a00c1c8f6d2dbed6ea0
+MISC metadata.xml 1956 BLAKE2B fa40a1a4cfe54a77a1a7d8e4d5ae8a1f80c4497c38a2e700e242ddab26090ccbaf4738e67c288e5f337c393aab085b161f23138f50fb8b1bfdac2de1eb440428 SHA512 87638bd9030782e1e8e917fc1fb9e28744b7dfd927d42e36a249cec835f734db3c6430c2ebc807b7541fd9ba8d805b57ced30486e8bd046dde2edb56a4af7906
diff --git a/dev-libs/libffi/libffi-3.3-r1.ebuild b/dev-libs/libffi/libffi-3.3-r1.ebuild
index f5c93c381235..996855591ae6 100644
--- a/dev-libs/libffi/libffi-3.3-r1.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug pax_kernel static-libs test test-bhaible"
+IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -50,15 +50,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	default
-
-	if ! use test-bhaible; then
-		# These tests are very heavyweight (hours of runtime)
-		rm -v testsuite/libffi.bhaible/bhaible.exp || die
-	fi
-}
-
 multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	# --includedir= path maintains a few properties:
diff --git a/dev-libs/libffi/libffi-3.3-r2.ebuild b/dev-libs/libffi/libffi-3.3-r2.ebuild
index 22591c894710..abb1a62a7f17 100644
--- a/dev-libs/libffi/libffi-3.3-r2.ebuild
+++ b/dev-libs/libffi/libffi-3.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/libffi/libffi/releases/download/v${MY_PV}/${MY_P}.ta
 LICENSE="MIT"
 SLOT="0/7" # SONAME=libffi.so.7
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="debug pax_kernel static-libs test +test-bhaible"
+IUSE="debug pax_kernel static-libs test"
 
 RESTRICT="!test? ( test )"
 
@@ -52,15 +52,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	default
-
-	if ! use test-bhaible; then
-		# These tests are very heavyweight (hours of runtime)
-		rm -v testsuite/libffi.bhaible/bhaible.exp || die
-	fi
-}
-
 multilib_src_configure() {
 	use userland_BSD && export HOST="${CHOST}"
 	# --includedir= path maintains a few properties:
diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index ee959783eead..6e9a28c5ac88 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -35,7 +35,6 @@
 	</longdescription>
 	<use>
 		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
-		<flag name="test-bhaible">Run extended regression tests (very slow).</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:libffi_project:libffi</remote-id>
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 3740c7f73d54..7ee7ac083b8b 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,8 +1,10 @@
 AUX spdlog-1.6.1-libfmt-7.0.0.patch 1218 BLAKE2B 2d3dce85374db1489c5a94eab92b24e947334b7e56345eac17d0e71a0fcce9c99d886f36695023d3af872bf76d5e325b50f5b82cbe979ef539e4db52eb8db1ee SHA512 bc3beb83654ca6c69d6732ccc62c33df202e14e53e0ac5a762d163efb933ba6ebb0d169c53067ba724216886f4036ebfdea1a86a21c3ff3f06a26049e85fac32
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
 DIST spdlog-1.6.1.tar.gz 285531 BLAKE2B 525f29098fd0f771e14cc7c4bd8bf5d4054a0f68255aea29ef5158ce61516d9e5f0ae0fb72a2f54303d18194a54acb5c1731f53ee6edcd74ff487227bc332236 SHA512 1e15e7710744212240d79897af8c3bde14fe3b745a1377643d18dc0038f18fc7582236ff21836d3eae2c75cf1f4820ca4c642c5c3f63f9ae138289aa4d00e22e
+DIST spdlog-1.7.0.tar.gz 285615 BLAKE2B f1a20f8ec8e9746e360106f284544b20e48664a91d17b014abec26fd0f2ce3d25dd33cfb925f4468fa32da394f6efaca033290bdcf66abe8b067444999b87b63 SHA512 e15d461ac7a6d3d3186fe4283e4fbaf56b2ce3011babf892e3b2d3dbdd7e999a861f1f6f67a9d88a5cf488a440add087ea78e96131f49b52ed6c7815a972799a
 EBUILD spdlog-1.5.0-r1.ebuild 940 BLAKE2B 5bd3e51e37049d4f99d1e8b286a27942393788897cd5363a03d4a29aec2d19867c46cbbcbd90da1a55d8991dba17b87aa8380b04ad1c3d451dcd9b80e9fb9525 SHA512 4e8f4ba9a45110108c77a6f06e1fef14bc9240db69cf10b66aa86934f650a887f6ed3677aaa662f51eaf2c782b435fc2478f3b03719904dc314335c875652261
 EBUILD spdlog-1.6.1-r1.ebuild 995 BLAKE2B ee5b89e73665491c7fe25d54f54b79a9b3cd77cb084361004d615be6a5f942b7008312201c475ee4f912411d7de9a018061cc29592cd28eed94e7645e0adf9e2 SHA512 87ca639172fdf1e876173f5b79c5e36352627c5088cdeae1e535fb8c5c8e842f236aa4d6a4a7a200493c786e39a320c7ee717135d1ffec231d03dac19aced585
 EBUILD spdlog-1.6.1.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
+EBUILD spdlog-1.7.0.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 EBUILD spdlog-9999.ebuild 943 BLAKE2B a6081b7bca5944e6c2c62536e9e76e234179a2a7962d9b7dc721c77f146854adecd2232e115ef98ce22e5963d57b38fd2c1c16263e1d8c2e5a4c31845638fd42 SHA512 a15d952219c91851c7a89f25b1e9693cda0dd09cb4693ff8aa73bb4b5c700d80124ae91a3a026018df78142267823e96e9207929dc79ac42b884ea16ad19b0fd
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.7.0.ebuild b/dev-libs/spdlog/spdlog-1.7.0.ebuild
new file mode 100644
index 000000000000..0cd2105637eb
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.7.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Very fast, header only, C++ logging library"
+HOMEPAGE="https://github.com/gabime/spdlog"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gabime/${PN}"
+else
+	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/1"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	>=dev-libs/libfmt-6.1.2:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+	rm -r include/spdlog/fmt/bundled || die "Failed to delete bundled libfmt"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSPDLOG_BUILD_BENCH=no
+		-DSPDLOG_BUILD_EXAMPLE=no
+		-DSPDLOG_FMT_EXTERNAL=yes
+		-DSPDLOG_BUILD_SHARED=yes
+		-DSPDLOG_BUILD_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-libs/tomsfastmath/Manifest b/dev-libs/tomsfastmath/Manifest
index 696df45785ca..38752aaddc9f 100644
--- a/dev-libs/tomsfastmath/Manifest
+++ b/dev-libs/tomsfastmath/Manifest
@@ -1,4 +1,4 @@
 AUX tomsfastmath-0.13.1-makefile-fix.patch 1703 BLAKE2B 2182f88b8569fac105eb179fdc7c10a7c9b7b17619a725c30d8374a2589f048e0ca0fe71ffb2431e058a264b104bc091deb800215a490399e722055b39adee0e SHA512 f5e5df821ecc7beb8684116294322dae8bf166bfbc7cf3d5262534e036f1d486854e58ad2c2da382b8f08aa6b9db71d91607289587c4247837bdfc3313ad5cff
 DIST tfm-0.13.1.tar.xz 322684 BLAKE2B 393c0e0e018b199c9fc975ab3013466399ea337f520f4634649a9e61b2218b9a6b218d11212b535fc8bbd2bf40d8722fc413dc60756f1b8ff7c78da049765083 SHA512 84225fe81bbcd1df7e40ed0b8c8077d60612246a76f3149b672dfd1066eb0179262fa4f5a42ffd2034e60cb74cfd86e0b49139371971ebbb4f41a4ecebca2111
-EBUILD tomsfastmath-0.13.1.ebuild 1649 BLAKE2B 740e06df89c6e2a7fa009158ed8f32f6c3f4769bb0a11f9d1239e7248c546e2e9865a7d7f1bb591f4e703d7f585f5237d2bb807f6170d1efa871b5a64178fe5a SHA512 e2004cc6fbd4ad3adaf1a19762169a6e8cceab083b0af07eb0d165351b4a31657f4ff1abc140cf2148f5e8e028d1a6c75c621f3f978a8acd45b81f590817a04b
+EBUILD tomsfastmath-0.13.1.ebuild 1646 BLAKE2B 26bf0d334540090ba6f86971f0f2deb522ed7b1065e5884a5b5e0cd83460eb5e511d37356b0f8b6f7b5780896f4ea59e938c1811909c32998c17b9ab5c21b4e9 SHA512 1f90794f72bd743905de3df93b92ad74b3f5dd622e104966a8c0c7fa7b077113a210f3a9fefc197272b51132ec1d6985a8534a2161a8e3226211682386ce93f1
 MISC metadata.xml 358 BLAKE2B 8dc827f40c0b51ca769622a56b5282b3265428fccc2330cb1732faa1ab03a6962057eccda6c0c0b58bfed3fa190e64c77fad4e6480cf65fe7ee251eb087422e8 SHA512 1473c76d0d4a743815de12895599cb3f9f97201f0eca1231af0f16600b5b795dcd8c4cba4847e3166004dc0b3319011bba2945dda510bd789d7b0ee066d96f88
diff --git a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
index 8ddde1737502..183f6c04c6d8 100644
--- a/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
+++ b/dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="Unlicense"
 # https://abi-laboratory.pro/index.php?view=timeline&l=tomsfastmath
 SLOT="0/1"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86"
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile-fix.patch"
diff --git a/dev-libs/tre/Manifest b/dev-libs/tre/Manifest
index 639dd72dc066..43506e3aef8a 100644
--- a/dev-libs/tre/Manifest
+++ b/dev-libs/tre/Manifest
@@ -2,5 +2,5 @@ AUX 0.8.0-CVE-2016-8559.patch 2658 BLAKE2B 12a7d12d35e2d61457fbb9e368cfa738bad74
 AUX 0.8.0-pkgcfg.patch 420 BLAKE2B 6b04ff4db2abc5dffdbca50bcbbe20974fdaa24ab25875f2538eca5af42921a729550e7ea5188225d3d73661e9ba05b96ff345fb4d931130ba4255b14c3944d2 SHA512 a6e4713aa0f9619abe256e9e1ea7c5bc8cbeb9ed173dd856972af70612ac435206e2b294ca5947e93223c17de875ba2620bf57949332b19ecff9965e2ee1a9e6
 DIST tre-0.8.0.tar.bz2 380714 BLAKE2B b2af6e805e9e19fd69debf2f881ddfb591317f69db4e29a04e1899eb69100b8ac7744f86fa438530509ca2ee8aa1d346d416c6391f13247cd9398f4c59c2ed85 SHA512 db7465993e0d25eee8e52f974427b8a040234cf0f017769eb94ee88bc6261821336aad7f762bfa82db7e2212d8449bc221592586f061c528a59a550773cbc263
 EBUILD tre-0.8.0-r1.ebuild 1412 BLAKE2B 5910c54dd847e5ced32abba2c747abcb86c73701332650aa2d937b5470a78bc00be5eaed6cfeb63346b0af0cac702a7baea357ed2dd53aa2c2d600501991fcaa SHA512 ecc2906825000bab1e1286282e445f3da63d36b8896086ba5212646c727300a0c133edfb04a221385b0dc3173156029993aa63f26b43c69d79f78a0ef3aa8d2e
-EBUILD tre-0.8.0-r2.ebuild 1455 BLAKE2B 681ff4583cc680620528c77556aba91a077e2502bb9f0c02fec1c95b1f90d2a6e855d1a86f8c7884bc0cf51143dee91acaba418599aca7e16489c321305c5085 SHA512 51afcd8965a0d723b3d8a52539e190ceab59db5ce2b98c47ad932c549fc98545b8f926990b9ed7db6e7f64eeac013d80693c898bd4e61300c4f2da175f5ac945
+EBUILD tre-0.8.0-r2.ebuild 1454 BLAKE2B 95bd25dbcb07107500ef0de52c942e08e8c0031f8d40327508fcc24cad81108363e8311dc0cad66a07f0d54b53a073eaffdae928445aceac9ae88ea804ae8ae6 SHA512 9f2f38f70562649863608633b0d96ec4c21968eb8e20ccfc9404a57f5f0520e165bf00aa1343270531277a30171606d4c7648e231e4c6f28342908bfeaef30f3
 MISC metadata.xml 353 BLAKE2B 0346462595f8f9a38758ce0817e787b87b35b329aef65d2921214d32bd9313023f006ee2ab31084a03a2f8a8ecf1d556dd11f190ac2467ebcd061bc144b977e4 SHA512 907b341e747fb9d7ba7b76f300d373284a21a59e3d649275c4a53ac681177f94e9d0d9f56b15365008262b2aba91236d9ac5623387313c7b74b65b2b70871d3b
diff --git a/dev-libs/tre/tre-0.8.0-r2.ebuild b/dev-libs/tre/tre-0.8.0-r2.ebuild
index aad4e57c4865..734f35f78699 100644
--- a/dev-libs/tre/tre-0.8.0-r2.ebuild
+++ b/dev-libs/tre/tre-0.8.0-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://laurikari.net/tre/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 2f795b93b4c4..a80f7cc67fcf 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/roswell/Manifest b/dev-lisp/roswell/Manifest
index 533eb284d436..f7c3bb9f34b5 100644
--- a/dev-lisp/roswell/Manifest
+++ b/dev-lisp/roswell/Manifest
@@ -2,8 +2,12 @@ DIST roswell-19.08.10.101.tar.gz 163259 BLAKE2B 80080a7d2665fd674281ae8af7ac735e
 DIST roswell-19.09.12.102.tar.gz 164475 BLAKE2B 432a9aae8a2f2caa4b7c996829daff1e6a8807cccf936bf7d9aefc69e8842b73b355aede1213ed8ad3e2f3ed093fbb33f0d4f48c991ad4ae5dc3f919d5ea7c38 SHA512 04f6db828c81b7e6310c612e4a3fcd0d0abe6e9dbac794f78f9830902c8b8ad02bda7ff313edfebfd31fa299b2553f258dc82307ccdaf025b9eef2a13e93de54
 DIST roswell-19.12.13.103.tar.gz 165717 BLAKE2B 9d38deab38154146ebba80ce4efdcc99c2d4ced312cad5a04ba44bc1bf5f10cb3c83bbbccdbdb842f0ef92e7d20b7073973d4f7f3438e732987cfcff8ec4386a SHA512 3f7180843e81108ff026df6ead5541325dc622027483c2a33069020bdc90916c263a73ec40ead5ab0af2566967aa2a4cb8db2ece962465e7b0a41e4a6809335a
 DIST roswell-20.01.14.104.tar.gz 164384 BLAKE2B 905bb54081da137c588b911f1aa6ef4957e9d860c9d42b72bcda37b084d4049c4234a757514170e2a857de40c4970d70e53e98d72bbeb037e5c35930fbd9286b SHA512 8eac3ada8afb9f2ee82004e46fcee72e45cfd2ed4e86dea8892ff6fa0bb5339bca7e3d1d4a7e2930d6848ef1bf1ef4b63aa576382bee1e66e98cf50441c81c7e
+DIST roswell-20.04.14.105.tar.gz 165121 BLAKE2B f7f0e651768aa2a0d8ccd648b511eaae8d9c18e64941b0ce1a155017e53bd5b6552b129afa35ca1132765d1f03ed91c26d9d83f52799704857f1c3f1475f581d SHA512 3e63b206253c0922877beb0c5091fc42052cb6a711b47333c3d6553cd22eb509f6fb09a0e073465bfb45225b46aa4041d760df17c8e781d3b815c583e9578c3e
+DIST roswell-20.05.14.106.tar.gz 164302 BLAKE2B bd2387bea78a746d5cfedc27e9d636ef7bc0f5118036ae2270c49a4361268527fafe2683850a2dcaeb1bf3f14db6a24fecd98f395081fdc1b4db620838d2936f SHA512 03a923accc4d6ac9a3a3e0fd1853441bf4be0268571e8b6ffffc122170befad6b1dcda6f062a566b54229bb325efb6a5d39459ce22a89355e927e3fea1e08cee
 EBUILD roswell-19.08.10.101.ebuild 448 BLAKE2B adc660208bf651b5a8fa4935a67f667e9f177d692c991adb365e7d964922a791eefc6e31ea86dcb89ed75032c4b77ca5bb0807baa7ab70c8ee7ebcc3782de340 SHA512 cb6af70bfbc9041934cb9de1ff0137e9ab14476e0fb57472b6d659cb1ff0344c6ee685c01ee4363e9a263af07b8838e56ec729b77671c77b627a931f5419eb22
 EBUILD roswell-19.09.12.102.ebuild 448 BLAKE2B adc660208bf651b5a8fa4935a67f667e9f177d692c991adb365e7d964922a791eefc6e31ea86dcb89ed75032c4b77ca5bb0807baa7ab70c8ee7ebcc3782de340 SHA512 cb6af70bfbc9041934cb9de1ff0137e9ab14476e0fb57472b6d659cb1ff0344c6ee685c01ee4363e9a263af07b8838e56ec729b77671c77b627a931f5419eb22
 EBUILD roswell-19.12.13.103.ebuild 474 BLAKE2B 08b89e1a12096c9ebdadfe4a58305755ecfc6faab143bddee8d1b0a73d1224182604c573614e790273f565b044a34459212809ddc5ccc1c1b70d85501fc67995 SHA512 ab085e14194e49dcdf4c46eb51229b6a581a8f592d569937ed0e1b42b2e6893b433b20c3b3868bf8af95e65bbc3ad6fbdbc9a7ca00851b741ae7404f2720cbfb
 EBUILD roswell-20.01.14.104.ebuild 492 BLAKE2B 03043785edd822cf9eb850ecb74b345a8550afdd2e8f65d923f200ffffaffacc8ea6e56f3a36619e2b2ff7e6cb871b3a11d8da0401a682b89ef757ee35d3314e SHA512 707515dc5f0f25be00ec6029c588044668394975d30a8cbf157fe377287c8a9775da6e494ab63f08f5f964cfbc127609c7aaacb7aee648d93398186ba8869e32
+EBUILD roswell-20.04.14.105.ebuild 448 BLAKE2B 63875189e2f002c32e017b4d02840c3621aeaf3e2f04aa36af947fe5e96773ea95293bd8d14ea31f17280bb2a3fc8de8e6cc639b96b3c4d5bd1f9234e80d9671 SHA512 28cfbb5f37453c8c6ca96c825b7e9968b7a4dee2e9cd7d9883487b58e1eab1bba79cd65d170f88088a73303b3008b1305c3c66f3a5a60b1039cfce2192148d28
+EBUILD roswell-20.05.14.106.ebuild 448 BLAKE2B 63875189e2f002c32e017b4d02840c3621aeaf3e2f04aa36af947fe5e96773ea95293bd8d14ea31f17280bb2a3fc8de8e6cc639b96b3c4d5bd1f9234e80d9671 SHA512 28cfbb5f37453c8c6ca96c825b7e9968b7a4dee2e9cd7d9883487b58e1eab1bba79cd65d170f88088a73303b3008b1305c3c66f3a5a60b1039cfce2192148d28
 MISC metadata.xml 655 BLAKE2B 91386e6b98fe2dcce69cef28983230e97007b0edd90e2b521f57a1d67b7a7d20d4b67525691e04ec9131b69be455d7220fe6a5e0436767c216a540b44c642b39 SHA512 a3152c908d723c2ac8888241ea21765eb1db041080ceaf62910f954e2c70e43d8a3fcfb21e2a829eafc68e024266143a4dc2ecf475cea1db22a31f2f697be487
diff --git a/dev-lisp/roswell/roswell-20.04.14.105.ebuild b/dev-lisp/roswell/roswell-20.04.14.105.ebuild
new file mode 100644
index 000000000000..76c9e1152f1d
--- /dev/null
+++ b/dev-lisp/roswell/roswell-20.04.14.105.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A lisp installer and launcher for major environment"
+HOMEPAGE="https://github.com/roswell/roswell"
+SRC_URI="https://github.com/roswell/roswell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!net-libs/librouteros"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-lisp/roswell/roswell-20.05.14.106.ebuild b/dev-lisp/roswell/roswell-20.05.14.106.ebuild
new file mode 100644
index 000000000000..76c9e1152f1d
--- /dev/null
+++ b/dev-lisp/roswell/roswell-20.05.14.106.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A lisp installer and launcher for major environment"
+HOMEPAGE="https://github.com/roswell/roswell"
+SRC_URI="https://github.com/roswell/roswell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="!net-libs/librouteros"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.190.0.ebuild b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.190.0.ebuild
new file mode 100644
index 000000000000..c21cf0f9941a
--- /dev/null
+++ b/dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.190.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=SIXAPART
+DIST_VERSION=0.19
+inherit perl-module
+
+DESCRIPTION="Simple, transparent data interface, with caching"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Class-Accessor
+	dev-perl/Class-Data-Inheritable
+	dev-perl/Class-Trigger
+	dev-perl/DBI
+	virtual/perl-Scalar-List-Utils
+"
+DEPEND="
+	dev-perl/Module-Build-Tiny
+"
+BDEPEND="${RDEPEND}
+	>=dev-perl/Module-Build-Tiny-0.35.0
+	>=virtual/perl-ExtUtils-MakeMaker-6.590.0
+	test? (
+		dev-perl/Test-Exception
+		>=dev-perl/DBD-SQLite-1.110.0
+		virtual/perl-version
+	)
+"
diff --git a/dev-perl/Data-ObjectDriver/Manifest b/dev-perl/Data-ObjectDriver/Manifest
index a41cc6875282..0aa8ce9b3d13 100644
--- a/dev-perl/Data-ObjectDriver/Manifest
+++ b/dev-perl/Data-ObjectDriver/Manifest
@@ -1,3 +1,5 @@
 DIST Data-ObjectDriver-0.15.tar.gz 84386 BLAKE2B b554673970061af445c4c4996dd15c0a418617c534af07ab17a99d21cfc44bc9dc43f8c8095eb30d1c2847a8942820481b4bbe86346bd144b21ec0a69ab1122b SHA512 5be77086f2aa646e9bc80fc8d3de2edb6726946a17149573efbce2bbe83d2ec1b294aa20cd66330f0827ee26a5113b9e02ea542111aed94804c0ccdce1e89c1b
+DIST Data-ObjectDriver-0.19.tar.gz 86523 BLAKE2B 68a3966ee7e248200acc612836e7462fb20f3ab7ce290941033d7ab8b8ec1d2149d6e0754d574baf4fc8371d117541a914820c134e213f8b1c7e7c9d925ba0de SHA512 317118c946da9e6e0b4ebbfc35af2ed82c3d083bbede06042ac988fcb29d2b3b7abba6834c7b42ea54a45c75340b2314e3bbacad1c047cc3512e74757c8d9ad1
 EBUILD Data-ObjectDriver-0.150.0.ebuild 654 BLAKE2B d05a3cfc5ae56c8c0d9b720ae18401be02f09e09fa11bac79c6013d602525e2209bb07d435ae1d9bfd0441147086754418997657d33ccbc34367684ac71a945d SHA512 a34d68f3977a9da426c0408d49549ca43b7a6eb2a0517011709c39b94540af9f65779198b6629d33d8b78557016ae6b10ca08a03ba9a9136447ecb39dec0b657
+EBUILD Data-ObjectDriver-0.190.0.ebuild 695 BLAKE2B 7f61f1ee8a2ac9727d7b7837f26651c9fa79fe3c82b3f4a62055f9026b680edfe7a59e0946bca7210a0f900cbb8acb0f3d96d9a32f6850a2c23db0d247ad884a SHA512 adad1967bfd4ad9684778e8f9cb0f0ab6443555f13b062756e7e20a1789e26801b91a4bf5ab9b67099b1768fb03bf98acba28785cd5cc3f545b8ef1486609b60
 MISC metadata.xml 2459 BLAKE2B a37a718a8a38583c85b14e40dba7534b5d52e6257d5329a5c47145c4cf68e9fbe2a10a444bedd73e27584d356f5a4e81e4921138c9b3582bb619e07dfcaf3843 SHA512 b5b2a3f247c593a840edae73f766e2dba00b6ebf16aa37d009dd22b675a702ac4b4833ee44d82ea98f1f7387b0e23c611b2c93b8ccc31ba37861c3dc4b120f49
diff --git a/dev-perl/Data-Page/Data-Page-2.30.0.ebuild b/dev-perl/Data-Page/Data-Page-2.30.0.ebuild
new file mode 100644
index 000000000000..6e031b23611a
--- /dev/null
+++ b/dev-perl/Data-Page/Data-Page-2.30.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=ETHER
+DIST_VERSION=2.03
+inherit perl-module
+
+DESCRIPTION="help when paging through sets of results"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/perl-Carp
+	dev-perl/Class-Accessor-Chained
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-File-Spec
+		dev-perl/Test-Exception
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/Data-Page/Manifest b/dev-perl/Data-Page/Manifest
index 4218f8a67371..101974acda2c 100644
--- a/dev-perl/Data-Page/Manifest
+++ b/dev-perl/Data-Page/Manifest
@@ -1,3 +1,5 @@
 DIST Data-Page-2.02.tar.gz 8189 BLAKE2B 95aa0f6fb7f164e55cef63e045c6771db8ef46a23e56bd0049de6a6205e6dbdebac441e140005e5ed21899548d014d2d543dfa19b43e93eb04c275083fff8d86 SHA512 22b5b8b80672bfd20a1552ee9d41e5150262eb37be6d903d67465be472d1802668ac898b9172b76fe2747f25ff9ad2025257b215f763f2ba5793abb46eb2343f
+DIST Data-Page-2.03.tar.gz 28899 BLAKE2B 33206a80811ab6ad1827885e1b4184d4a34fc158eaab97883298e60f46683afa6408c7200d2bd5e9317bd19770eac66b312c16ad5888cb68816227cd7857e2f0 SHA512 5c0c411e8b03163b2b88b7ab6432def0ddcce48987e98868897e89d0220665537f23d9a56b6d544a5c6fb67f615a2db582764ebcaa612cb2a8906ba660fc3c59
 EBUILD Data-Page-2.20.0-r1.ebuild 541 BLAKE2B a441863366e9941c6c1905e69334ba710fbe3ec31467c320f15bac8e8c60bffa602dc3597ae924e50c24c1181b717ec43de6f3d25421dbd896357c657fbe9438 SHA512 52460416cc93a76fd6a6aae194b6b2ff19463e1e5131de6a198c21d5dbaafa1fb4a617c31bdb2f27b24c2af8bf26f5ad9deb9d447cdc03ccdf67d2496eb34005
+EBUILD Data-Page-2.30.0.ebuild 529 BLAKE2B 9e1b2209d160a0720e9e9cf38b7c8ab39b04687c8450d86fd635c3da15b5e66fa4bee91f8ae66fb0bd148d2ea4d4c99edd5f567a5be16e5fafe39556a7389256 SHA512 b6bdc1a246637bec3e27c42bf3b6051513daf9eee6c53bf40ae4229a5453f110551c65d287ae1dc0f02ebc6ad849b48568653c5ba3703ce05bd28db9ee2530b9
 MISC metadata.xml 390 BLAKE2B 8ef70df3d8d9ba28c29c7d48b96405dc304898870b15ad4857f2d3c6747facb1990b073165e6c4cc301af31026f91676d5c1c79d6c310465a05ce47975f1f5ca SHA512 aa79070e5091a22d6d1fd4d0f2d28f75ffad3c403736def23557e5c793cae631957554bb31c295fc46eba8f6fffdf985b592ea6d34b31a1519142dfc6da4551f
diff --git a/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild b/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild
new file mode 100644
index 000000000000..a6e0acd5d629
--- /dev/null
+++ b/dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DIST_AUTHOR=TOBYINK
+DIST_VERSION=0.002011
+inherit perl-module
+
+DESCRIPTION="Base classes wrapping fundamental Perl data types"
+
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-perl/Class-Method-Modifiers
+	dev-perl/List-MoreUtils
+	dev-perl/Module-Runtime
+	dev-perl/Role-Tiny
+	virtual/perl-Scalar-List-Utils
+	virtual/perl-parent
+	dev-perl/strictures
+"
+BDEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		dev-perl/Test-Deep
+		dev-perl/Test-Fatal
+		dev-perl/Test-Output
+	)
+"
+PERL_RM_FILES=(
+	"t/author-pod-coverage.t"
+	"t/author-pod-syntax.t"
+)
diff --git a/dev-perl/Data-Perl/Manifest b/dev-perl/Data-Perl/Manifest
index 692bb45fd020..730fdd73b54c 100644
--- a/dev-perl/Data-Perl/Manifest
+++ b/dev-perl/Data-Perl/Manifest
@@ -1,3 +1,5 @@
 DIST Data-Perl-0.002009.tar.gz 23155 BLAKE2B 1f8c1ba4353c26736b3473be2283df1e0a247150b842333010822f7e1d25ecdddea39ac7874ba79d777e4691eeac7257e40ae366ae0a3fae0747a205166c54de SHA512 872eae53641b7ac19a8bcd4a6522475bf042463fbb8380a45481289c6792fa17cf4d52d146228acf089b9cff091413684fa5b39f67bc28f362a5d2eb85d1d01a
+DIST Data-Perl-0.002011.tar.gz 23235 BLAKE2B 968461f3b23e51a3a0bbb33e0d6b5986e1288f300e511e8f05facfaee0e220424bba71466dff55ba7a4967098fe5f76eba3b6ebfde74610a7f54985cc5806f6d SHA512 c55f0d5ba6141ef2a3fe02fc4258f4dbc9ae041e5b390dc626f297d68f4fafdafe5deef6ee282718927e101f7c2d93e913117fe754d5fc0c28d206b45e61b285
+EBUILD Data-Perl-0.2.11.ebuild 851 BLAKE2B fe6d20cf118e96d6edde643d23495700cf0d7cfdc20fa964dcfaa0fdd310cedb56f352f8bcaa6e9ade846de1fad0d57952425873f2a494225a02c716d1817299 SHA512 b81586d4eef31ab7095d6440fe2395963105f80b43f74f33f14b79c0a1419a9a1ad47120b862229d08c8d78205721151639a52fef8f606e7a59d4e43e2b937d4
 EBUILD Data-Perl-0.2.9-r1.ebuild 774 BLAKE2B e46c57cd87ae8db7423b8b290f66cb0c6aa9a6bc34fc4c9867ffe8bf736f1cf0bdbfee3d7c57b6641720563e8f28873f705ec4da74e294e93b9a5ae2d9137d08 SHA512 f75590b4f5b9b202c055778c0bd1b2af282eda628dcf89866098b0d57ad69007f36c40542687b2d255935d8e00b55b9afaeb090efb46ced13b2318219dcfd312
 MISC metadata.xml 1378 BLAKE2B 22e5a37a6e977ff565611a6465e7b5ba9e94e97d4d24698e304b35522d52209dcfc64494091ad4b488187fa4ecee648b16c8bc5eb5d261935cfc0bd7b8538d25 SHA512 6166dd5902561f4f12158203b8affff35835c15b9d843b1924eea23a0af70832045cbb33fc534cad128ec06cc096abeb539f4fa6f670f78f173bb8ac164e16a6
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index 8d2784ef4bcb..2681866641bc 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Parse-Yapp/Manifest b/dev-perl/Parse-Yapp/Manifest
index cab2c8a64271..2aea1929bb7e 100644
--- a/dev-perl/Parse-Yapp/Manifest
+++ b/dev-perl/Parse-Yapp/Manifest
@@ -1,3 +1,3 @@
 DIST Parse-Yapp-1.21.tar.gz 108661 BLAKE2B b5d8e135f8befc4841250c75385fb935757e665b213373c983428809e5990e9f50fed250c3af9a5253da0f6a1494883b23b6ae42e4ae23cff799c3663bd054f0 SHA512 dbf6182d4813ff7e355ea1713c748bfdf8290040a93f123acec645c7a1733fe457ab6e0ab51c4ec83cf82bc43d7fb35cbf89875df7b5c2ffc9635e85458cfeee
-EBUILD Parse-Yapp-1.210.0.ebuild 555 BLAKE2B 5b8632960269521d9ad43136dac5d3220daa3134d4ecf5a06e8cbe77b941741008a67355882ded357f3f833848a52b7ff50ecd1133ab1cf73cb4c4191263d5e1 SHA512 a779964c787a1f2486eaf51c24af4c24cc116a661aa423541035905923cc9e74f1c05273b6d02f331b6a752b4ef7d5b325316ab957bb4f1abeb3fa0d2b12e55d
+EBUILD Parse-Yapp-1.210.0.ebuild 560 BLAKE2B 228a163e66a42b071c5d9c61ffe667ece85bf90e0c540129afaafdea68766e23b69948affa50c628c7d0402e2c1ee4c7292b603b9705ad027bdf17e9c1208c46 SHA512 f9a3851aab1f7c08a2f62a8d8e74a2e61763072fdba33386baa2b30f278ee0e317769695f3a6033fdbb6418650cb3f0236dfed1880335d9f43179fdf7a987b2f
 MISC metadata.xml 787 BLAKE2B 18e36f0028b449575c6346a0744ccb0b8ed755bfb335ee3d4e694af34057b5f2834140fdf917833f4e929b044415a8e5e5c84e4a93db0a8299df67f3b3adc69a SHA512 18e901c94c1fe62a328678ffa46bffc2b12de70cd38f92f322f68531b3bf05214fbd2b159c6f56cf78202e6be4e6d4f41f83e92da51a66fd99d31fbbab34699c
diff --git a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
index 1eb97b2396ce..f7f7073e00d9 100644
--- a/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
+++ b/dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Compiles yacc-like LALR grammars to generate Perl OO parser modules"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<net-fs/samba-4.10.6"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d1e759123626..090115e8733e 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 42d1ec47ccc7..bed6d431271a 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -2,5 +2,5 @@ AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199ed
 AUX boto-try-to-add-SNI-support-v2.patch 4329 BLAKE2B 3be0a3a88bc252bf8cbf316d3198b58ca86ee61e991400ce1e27854433bcf3709718593c58ffc2e2ad16fa41630a54670a4b7d42efde572073adf5f5f95994e2 SHA512 48b1fa089138a22ca9749fe82a1d92abf7570edf87a6ffc48f9b2389baed8982092afc2cbf1e35bf0661f185e96ba2b2b6d21cb2c553d6d884e800805f013a9a
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
 EBUILD boto-2.49.0-r2.ebuild 979 BLAKE2B 08fb685e67b9ee564a1dc69591361a8ea49b9f2b5368f373aaa7a6f9f3ba936c4196d54880074f12fc51129c3839f22abf8d08626698169fc92d745e6e942b05 SHA512 85ca95a2a703e2a49302917cfb6e39b5c65301495d9191c2b64066f29e17bfc324a6c7ee70ec147917f90740153fa356b9aa86eca9e8132839a34a5812709c96
-EBUILD boto-2.49.0-r3.ebuild 1302 BLAKE2B 163921341e52f4d3201a60a776eba2a12d28c4c98c95ddf4523426b8154c373e9835d18104d0408215d3b7ce0347eb563d202dbc48de0e3e29c566d7916faf40 SHA512 c80a93cce385748e6a6f1da59018d11fe57e4113585a4e3e9731cabcbd88502c61a12a064cd1192924255bb2b6ba9022181e2e4bb61b4adbf76eaa53683cdbbe
+EBUILD boto-2.49.0-r3.ebuild 1306 BLAKE2B 4bcfaf25916cbbe73ecacf1397eb48f169b967739873c2710697c01e06c82b7499a397c1e6783d490bf6a695ea88c376c87bdd06b3a7c84ccff580d351d9e559 SHA512 0920cc26e4bf3f06e2158048f447277f86a3ed3517f36dcf04f088486fb55212d7355bf7f669d6b78211fe7e450119cb791bbd58a08e4bd323645b020ed1fb59
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.49.0-r3.ebuild b/dev-python/boto/boto-2.49.0-r3.ebuild
index 22a3d349dd24..ea0014c4618f 100644
--- a/dev-python/boto/boto-2.49.0-r3.ebuild
+++ b/dev-python/boto/boto-2.49.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909545
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 60fac64b1dc2..29e5cde56050 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,5 @@
 DIST cliff-3.1.0.tar.gz 79037 BLAKE2B ab7fd085a222d93deab2d97649be45510f868c7b6ffc32bca6a6cfd7c6c66033f831fa5682d753d8111ce869d94c788c204610851034fdd020f829889062a066 SHA512 f6b74a91e75a0715949a245816f60563c78aa23b03f896240650a190b9d9486e0079081f3fb12acc8aa610c411c7571a330a94f2884ec00b6f893a0d9bebdcd4
 DIST cliff-3.3.0.tar.gz 79680 BLAKE2B 844910bc588fb80ee6645735c3be2518fb00fb255eba67d7cf8a572ee9153cc5c1af399296782254d1d94aab89dd14a7107174b5c580cd842eddd62f4aeae155 SHA512 644dc14817e18dbabe8a33bd48545b27f5053f3b2c5be386c7752fe0a89d3de02aa70f6a5d7b0dcc32fb26f73773c744ba17e916c1186d93b8609caee5f08d6c
 EBUILD cliff-3.1.0.ebuild 1037 BLAKE2B 3e5054afe20265c870cb81136075c0090924fbe18efb41b51575dc646ff5def1d1eb5d4cf2a8d2b54d1df275dce247cb3e3dd551b8375afff6c6ed1087a3b59d SHA512 d11683278ebfefb136dbd9f653b95a771aa88adcb6e6c33906916853bb80530cfc7c4ff3187b5c385a001d10dcc2785c018209c578967ca657bfa6ff1e035d5d
-EBUILD cliff-3.3.0.ebuild 999 BLAKE2B 9467a5a29e1796e66c34a0fee637eb57de78ed78ce561819e8b3a60074f292ba55cfe25458a96802e66091d17a725d15f045456ca5bb5bbe3ebe8eba0147360b SHA512 d6c7a0a2ea053936f6e134067c1b65c10f22f5afbf1ecf754f67161965bd27e2b6cd93737b683c656169a3ec8b25ee1190f0c21998f7bb33126e2299a142f04b
+EBUILD cliff-3.3.0.ebuild 1037 BLAKE2B 41f3d42771ee5acffac9f255723fdd94714f4d2ae170b618eddd47cc5bcc662ace599431fc1035d7a6f5fc635bdfcf55bf443feb6378345af1c98261ae18846f SHA512 3e161de2b822c65f6b483c796517674ad322486fd0aea1ed86fff1b47a647a02b4deb5616757d833957da94cf3c4d4bbe121d7fcff358868e87402cf3de49d23
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-3.3.0.ebuild b/dev-python/cliff/cliff-3.3.0.ebuild
index a7fef18e7137..e8426b32ad8f 100644
--- a/dev-python/cliff/cliff-3.3.0.ebuild
+++ b/dev-python/cliff/cliff-3.3.0.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0
 	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 8d57b9fadd79..e7eb1a1a3175 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -3,5 +3,5 @@ DIST cryptography-2.9.tar.gz 517211 BLAKE2B 3889812dadce01f09c509f5bcdf26405fd1c
 DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb
 DIST cryptography_vectors-2.9.tar.gz 35140661 BLAKE2B 870245659f6a64566f823116d8b4ba017981eb41148e9dcde9cac372eb6703a7b4580040b487cd8773160d5bd989fa9d5bb1788ac550b28e76bde8c9f6cd56c7 SHA512 025ed48855f182b926e3eeb5dca1033eb7f43c419bd6ea71accfed38b4d9ef4cbbf5af60bc28a39e3d6723de2d4091bd226e30c0e572a2e0d43a95a12c1bb7a2
 EBUILD cryptography-2.8-r1.ebuild 2216 BLAKE2B 351a182c90967fe30f77e9babe4316838b5f8ee5da475bcfd17724415f64d360981f08c05bfbd1720b95dcdc34ec1348f8275e8320b41f62b76accf7ccaf9dba SHA512 a8e298fa0ef4e17665e0017571b81ef1dd6563a4ad70cb80982ca5c92cedbe77dfe3df198d40c9bd04c302769e72b2db0640242f43d5a2d39e7e772feae906aa
-EBUILD cryptography-2.9.ebuild 2050 BLAKE2B ffdc07b34f42b323cbcaf944b1ea76d9afa6b8e99bfa5835e1a84fa1f133374304490c6e6dcc62ab9eb4cb1d6e1a7164e99a8f429989ad0892c0859a774549b4 SHA512 e9c7c348ecb03f315214b398bfd9d8c33984ead3180f4510a111dab581afa70e00577f061c63f5212c8eaded31c340484403933f343155170bcd6e071bd0ec4e
+EBUILD cryptography-2.9.ebuild 2049 BLAKE2B c464b13e00648e0d98645b1f468c52f4d100650d8e3a0c03d39162e73ac28667365953145f76063c3ae341c2858a0a21364879db7cef5e7b69fe77d29ef03128 SHA512 709082e15a5f5c6fff36281235bf4a6d510ee7c94ec376bf8aaec484280c9c1f396e0133744d9841cb29fbcc0b6ab1a7ebcdf4ca950f887c2ba268252cdd2334
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-2.9.ebuild b/dev-python/cryptography/cryptography-2.9.ebuild
index 9f898e00448b..d485e533afa7 100644
--- a/dev-python/cryptography/cryptography-2.9.ebuild
+++ b/dev-python/cryptography/cryptography-2.9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 0d15c46462d4..22fed314ce15 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1,3 @@
 DIST dogpile.cache-0.9.1.tar.gz 329015 BLAKE2B 23a33ccf024153e39bdccebefc33c866990733432abd2bdd715a0f180f0059a2ff8315024d59d3ad9c79a01561fda3a802a867d359961d7655bdf790556c7a2f SHA512 7d84325dd7ec2d85027472f07cddd51f495b75dc9dbbcbf26bad7aaabfee8c2da99e0c247851282b228528a87e54d98e04d8451a3ca3a571e84a4a2bb33e72f2
-EBUILD dogpile-cache-0.9.1.ebuild 831 BLAKE2B fe890406bbe1b6cb769852b59ac7b9d16dbe8a77f611ef8c2b4b073a4753b3c4dfcecebf17c9dbe341661e837ffe699aafb7c806fb6ddf5e8013867f52566bb6 SHA512 ff7e7a67f4a3c99bd380358d8cce7bb06c8e33568cb2611aca6db9f8d3f8d6584fcee48b0297c45aec2431bf28e90cbf436d7d1b9964f81b04e08328007cb33f
+EBUILD dogpile-cache-0.9.1.ebuild 836 BLAKE2B 26877a33c3836c41bb701b9ecf096891363936cdbfcaeaf3bfa09aa04e235de5bc2b0cff649f717bc5f16354f1df0b64127bfaec449fd8ac15d4917b351c3b17 SHA512 94c352e3d7b7d23f98afe499578b697455a23d553972373565b7c59f8533e2ff9c6a17657e361b90ce92817546553a9a4eb241d064be15f92d1bcb83befd686c
 MISC metadata.xml 740 BLAKE2B fe8b05079022fafaebe7967c8d39c25c7bb3c43fdb3f87ea3d44356cc97ffed18f2209b60134ee6fe87e0d07c6124591e27ca71327fb3846ccda68598750bf41 SHA512 b233c2a72b4472481068b8f7ca0f646b876376b7e0b08a47e56f03851c95bab28c30fb1f58ca59f9f3e73f34cffc6cbd79c66342648fe3d52089b55d4f01d86b
diff --git a/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
index 2acea6ee6faf..f4834cc71ca1 100644
--- a/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index f337cf240fc1..57615a1de04f 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,6 +1,6 @@
 AUX dulwich-0.18.3-skip-failing-test.patch 695 BLAKE2B 27ad8e5037931859e8dc138cc1c4c760051d544aa6212270978fa57bf66b8f0a401e5e005975904f07f775bfb7085c5fb7df16a0f3c743a902028bb8c7ff35cd SHA512 765c9942b0d46d9da5a78a972e4277bf55febcb9ab3991cc1c9561f84ce0c22bd37a5ccca75cc804db51436676393e5e6528e83ef4d599ba9859cc1e4efd98f4
 DIST dulwich-0.19.15.tar.gz 369491 BLAKE2B ffaabbd68ee228e771b8a56c9a5b70498e49a4547f3f0ff87225ca4ee0a222fca5cd75a36293fb0d111615f4fe9550acd2825732a178f67d9f6b538abf9fc37f SHA512 ae56cf4748ea5f9d275f2d1456bf9fce77859ad2eeba6b7d8f34283e212404ba385f377f4fb86b88dc40982649ec8cfb12ea407dd25ada7cb2b0e862568ac7da
 DIST dulwich-0.19.6.tar.gz 349939 BLAKE2B a88836c8a6fa3f732643f88cb94ec37c138146336709651f7fbc604fe80ff3dcf88b24ffca5e5d14c3c947b847a9678fa8b431ef6be0b78e6046bcd3f7ed29bc SHA512 7e13b465672c5eee4f6d14f28e9cba63ceddf1ad119822fabd17b01ad6b89c6dd8c0bbf562bdf50e0ada5ce17bcad531549054417d744e5cf64a610e8a1740bc
-EBUILD dulwich-0.19.15.ebuild 1700 BLAKE2B 006e9e58a776a8fc8ee8f191dbb4337972d298a6cb282b89c6ef6bc0e8e7cd29243c39869e56d6e2aaa2d5f419b26f0f4aaeb8949704b3524487babc01ae8e3a SHA512 fbc2a8d54f636bd049333f7bb15dd94606b08d011a9b1f450593b1f136cf7e6faecb17586d86fa916ad26446fafed6d622b3d5214246cbb602b6096edf0ff8bf
+EBUILD dulwich-0.19.15.ebuild 1705 BLAKE2B 5277230b4c5bfe4323fbdf95492f8f7f5259ab5f5e5067d22f9b6e985ef1c2942c4d5245e37146faa7fe4f92e217017c707a2b22b13bab22c727618237e35dbc SHA512 af8b8866939aa640278b590d6d9226bedf168a5fb164eae60775e864b7ae01d19719cf4e3aabce81cbebb0c508ee5849a79a49e383b1714c5ca98b9a929092ca
 EBUILD dulwich-0.19.6.ebuild 1650 BLAKE2B a0b85675f324c58bf431473b415662c08ffbaabadf98af804df3fadfdbb4fb310fe1e53a612ffb0fb2c8ae4440a4cc42fff79a0b2e5014f4bf053e6f1b74927c SHA512 0eabe7132be1153034559feced4a68a9d0dbabd6552c7418d8585fea535b5af0deb37919cfab2ca78d5f858ef35f1d144590a461cdfc7635133fdc66d7759ad3
 MISC metadata.xml 448 BLAKE2B 15b62d6a9a252067a63c02db94a906b0da6b72cf8287997252e8fab9cc6f52059ea966d915449a9bd4c64a5bf045e0725d62ff14baf6864cd5212c1765cb5738 SHA512 3a490b46094e92d66e7e0f8e2d0282b75cb33ee2a7a21e4f89029b0a454909466ff5ab4732193480203da9d2481c6134494ccef95953906f6a9da66cc9834830
diff --git a/dev-python/dulwich/dulwich-0.19.15.ebuild b/dev-python/dulwich/dulwich-0.19.15.ebuild
index 4b0785701595..4621e167028d 100644
--- a/dev-python/dulwich/dulwich-0.19.15.ebuild
+++ b/dev-python/dulwich/dulwich-0.19.15.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 345a4c272105..2e2bf0f84775 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -2,6 +2,6 @@ DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e04
 DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
 DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
 EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 5c08f4e43d28890245194350a1eff9113c46b37a803510f927388c4467ee9265be75938012b1e84a581cecba909ca1e28ac09f3a982592e1566e8bb5a188d003 SHA512 84a7f80f7c5565ef21992fa8e16eeba1ca9be28cf49a3b6e8dcf281656cc23a6ecd6c9bd7199a174fe3f7ab48e66697785b87a5426cc11f82826a78a0da05759
-EBUILD geventhttpclient-1.4.2.ebuild 1529 BLAKE2B 61dbf58560a8c59e6da50b097e7d7f2541c748d91cb6a69476d2d976d1aa9dc2cc67cd43085d52737e3ea4b78b6cf5394e224cb5958d092790881b450a3c433d SHA512 8451901047be3dcf40e749d042b23ecbe787e8fbcd79414bad7c83ec36466d9ae05ce1289c51005bbadab9e5d02a968f6664a712e9bcc78c6613a26911ab780d
-EBUILD geventhttpclient-1.4.4.ebuild 1533 BLAKE2B 821b0e96daf6a106197d6a75409c2766c15d7c0110fcef7aae35a4a0bf9c043a96eaa6802514190858b98f7f8009e860b2f479e5b0f0c6ae301e79c8676c1667 SHA512 a67326b5ea5ac6cc4d1e31dfa616c6e4b092d536c21fa147d76fd36b8ca9e3c121a1d6f12d9dca0b349f5cce5cc083c0d7b64435283c34b2a4d972c258d7aa16
+EBUILD geventhttpclient-1.4.2.ebuild 1528 BLAKE2B 3c4c85793ddf83cad895a4df2a188cf10a2ba8b719f82dae86ff48c29c36953923639c1c52f296ea985d85c85c30dde2e8153b7247eebfa6767a661617df4cb7 SHA512 6736c1c21cf38e648d49b9a9b9aa4818620562fa9a19e0d2a8d9144370da4ffe4cae6850ce086a46dca3bb21d04e68a6c527ed9c555d6bdbb132fcf9f218d3cb
+EBUILD geventhttpclient-1.4.4.ebuild 1538 BLAKE2B ddde6373667be74eae6446887d5b132bca50ac85f788572fa1c74f4a937248b38014e83f7987b8f883dc50c2ba8a383b597380772048b8a6262d276c9391eb9b SHA512 517dd291c6db4924a5aa6a891f203fc0de1e5b174452bf83ae7e594aca6b801c68a220c5107bc183bce0e51191a7a82146b0ad062a59501f24630b2fc227317d
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
index 4f2a0c038631..66f21a945d4d 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
index 4d3f4094b52b..053029042b2f 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 4d83f82bc272..bd9106a6f67c 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,5 @@
 DIST helpdev-0.6.10.tar.gz 12864 BLAKE2B f022e4a76b8f416e806bc11c11c27e4ee1c2a92cdc2a19561d2e8c0de60027eb03ae6696d968f7dcd803d2a9935c4ee9b3a0f8248f4cb8ca2afb13ff58d8be46 SHA512 6bdd51e573ec656de12e5b4c17e0de7c2cbfc26e696bb6f62eacd148fecde1c8c239879a9d44f8a30b12d744ab40e225799fe6176805d676cecabcbee6c1e4ff
+DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
 EBUILD helpdev-0.6.10.ebuild 498 BLAKE2B 8c06dc2fe8adc2f71e397a985ae4857fb150e8403804fa188d254b69da4eb5738260fc314c9415492e00af506ac48b33a6d7920fa617892e6897c9f6748f8472 SHA512 bf0c1b0ba45282181e6d2e26536d31e4588856d72f40b590a43e941877adde2d423a945a04dca948ef877f26f0a3bfe42683c22b9617480d16ad27e599c52a03
+EBUILD helpdev-0.7.1.ebuild 664 BLAKE2B 9854efd6bcb127079ba25d2f2ee7bbe20203a5d7d65a1693e940200b8d56bad088e0ccef0a41d7ce585d20787fd7c3ad0c817baea6e52f5530dbd8fa708a40e8 SHA512 4f80222c44b78b4856448ac64948eb5c47a19fce0cbe1e69ddc6fe40bca78cd37f755363ca0192e4ae1e879c904a6d9e7ae577f52caf6f04c0c1f3091925a8e9
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
new file mode 100644
index 000000000000..48dabc7184c9
--- /dev/null
+++ b/dev-python/helpdev/helpdev-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Helping users and developers to get information about the environment"
+HOMEPAGE="https://gitlab.com/dpizetta/helpdev"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7,8} )
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index e539d4081148..4dc5234cff98 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,5 @@
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
 DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
-EBUILD httpretty-1.0.2-r1.ebuild 1328 BLAKE2B 8fa58b8a7b3e79f03bc0897eaab61eee2f7ef5d0a65cbb0e228410953de4f74bf47c6a6b500031fddd43a723a5c5c22eec641cc0743ea0dfe567b0505013513e SHA512 7299d8df65cc6e833c86e8f02243e3b5ffacb092671e160907817d9c499ce59b0d837f424e0b5906b29012c6d41a65954a1456711eac383252e2231b278a4575
+EBUILD httpretty-1.0.2-r1.ebuild 1332 BLAKE2B afe208002fcbdc8a2ed8950ebf13895eae12ca96c0a00b18fc4dc23414acf1869e6cfe9b88c2f1b0841d632a03b2491def27416313cb027c430dd1ea9843c42b SHA512 0a8de8336fce981e8a851ce86533a69791fe45cdc5ddef605b2a1d0769cf69cc49d7c9945ccccf3a42d46fd1316bb085634a05d88ffe278e237225da6455eebb
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
index c01386efad03..3bbabf33017e 100644
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 2f485a757579..6fc2f7ebf865 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -2,6 +2,6 @@ DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af
 DIST importlib_metadata-1.6.1.tar.gz 29039 BLAKE2B b193afecae1458b0d82fad0fe00878c17f8fa279d8eb43ec80d189d3f33b217fb376023c92be70027579484bbbc9ef949ca75f19660a40275d96ef88e1f2aaf9 SHA512 f5537d80bb72cfd97269e2d83b059fe1085e41ce9cc7eaac30abc819dae4b118bdfd2d17989b693c05f0084b2bb86f73837788087915c94724e8e5344752b626
 DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a2efcc549cf1bcc137066fed60132dff4f557f4b856680f9b0b999464bcc1899608e039fb159e15ea2a53c9b9217995863018 SHA512 e5af262c03a8376c09581f1b17a35a712de9d82e8397db067db7415f73242fef147f490bb2bcab5b108bfd3a7e676a14ec5490e018d9d16010be9dab53c4013a
-EBUILD importlib_metadata-1.6.1.ebuild 1342 BLAKE2B eddbb6f897648031115de1d34b350d67dc6a9dd3c76e14ad2c285b0d5df565c09a864d830af2d9c60d83bfe6bd1a5027ca5029362045de0bd0cb08112d5691c0 SHA512 6da8a9e87d8acd73342b93a06eeddf2a4def097a6a44ddce645d730129565bcb96027f68fa5e151e2d46d14b170e470b6b84cbbdda2f07e3bdab031f7c1b81c9
+EBUILD importlib_metadata-1.6.1.ebuild 1341 BLAKE2B a9896e9f21f9362e013f793573c8c2823625e1feff979f0ed810dd05f58dc82b0a39844366b8348b5c386023ee0b8f4807ab5f69d381a1d367dc3f151005bbfc SHA512 f2a2b6ec9a9e9e5ce3a0710c94566d8b6faaaca56fbe89f5795373d961692d61caaf52e787645c1cf0dc1e2eb52a6b1139e3b5cf75ec62a3471fbdb8e76959f1
 EBUILD importlib_metadata-1.7.0-r1.ebuild 1277 BLAKE2B 507ec3b83118c09ce16196098055d0ca37ee3cc9af53ded7ed637e6a1342e1baea9b338f63ed32e63c12fc2ed325c92ba6dea6303635ad8efd6ae62321983c15 SHA512 3856e423f03b9e98adf1c8f0157d3fa573d43e3394138e4ce81e9069f33b6a833a7fd1274a713b39b23389621dd14b3691e302710a329a7cb8c3d1b8adee50a4
 MISC metadata.xml 599 BLAKE2B ce02ca578d2030d74c64bc05e83c8453dc4bc9efe83ae89860ef66e8f13da35961dfb73ba5aec3da5f12f91be9d15a4168bf93f45c7b942071b9418cb12aeb5b SHA512 f1c15874958ff4744838e06e2dd6f20349febc7d6f1939eaed3d698ea7ab552de18956f8dc3f57777ff0c82e26be1cb6bac325a9fde1b51b796fdabb2e7ae0e5
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
index 4bf756b762cc..4d3dfb4e0026 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 6bc48469881d..36267f2142c4 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -9,5 +9,5 @@ DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6
 EBUILD jedi-0.14.1.ebuild 1798 BLAKE2B cd722169171015689a62928eb680783cf13a52e121836e1f94f35d8b92016f72bd4788575535b6ac6621e3c4dde53aec7580c48c08a6605bd16e64281f5080d7 SHA512 3ff63cc5bf012f092604164937e920edbd82b7e16c777a61e62748d9f115af9e23e49f44f1e03d5d22217445f069348226cc20f5b900885fb721e145e8defa29
 EBUILD jedi-0.15.2.ebuild 2551 BLAKE2B c83caa66e525448a6c619e6adb9af12223be980fd03581f8807f1c96ea919c4ef36fd7170964d2131037d60d7126621ee016503205117c16731d7a188e22fbfe SHA512 911472f0572cd581a2bd4b182a1fbaac6344fb33ed3e9a8e908ceea3a4ee5e1bac6663ccc199cd14452aaa10cf26d98fc01e4b6f325ce9a78d01c5696dd33a5f
 EBUILD jedi-0.17.0.ebuild 2124 BLAKE2B 8e04d4304d6972bb4f6842b5741212aeb11cf3961f84e29130cd4d0d2d260fe6f93bb1aa437a0720d4a17bc726d8d4242369fb7945b4e14b1cab59f3c9e766c4 SHA512 3f602b89acb956319bc86fa11877ba843ad55d4e5c7adcbf27d73947459eaa9f8fdec032a56f8055cf754a757d0a046e4fa4f20155e0d359529cf2f2f4160f19
-EBUILD jedi-0.17.1.ebuild 2128 BLAKE2B 60c917667bc22722fceef83013626559f4d82ae11e47b5617195b68fd7fc693769a2d340c79ec9bbf24885c6e530091aeb5ac39238a6652e898277f602b1de3f SHA512 b3e17e5a1d984bee6aad5bc1727b71d03011cfaf82f5fb6e6974d512a7d399ef266b14791d6b0b0bb71e5e1c2df127a0d3f50b498325b2bab0148e3050f7ce18
+EBUILD jedi-0.17.1-r1.ebuild 2128 BLAKE2B a03cbd1b9d7bda2ad890f5d8835026829e47f4ac801ffb870cce0286702b1156d495801b3933f6dcdc1d811ee6eaf133ce81f0012a7ff47af56b9f30855006e4 SHA512 f5555db9c4347365e6742fa818aed855879f6fcb6e65f5f5d4745fad43e9268cb5f832924d93952fb9a1e71cc644425a30893ac2b8d8e32e86d9c9a086cee2a7
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.17.1.ebuild b/dev-python/jedi/jedi-0.17.1-r1.ebuild
similarity index 97%
rename from dev-python/jedi/jedi-0.17.1.ebuild
rename to dev-python/jedi/jedi-0.17.1-r1.ebuild
index 00e52e0a5408..59126ef7f00e 100644
--- a/dev-python/jedi/jedi-0.17.1.ebuild
+++ b/dev-python/jedi/jedi-0.17.1-r1.ebuild
@@ -25,7 +25,7 @@ LICENSE="MIT
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
-RDEPEND=">=dev-python/parso-0.5.2[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/parso-0.7.0[${PYTHON_USEDEP}]"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 420ef53568fc..6e153af64845 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
-EBUILD jeepney-0.4.3.ebuild 808 BLAKE2B da107263e69eb97bccc2bdbd59e08d453ef30618beff9a6c0c57820c1980bfb36adc50be6840e3241f30f4934a74947ec4b8ac689b638cd7834808df84a84be2 SHA512 5dea8ffc3ef6ef42824a65b8cccb9d872f9aa1358205272b6388e9acd9ff969af6ad3d0e3d5eda0a9cc06ee6005c95f5df63fee21305a12b1f4a6acac63669dc
+EBUILD jeepney-0.4.3.ebuild 807 BLAKE2B 7d2d1fd0d5fd2e5dd1a97017f526aaf9f13acc2436a2309433b2bd0f30a5ccee61e0646a57e11dffc3b19f811b45e90e4653c6b4b6b6d8a927dc24b8ab755278 SHA512 d0eafd42d63c79177acc02fab5b497a3665219f8215144dea164dc631efc2aeed02f955d3719fae0a59c13e7aa114c3f474a5a25f1408d74824605c09e878eca
 MISC metadata.xml 432 BLAKE2B 57cc148c4580f5dd579dfbec20c85c80e7d5f2b75397c96f4daa2382e86dbe0547b15ac628fc46bb62c3845becb46cfcfb65027f37839d2d1f843c6872d45e80 SHA512 124413d7ca2a366a651128cd8346aeeb3bd5ceed9b43136fad32861844a078694fa8603e4a11df4d7b37343434bf29bf21d0a0ac6999bf9e9b13f474b93914e4
diff --git a/dev-python/jeepney/jeepney-0.4.3.ebuild b/dev-python/jeepney/jeepney-0.4.3.ebuild
index 48253ebcd3af..ad91e6471a86 100644
--- a/dev-python/jeepney/jeepney-0.4.3.ebuild
+++ b/dev-python/jeepney/jeepney-0.4.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index 0d38e0353303..97f9c1f2d44d 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,5 +1,5 @@
 DIST jmespath-0.9.3.tar.gz 22967 BLAKE2B c640b0fb29863e833adf200f2d3e364e65ff782f0f6046cf53463194cb8a69289e0146fc519c0e4d73a0606821f6d43d943e820b429b6fb53de06546688b39f7 SHA512 eeab444df7a29c0bc64bd8064c942a5b02772d39d6d262dbef1d43ebaf7e4eb97c34fb1df3a47c6da011a632ec5f9b1ffe62ac51929e8d412368b907ebbb85a7
 DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
-EBUILD jmespath-0.10.0.ebuild 550 BLAKE2B a21409d5eaf91c3228d361b8ff454157affc1850b3b8de665baf055f5daa1a3ee42ea15997f6b3e41084b8e3565349c42b7cdcc0d3fceb7ba02a33e1c57b93e6 SHA512 41c73c709bc9d28d61753a777fb5f26bfc7c3eac6debafead141150c59085616b36ddfaa278db999d5f8449e4e86d61faefa705e8fdd636af9b34c4dd0e445ee
+EBUILD jmespath-0.10.0.ebuild 555 BLAKE2B c0db1ecd3cc6ba759962a6ffd443680109a3181602bdc34563daef327cb44879dc6a67e66dd75759aa89cbf9299376075586632d48600f9d07fe818d081a84a0 SHA512 150a2037dcd6c8a44b60c03223b8c0e209552805813f9a5e3113f8c3fcf9208887b280b9e788de0851110c067b3a31f73240654c25c6a0462fb25e6f3fdeb2a8
 EBUILD jmespath-0.9.3-r1.ebuild 458 BLAKE2B dbe074158e147965fe930d33caf088383bf19ee87ec2da5e1df4c6cdbb7feac7df2a6140b0686500a952c3ae6a664670a13d0fcffac509264aedac82a7ad477c SHA512 071efe7e8fee445b4550d86e7f96827fabaf877d5aabdcc274507ef739d34729fe61df5a50485d10f785b0d5add0c9c53b50099fa5e84aa71abea905dec889d8
 MISC metadata.xml 383 BLAKE2B 499175b2782977a9f367d29b3e185c6e3981f40fc9ee0498c62a986ac8f96151d26f5d66af5091dd16f67ffffff2f713ad5194441afe5962e3dc1f9bb39fe3d5 SHA512 94e829e583c07a6b21e8b25c95e9eaefc697c3b1cb8d1b8d61b745369d0977c8040ea2aef4c72e826d0cda9156b023ef60e8db808f526a65a971e4c1161bbab7
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index 70889dcee2b9..90fc09e3dec7 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index d79cf56a160b..cb2e5bc5cb7f 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,5 +1,5 @@
 DIST jsonpatch-1.25.tar.gz 24340 BLAKE2B 0022b4b0b3a0487958b86f14c1738a32593b8056510e3836e15385874b64f5d243d757c99a146a48da6563f0d9330eb38cb91ad6cde3e0a1b4cb8cbd3b15f9dd SHA512 5e1d5b6dcb6ee847ddd561400fe2d00e07aa1827a63ab98a38cd5e91fa0e52d8635eba1192edbccf9c7b9ce9c7ce0a414d580665c427c87a820e533d26092ad6
 DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
 EBUILD jsonpatch-1.25.ebuild 836 BLAKE2B 6f5bb95ffeff9389bc8ce9db031e5a377ef62e087078faa70106acfd3bef29ec2dd3a3224ec92f5c53cd50ec8cac8c833560d16b02839a487d59f70a70803c3d SHA512 fcbe73e291c0a10303c9d61b04c7bcd6b210ef0ee546153759479665fd7f9b57d2b9194cd72859ca89324ecff2eac900c861b3ecbcc2bf6e10b4c79856fd825f
-EBUILD jsonpatch-1.26.ebuild 840 BLAKE2B 39ff73e16252a6c56d31e50eae213ad5e545f656c96a270d9f4b6617c062d94030f9a7412ebd00b8dc274f7d7a851493899f02994bf2c4edc6bb91dce7e602bf SHA512 c559364bd9a81241d076ade6cdf6b893c3bfb85ccd38856f32f45304a403e6a1887c4a5e21d9835b38e84880c939c3c8f3821bf432f243987dbb6c50c1300439
+EBUILD jsonpatch-1.26.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
 MISC metadata.xml 679 BLAKE2B ecac7a9a6da1482f0585c29ab1e7f1ea3729dc4c2b4640440b0a1a5eddbbbdc7d2c029c4318ab3645a4025b5e21d11015ec76b21f5b069d49a37bd74dcad6e1f SHA512 37946af836c2d8b521618688ffee4b33c1864751081c1f1cd86442e6eb6cf822cfd9dbc228f834fbd31ca63b1dd24927cdb680076e2bd7ead941558ac1d2e436
diff --git a/dev-python/jsonpatch/jsonpatch-1.26.ebuild b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
index 789683263633..7b86861b301e 100644
--- a/dev-python/jsonpatch/jsonpatch-1.26.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index fcd3c8b40671..7b8bc9a6e306 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,3 @@
 DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
-EBUILD keyring-21.2.1.ebuild 1272 BLAKE2B 64eb8a86db7c1a2b0b5e7f7f1859c14a9b3ba8464a7d47b5cbc3c5261e88e03b5ad3fcc52b23ad951595ac51441c09c1e56b01127ca2aedc36e0df59bd3dbf24 SHA512 f6b5c2f917bc35c1d03d27557e8e5fb355bc3271c3330c7951062ec54f898bdcdc534babecc2cfe7407b4bf5aaf2106ea542eae6b88aec4dab31a2f1a72e76dd
+EBUILD keyring-21.2.1.ebuild 1271 BLAKE2B 9cdbea4970555a4142a5fc48467b615c8f739a81f0d143cd2e097db7b9b08d3cd75b0560257c178cb29767ac2235cb702653feaa245b558950427def6587a21a SHA512 d223be60b8e2e0e25cd051fd5c9c4eaa7f73bb957db90aff00ebdb189165d8c89e1af9ffda32d789a46c28f938b5c8160e7464dc392835a77494fb1e62a20fd2
 MISC metadata.xml 676 BLAKE2B 147213a7e4221fae52a5add4bea8e41f5ca6f3e5c8e5008679ebacb863c9f9286217212bd910eceeed0bdc01c6a182c1aa8fd655e5ada71765a5ad31e23f388f SHA512 389b65715442d9601149fad087e034400df4f01e698f7d2aca350c41a4efab4574bf01aa322822a2313d5d2af8be4027878b7ec1180e4fb1d60bf5404e3f2331
diff --git a/dev-python/keyring/keyring-21.2.1.ebuild b/dev-python/keyring/keyring-21.2.1.ebuild
index 2e3c808a6783..97d226ed0a04 100644
--- a/dev-python/keyring/keyring-21.2.1.ebuild
+++ b/dev-python/keyring/keyring-21.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 1842a3e46725..09e86a5a68ab 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,5 @@
 DIST keystoneauth1-4.0.0.tar.gz 256925 BLAKE2B 3ba149f9333a42c8fc2f876cf3ee4533633ed881a90f2fd944ee1c245d94dab548ea1c363f2085bc995dd588d8d355d779d9357885ecd0ee9c73115216010388 SHA512 c24d10b2ae6318c22bd62596dda952a36ec8ede8a6436aa111657a984b2b3be72e55895c009317b2ad652979701d4dca6f2c3e1764ada20d1c7b676f072f5614
 DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35
 EBUILD keystoneauth-4.0.0.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
-EBUILD keystoneauth-4.0.1.ebuild 874 BLAKE2B b852dec1e77179c7283a48cc45901ac57f050cec9784a54a09b4eb20196767a54652fa553c120ebdbc894134accecc2f9df07ffb76370a579c034aa97193fe3f SHA512 6377faae295670fa72ab06dc7eccd9232bd81c571e5e9e88910f09e816dc3eb3cdd53500daec2b6a4af120bab1c56614e36f3225772f55a27a746e3efe4fa044
+EBUILD keystoneauth-4.0.1.ebuild 879 BLAKE2B 342b2084e755436b02eaaf038f47282cb474e1afaca9c703cc9724a4f725d5a99bbbd907904bf778945f9d6a9e17406d09ab7c6e582ebe49267646234f0732d5 SHA512 4143534039c199e1d765b801a7ae60214821484d3153e0c6ea242c06584427ec0272a3c779c58f63c9bdf87f24024aedde8bf9f9d0a46f9f0c823ac84338da4b
 MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
index 21ce2d584e88..9af2bde54fb9 100644
--- a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 10168a987b36..36990d76a241 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7
-EBUILD libsass-0.20.0.ebuild 880 BLAKE2B 66d395a96bcf6b2d7f32f73f11bfbce375bbb91963c70a00d70aa7630d95362cfd28c053a5460a75012391dde6ce7adaf249ec16ee10bf76cdcf025a6de7133a SHA512 338af8b62356dd32e51694b85cb06083f18c43394aceb2f9be43d226ac2232132ae91383e9750ebec221d9b3f6c816fa8c819a593da5ed208ef79ab2fc61eb92
+EBUILD libsass-0.20.0.ebuild 882 BLAKE2B eae8e6d58a3b7f4813354049235ffa5e4a7ea62eedbd0573e7afe77e55d17337ba35455f2a7aa622769fda45e3e618c90582e03ba57160c52c7541a8c6cf60da SHA512 ffdfcad24892c7369dad358128676c22d8faa6b242e67d8656b78a39e33100b3634d3dfb7a6d4659990fa39a450c1b1f42c631e08a30adc63381b281bffcd836
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild
index 6ae285a36e2f..b745260bad65 100644
--- a/dev-python/libsass/libsass-0.20.0.ebuild
+++ b/dev-python/libsass/libsass-0.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 19aec7030b47..da00b5a8df35 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.ebuild 876 BLAKE2B 472d6edeebffca628159db98b58cf095bbd227b73afecb4004fe81880b76e209cae5f95b81d14ddafaa823e89f91b0cb3f1ee9060bb0621b71d052acd9171b5e SHA512 0c1cef983950daefdb494465431aa774856c3f35774db3760d437dfbaca547635b6d11ab0f4c54d11c10ee39b740d38a6ca5d5b75f994711fb8fc60ebbe07ea5
+EBUILD lit-10.0.0.ebuild 875 BLAKE2B bd2595413702492a83fddb6b3c84564e022d0cd5a892c9193cadb285b043503f4b7e43837e40b6a60393e5cd6d7651d468692eed604162bc30734d13614b91af SHA512 ee545b4e37ad0fd7603b47f864ceb859a4fa70e4e169b5d7b9a6fcd6c868a6949d122fb22d97ce9cfc0746a7de7af7c65bfa318bac25d37560ab5a8446b79f9d
 EBUILD lit-10.0.1.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-10.0.1_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-10.0.1_rc2.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index 75ceb7ef0556..27f575a7091b 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 3f0d0e9bcb12..cb0ad9f5f6c9 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -2,6 +2,8 @@ AUX m2crypto-crossdev-0.31.0.patch 505 BLAKE2B 09adce189073dab0cf7e49ed2291ab2f1
 AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9ddd82f382c46f31c06a3ef5972cbbe225f665eac17999f7c8a0b74e1702f82451fed5a39691577b050f477bbf7a2ee2e SHA512 ea100feabae82cf1c1237f55354847935a9c49e05c780e01d8fef959d2a10abc4b9f14c56ea50cba68ff59eb67c3cf5136ff92e9dc456960327e0c582b55720d
 DIST M2Crypto-0.31.0.tar.gz 1292016 BLAKE2B 3f1e0e8f686719ff87fa3a51cdc287be989fa1554866582deb1968fd04605270e14cbfd280f64211c043c5d8cb77a09e6a8cec6824ab15416ab94366aa73d2a3 SHA512 9f3e2afda4b8ac14aa64a1534e446eb6895ec7182ce5b7ded8008178e01139d383561a87f8c9fb5fe4b9c257ba5c6b93339955eb9e2f7417cd3f4832c35c4598
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
+DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
 EBUILD m2crypto-0.31.0-r2.ebuild 1546 BLAKE2B 537defe2b77238728e33fafae8d8193f77438f9a1c670049367c8a81ea181a6d79591be3a0ad8c760f9c8f2d1913eb7f72a76e08d7527900559da3f0c0924a36 SHA512 eeea893fff1ce693a6d1bbfe753d9a01fe251c84f23f0e124475c9a969b821daff371fcacb7d30e2e9798ee3a93b98a4bbda05e92d6f01835a5fbf4abdfbe98a
 EBUILD m2crypto-0.35.2.ebuild 1442 BLAKE2B 50b59640d4d8dce2204df4a1d3ee41b064d7e0f85f01b04edbc64f40a871a969e1c55ab7b309d1de278c8aa86f7cd9bf794865ad0c006302857dad34d6333795 SHA512 d830c4d5e867f8eaeefd7d2cd7ed18ebc99fa35f48b7aa93b1242f10c4b25f9c682aeadfd6284f868851a9fa5fa308c299aae13fbef7fd62ca9b4fc5230af660
+EBUILD m2crypto-0.36.0.ebuild 1571 BLAKE2B 651e794d76ee51527518db205d47e281aae244ca4692701c8368f9deec2c00d1a6a86be3e4ba5b7a8c7fb6aa30833c71bd2ccc915a37c90bb019f2287df7545d SHA512 c81c028133b136962ab6837e30f384a110c699e87fcfdef093f98600acb4e1461796ef2b827e0aaf55ba1344e11e9fe81b88b3ce3ba927e8eab813d843734ff4
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.36.0.ebuild b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
new file mode 100644
index 000000000000..21a18b70bf68
--- /dev/null
+++ b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
@@ -0,0 +1,72 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs
+
+MY_PN="M2Crypto"
+DESCRIPTION="A Python crypto and SSL toolkit"
+HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="libressl"
+
+RDEPEND="
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	$(python_gen_cond_dep '
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-lang/swig-2.0.9
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-libressl-0.31.0.patch"
+)
+
+swig_define() {
+	local x
+	for x; do
+		if tc-cpp-is-true "defined(${x})"; then
+			SWIG_FEATURES+=" -D${x}"
+		fi
+	done
+}
+
+src_prepare() {
+	# TODO
+	sed -e 's:test_server_simple_timeouts:_&:' \
+		-i tests/test_ssl.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	# setup.py looks at platform.machine() to determine swig options.
+	# For exotic ABIs, we need to give swig a hint.
+	local -x SWIG_FEATURES=
+
+	# https://bugs.gentoo.org/617946
+	swig_define __ILP32__
+
+	# https://bugs.gentoo.org/674112
+	swig_define __ARM_PCS_VFP
+
+	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-python/multidict/Manifest b/dev-python/multidict/Manifest
index 1be57fe13945..0deb45c84ce5 100644
--- a/dev-python/multidict/Manifest
+++ b/dev-python/multidict/Manifest
@@ -1,5 +1,5 @@
 DIST multidict-4.5.2.tar.gz 56753 BLAKE2B 01db2ea847e5ef2fbd4eab89c8a6070f3febcb0046be7344469a7e8e6de6a3c2b2af49069e64953dfcac0044d581c6af09eee70eba78dda8cfa9e0d11d3f1947 SHA512 ec66cf3c57e3386e07e45641536a6eeb94e9707d8a0d3b485d22b8687f20282c9115d533c7b0e9fb6dba28b923cf68dd8cdda08c75e78ca4eca2f0c3ec23c58f
 DIST multidict-4.7.6.tar.gz 57710 BLAKE2B f08a45d4ce404dbb64d2561ee2328c0aa3a8fbf65483082c11e5e1554bec23e5c711da2350e241308a1239256b942ef6c420e6e51aef342b380cc01f84d4ca72 SHA512 5f90cb04fe2562884c331018a5002e1370e2596e0afd21e4289ab696847a3028a074bbaa6717b3905161f823f8592d6572475307039f8f97c1ac65aad815a6b0
 EBUILD multidict-4.5.2.ebuild 1129 BLAKE2B 017145854cc27f2c1280d8f81fa1fd7204066d36b000c827525d786ee34e78cbd309c7dcba54125dd048973e4a8dc1f16d77206b258e53d7a87a5839e92f481b SHA512 067dc0278f9cdbf3bb61f2ce6530b67000a535d234f010fc6f2066638faef40d9b108c9b0b76dce7a22396b9010b37a41909634386c80e22502f277150133bcc
-EBUILD multidict-4.7.6.ebuild 729 BLAKE2B 7ada16304a61116850fd3c6b190a5b29eccce0192347b23171f3fde09f32a1b65eaf6de5871068fa181bd2402eed51147cad6c98a50338937828095a330db439 SHA512 2abd4b17362f7efc798664139058b3e288f91defac6997441df757a0502d8dee847a6a0d2e37601731e80f19398c2acaf83092ac9728b6cd0e975a722c3ff3c9
+EBUILD multidict-4.7.6.ebuild 728 BLAKE2B 004eebc273f9aeb2333c0c05bc988ea717a131e4373f6fe6747cde91578b5946a8d1ab17800868901c57867100585eecdc7fc128406b3988bded7f4d0a2039bf SHA512 3a4658860350d0667e0bd264c91af22110c9c51fe1e409616fe91c78777c0e1a9d9183a4fa22b1a89fdc54cd3bd4a5d52fcb10619e3eba71715d6fd20f01fa46
 MISC metadata.xml 428 BLAKE2B 3f7c1f816583b35bd0150ae21c61142bbb7ac5b216edb5011bc032410e408f2566801db025c8f6274dafbfc555b0b32aaca2708684a3601ffe8d371b23e0d556 SHA512 edb199503c42c55b838b5338656b41e760c90ec3e81114106dd352e2c3886f0161a0c6ef258c5c0a0728d2420bde5d26dea41b25b030eb947dbacd702cb2b594
diff --git a/dev-python/multidict/multidict-4.7.6.ebuild b/dev-python/multidict/multidict-4.7.6.ebuild
index b85d867745d8..faa92855f45c 100644
--- a/dev-python/multidict/multidict-4.7.6.ebuild
+++ b/dev-python/multidict/multidict-4.7.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 BDEPEND="
 	>=dev-python/cython-0.28.4[${PYTHON_USEDEP}]
diff --git a/dev-python/openstackdocstheme/Manifest b/dev-python/openstackdocstheme/Manifest
index 9d537d4f21df..44ee4bed6598 100644
--- a/dev-python/openstackdocstheme/Manifest
+++ b/dev-python/openstackdocstheme/Manifest
@@ -1,3 +1,3 @@
 DIST openstackdocstheme-1.18.1.tar.gz 1185809 BLAKE2B 253b2140109b90c63fb782f9f1e9994a2b5d422525cfca60e2d54379fca9d9ae936822b04acb29807254fbfb20ccd2c460621cede03f15d4807bdf067a565a97 SHA512 7361cc972ad036528b9b3bc58a7adb92a96142493a1ed4ccb1dab135cd33cd911d5b3fe3ed9e17a58763abf4c9abc68167d31a96b3364f3f4c139c332e7a36ec
-EBUILD openstackdocstheme-1.18.1.ebuild 608 BLAKE2B 5168d48c4c1aee24f269cad82721d76c08eabdc734c4b7e955989548ab0b4cb4d80a8bcb1a8a51e868664636169b1adf5727c20344aae1f22dd67f251d33be1f SHA512 da49e13f0425b5b10cec7b3e0e5db833eab8b60cc62b2456086bb79e32111fc5db506098fbf3da0ab3e04bd5d1457848536914367a0f2a453ed1d7a8210b8a0b
+EBUILD openstackdocstheme-1.18.1.ebuild 613 BLAKE2B cee7e2126e322ac84568f63782094214453ff2b511fb010dc3f0eaa4bb49dd0ae5d96b6902d19eff90390d97f1ad3e026a4bcc11e9472b4eba57533205d03586 SHA512 25d195574ed4dd433a58a65485ad75074c6547d6c5ea609687e20148bd79daa82fb573a5cc05c89d21dc5b1f8d8b2000b31c81d24faf4331ea90aa1237fbffa7
 MISC metadata.xml 506 BLAKE2B 71e15d9fcae38b184e8ce3a4bc3eccb1369dcee434e6d257930f955a18a7068a92a7b3e7a2d875651e36a74063350e75bf6ddbf3ce4fb00d5966c7e4113ccb4d SHA512 6111af92dd3436c323603a2351083701e9ad9108fe94dd4a5ceb29fc5e4408d2732481604f3f57936c243fc0f88f4ef6c1c351915ec65d3e3384e34c5e683ac0
diff --git a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
index 40f43c5d2d37..0bf8cdbfde36 100644
--- a/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+++ b/dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index e2c819bb8778..7da32b8d7a5c 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,5 +1,5 @@
 DIST openstacksdk-0.36.0.tar.gz 887545 BLAKE2B 8a207e5d3a2c6989a1e7c881beaa35dca4617569eeb2efec5f917f4310a6e49549b3ddc9f8106566b7b1e620b2aab38507f92063f68e326f234166a5ea7b267b SHA512 e95cb7c626f8bdd0064ed69d767dc1d53742d9d7a0d6196058453113ddcab3bdd903a1ef7455a2f9fe4335733793c927a00fe333099ba142ef69945a287d3983
 DIST openstacksdk-0.46.0.tar.gz 928650 BLAKE2B f1cf41cc63efb0824ada0c9ac5fea2c1e9b7bc32482df612ba655c6bc94c707e4472c0a5995609914c4e73531aa730a28ee9612a2058a3867d7980581244e20c SHA512 188bb2b2ae9fd3100aa64356d282bc6402c6f175371d8b514ed753f1dd2b1774e3bab22ca45df455fbb7d813236012c0c5174578a84d3f87a3390821f888d709
 EBUILD openstacksdk-0.36.0.ebuild 1324 BLAKE2B e674ca88c81c984c631350b2617950b7622d83a627a09aca2db52bf1ef12c63e703e31faa449349f4e603080b52d9c55b99b083d5939d5f95f3434f2054ad162 SHA512 d39354584cccd47a93e2526138bcc3399782fb6c2552e6a80413aeac2b14d567e40cb021719e3a8b3afdf6c188a5c3d2c23176607268ae9f78c627228327d874
-EBUILD openstacksdk-0.46.0.ebuild 1326 BLAKE2B 1c222d30bfbb5dea44e6e6649d9da855c38fdf3d6d9ec1b2074e6e36c96d99669c4145b402415bd31b9bdf03ba8a7855f7afbabd4b92ef904b3fffe040e6f416 SHA512 a8f3f1f6374997bc569062ef0a31107eaaa45cd799af1c64773e5baa69d99316c8e822b10e9f04b6d556f765cea0c4290ad9f125606dc5f1430db453d3eeb413
+EBUILD openstacksdk-0.46.0.ebuild 1331 BLAKE2B 20e1ee7ab92ffa550d7e3d6e0dcbc8153b55ec1d8d8fa388068609380459c4cf7f7eed8878411a6845979173e14c8619e972ee64af1c60169ab9e537a6933ee8 SHA512 94be7a0f49c3c672bd32d61e2fda63581291782127d65680cb78515aa1f4c107dcd8d7dd1a85a76e80acbd38985fa232b0e9b276f02e207271abfe157a6511eb
 MISC metadata.xml 398 BLAKE2B 59bb0477f0821bc0460e08cf1f7702f105ef5cca807f5a509ff52823686faa6ffa3f6fcb18ddd92d7bf37450cfbdc42765de5929e552cceb917d3349a9fada86 SHA512 040d0a893c1f8b6e14b222ebafe34cc45de3b912840a2683811950939691d18b96a50bfb97126dfbf4e4736783e5fc584acc70bd3a149f340d41515012656426
diff --git a/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
index c6694550a51b..a89263bc354e 100644
--- a/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-service-types/Manifest b/dev-python/os-service-types/Manifest
index 3c5a099cec04..d54b750f856b 100644
--- a/dev-python/os-service-types/Manifest
+++ b/dev-python/os-service-types/Manifest
@@ -1,3 +1,3 @@
 DIST os-service-types-1.7.0.tar.gz 24474 BLAKE2B 8adf1cf29d61cc37d08e7282d5b07312345a59ed94898da71f13702f51d4f3651b18d34cb51789fbc560a10c5dfeb8d760aca0fe25f630c7c00fbfd0fd4072c1 SHA512 d73f826134ce9d26720e027a352d8a91a8a029ac92bbcf0ace022a041f3c0aaea900a4e50fa00027f699a793b53ecc538bad5ec3bd8e2efbbe8b18540322ee57
-EBUILD os-service-types-1.7.0.ebuild 550 BLAKE2B 153e53bd3db528e55bf1c356f3e036e290d37ee8f1e74d69c0a3d7c4b705f314d81fe7467446ba25db1c39f17faa3ac2e58677fc6f2362ed6e3bd860a8c4bdc7 SHA512 ffa33bd37097055f4850b97b8d3ce29d0be5f51a6ab4cfe4113f0d2f74bf99787f8f90ba7518447f5120bbd59af4c84a914354d4ebda542c5bc8ae69d2af7e3f
+EBUILD os-service-types-1.7.0.ebuild 555 BLAKE2B 38fed3a4cb04add0f59a62d8a9cd58a6a1a371c0070825d26a3e3dcd481a671a8053e5466ac7b3a98ec7460fb513a8b2bf62289de6e05437eb7ea52ae602f4f6 SHA512 74f40b1a3fcefc4960c4cce7edc49e755da7534bf46c62a4366cc8fbb3bfc9e6bd7ab42c014685915a394144e6f31af0b292967dcadad047a549f72d4189a633
 MISC metadata.xml 596 BLAKE2B cd24306b859d804610fccde33b67ec4e0e9ac1724449f67af93df2e98e840781d7a077daac575dd9401c03d53148192d3f520b488426d428f803ffe812fd631a SHA512 063efcfb4484e91c21d5b2d0ea66acb2362a791c402bc2f2fe5a7f8bd2401a732dc0859e9be2a87f5eed72454fc87e05eaaa7666a9f99f73b68c35baa1f734ba
diff --git a/dev-python/os-service-types/os-service-types-1.7.0.ebuild b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
index 6db0f3f857eb..8f0547498dd6 100644
--- a/dev-python/os-service-types/os-service-types-1.7.0.ebuild
+++ b/dev-python/os-service-types/os-service-types-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index aa195fbea881..e17adc417e34 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,3 @@
 DIST pathspec-0.8.0.tar.gz 26256 BLAKE2B 3d4f2238c515253d83bfd17a2f3319e38024d4fbb22fb0f078bbcca73d3aff45f246a35752c4039b0d88f204ae49b4467b2d9e3b9134e14a7a171895dac770be SHA512 e0cb1883d11506b3d11963397db98a0fd3411f56df7c3e2ab3ac44116ab53977112bb51d1918591afc48b9c08f9cf997d34beba373aafbfbca2aa8749ffaf6c8
-EBUILD pathspec-0.8.0.ebuild 551 BLAKE2B 022f331badeb0299a823fa259b826a4740b56d780d72caad27f70c58b8a39a7064a624618dbb0506fa1ea9cdf470b2d2ed5e848368e6472b7118fd90aff989f3 SHA512 8381e1247df3d667787064ff5bfaf9b6671e2578b8d574e3cfe21aa562061ecd4ee20d032ba921c06e1dcd412a084532e9e958f75bcc6a1b76fe06f744f84721
+EBUILD pathspec-0.8.0.ebuild 550 BLAKE2B a55d531c78e12204e966973d227ce30c3cbd7db5369e7c61ebb7fdb47815b4d54a194cc5ec60d1f4d25f8962bf6f8f5f24dedabc04bbbe8870bda6b225fbbb5f SHA512 971624edd8d3332441b24073c4d4d3b57548a269a428be583b948c12000df1b088a5593acfc386a0231bca353d703e7a5e6c86098a20262741140ebeea5b2cf4
 MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/pathspec-0.8.0.ebuild b/dev-python/pathspec/pathspec-0.8.0.ebuild
index 0aa51783dcd9..cc0c5aa755e4 100644
--- a/dev-python/pathspec/pathspec-0.8.0.ebuild
+++ b/dev-python/pathspec/pathspec-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 distutils_enable_tests setup.py
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index edf5d3ca048e..476ddef43004 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,3 +1,4 @@
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
+EBUILD pep8-1.7.1-r1.ebuild 863 BLAKE2B 42d007072b5699c80917287d4e78d26de296d0c99ab9d1202ac382e4259c4fb323896bd7b7d8efb071ff1ff3cb7807794adb6730c9c5536e8e3d96a48be20aa8 SHA512 101d2a1a14952662796bbe30c7802d3222ffc31c956261d027decf0f2654a40177944dc051407f68fe9a11897ffc1e0dfa7356bf658e47b1bdc17818de8f444d
 EBUILD pep8-1.7.1.ebuild 1072 BLAKE2B 58ed1820653b2065e71cbcf0cb2b93471d31ff19eda3135450e9eb4e7773e7e86fe1c475e4d7658bf42d42ba12350cda0c2d68ed717c798410a91d16bbaa6e41 SHA512 10ea17efdb7bdc0082fc9a906d8d9918141322ef981149576ba484cfe693528ff6eb2d0cf4cda5e16f9e31c2ede8b6e18d0ee5d30594ae6c829608d895bd1c5c
 MISC metadata.xml 398 BLAKE2B 36900845777c438858178ad562d5da58efd9e2e39b6ce3a062cb6bdfb48f970dbe6d18e57dce711b4dbf1efa6c65fd4b52329b4a2a293bfc21661670a7c1daf5 SHA512 e700e6ff7cf5fb6e85874a2ef1c07d35b635ae55ba0d9e346b4fa9fe2928691203571a85d2a9f63ddbdb3d51904b4503ec046adf4e732c18e825b005dd7c2125
diff --git a/dev-python/pep8/pep8-1.7.1-r1.ebuild b/dev-python/pep8/pep8-1.7.1-r1.ebuild
new file mode 100644
index 000000000000..66396c091a91
--- /dev/null
+++ b/dev-python/pep8/pep8-1.7.1-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python style guide checker"
+HOMEPAGE="https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# AssertionError: 7 is not false : 7 failure(s)
+	sed -i -e 's:test_checkers_testsuite:_&:' \
+		testsuite/test_all.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index cff75861d33a..4984711d91b4 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,4 +1,7 @@
 AUX psutil-5.7.0-tests.patch 6018 BLAKE2B ac419a11d5caabd4184ece7a1b969e23125c122fe9a52277a7bc4af8006818b2328507e929584b464aa9ff94521c4d882819c45719dc4fb387a24c7171d5caba SHA512 3b8c901c101c56be207b008437fb0aa2f6095986e9dbdfb3f0ca5f3417ec2ee3a120d9b66f091ed9ac697d80bc17e2eb215b57bbde5b093b5b3b64ca4dae4b3b
+AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ceb88538d9abef454724d298225ba3f65f735fd8528d3ed22d4f463e8025677144442ac471aeeea44bbe7c607d55 SHA512 46145825084b5d09e2dfa7f7b765757a8d5ac7ff2379ae66bb628ea30f010daff2fe9d389f7846a1f63f9b03c4b7bd8ac4f4d07a4ed977e06a68b63a4e27231b
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
+DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
+EBUILD psutil-5.7.2.ebuild 1304 BLAKE2B 850eb9dee1c36230987f69683545c48410e71d81ee48c768248cbe828241c768998032dc31d7ab29a64abc333fee1c57655a50e450199eb23d7ccad2fcbf720f SHA512 fd3f9267611bb3c4e270e1938ffab8ee09e169324e2ab64e7ef682598418574735d40241a21e34047d7bf93d80fec9ec5c46b960391625b5925255143c9761ef
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/files/psutil-5.7.2-tests.patch b/dev-python/psutil/files/psutil-5.7.2-tests.patch
new file mode 100644
index 000000000000..3faaedad6661
--- /dev/null
+++ b/dev-python/psutil/files/psutil-5.7.2-tests.patch
@@ -0,0 +1,112 @@
+From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 19 Feb 2020 07:27:32 +0100
+Subject: [PATCH] Skip broken tests on Gentoo
+
+---
+ psutil/tests/test_linux.py   | 8 ++++++++
+ psutil/tests/test_posix.py   | 1 +
+ psutil/tests/test_process.py | 2 ++
+ psutil/tests/test_system.py  | 1 +
+ 4 files changed, 12 insertions(+)
+
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index e51f8bd5..48527ccb 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -17,5 +17,6 @@ import re
+ import shutil
+ import socket
+ import struct
++import sys
+ import textwrap
+ import time
+@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                 ret = psutil.virtual_memory()
+             assert m.called
+             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
++            if sys.version_info < (3,):
++                return
+             w = ws[0]
+             self.assertIn(
+                 "inactive memory stats couldn't be determined", str(w.message))
+@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                     ret = psutil.virtual_memory()
+                     self.assertEqual(
+                         ret.available, 2057400 * 1024 + 4818144 * 1024)
++                    if sys.version_info < (3,):
++                        return
+                     w = ws[0]
+                     self.assertIn(
+                         "inactive memory stats couldn't be determined",
+@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase):
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemNetIfAddrs(unittest.TestCase):
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_ips(self):
+         for name, addrs in psutil.net_if_addrs().items():
+             for addr in addrs:
+@@ -1364,7 +1370,8 @@ class TestMisc(unittest.TestCase):
+             psutil.PROCFS_PATH = "/proc"
+             os.rmdir(tdir)
+ 
+     @retry_on_failure()
++    @unittest.skip("broken on Gentoo")
+     def test_issue_687(self):
+         # In case of thread ID:
+         # - pid_exists() is supposed to return False
+@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase):
+         value = self.read_status_file("nonvoluntary_ctxt_switches:")
+         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_cpu_affinity(self):
+         value = self.read_status_file("Cpus_allowed_list:")
+         if '-' in str(value):
+diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
+index a96b310f..70199203 100755
+--- a/psutil/tests/test_posix.py
++++ b/psutil/tests/test_posix.py
+@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase):
+                     "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
+                         nic, output))
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     @retry_on_failure()
+     def test_users(self):
+diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
+index 987bdf38..cb04f3ef 100755
+--- a/psutil/tests/test_process.py
++++ b/psutil/tests/test_process.py
+@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase):
+             self.assertGreaterEqual(io2[i], 0)
+             self.assertGreaterEqual(io2[i], 0)
+ 
++    @unittest.skip("fails if builder is ioniced already")
+     @unittest.skipIf(not HAS_IONICE, "not supported")
+     @unittest.skipIf(not LINUX, "linux only")
+     def test_ionice_linux(self):
+@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase):
+         d2 = clean_dict(os.environ.copy())
+         self.assertEqual(d1, d2)
+ 
++    @unittest.skip("broken by sandbox")
+     @unittest.skipIf(not HAS_ENVIRON, "not supported")
+     @unittest.skipIf(not POSIX, "POSIX only")
+     def test_weird_environ(self):
+diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
+index 3834209f..b07b5883 100755
+--- a/psutil/tests/test_system.py
++++ b/psutil/tests/test_system.py
+@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase):
+         self.assertGreater(bt, 0)
+         self.assertLess(bt, time.time())
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     def test_users(self):
+         users = psutil.users()
+-- 
+2.25.1
diff --git a/dev-python/psutil/psutil-5.7.2.ebuild b/dev-python/psutil/psutil-5.7.2.ebuild
new file mode 100644
index 000000000000..9fd49a5a2ae5
--- /dev/null
+++ b/dev-python/psutil/psutil-5.7.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Retrieve information on running processes and system utilization"
+HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/ipaddress[${PYTHON_USEDEP}]
+		' -2)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/psutil-5.7.2-tests.patch"
+)
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Not running tests on ${EPYTHON} since they are broken"
+		return 0
+	fi
+
+	# since we are running in an environment a bit similar to CI,
+	# let's skip the tests that are disable for CI
+	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py ||
+		die "tests failed with ${EPYTHON}"
+}
+
+python_compile() {
+	# force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 521a1ed53ed9..4131d734efaa 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -2,5 +2,5 @@ AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb9048
 DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
 DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
 EBUILD pycairo-1.18.2.ebuild 1170 BLAKE2B 417a4ef2d7d9d89b9c39931007a9b41eebe49f1184f967c536d2816847c521523659ceaf02865b0093b02c09109586213e9fd8ef21fc234f291c6fff51ca895b SHA512 e9aa24118efe4d0d8b456e7c8a7bff9cf7408a23bff1559f2c44f463ad97ceecfed5c39af90397ebbaed5de430f8fab3cec02d9d06319960349068cc38001840
-EBUILD pycairo-1.19.1.ebuild 1160 BLAKE2B d285a231ef5135cc2bf4bc3fd23f722ff4ea18ddd6053cd3f16e20e41cd8af3325b0569ec3bccfecd1b6bffa6b3f826c63e9ded737314b65f2e40ce9a7f06389 SHA512 eced8a6c7bf1f6b303514b1f6cb5241980d78eee8c4538a7b7c48becfdb629eb38e01b1603daa67f0c1a05155d0d1f28b0b29019c2d1165a7172e3e529cc2da2
+EBUILD pycairo-1.19.1.ebuild 1159 BLAKE2B 54c569d55ff94e0af8d810e1eb23acb9b1618efeb9a67bace79688920ebdc98d6ae01ff7170e67327f9e44f1d8bdd6a37bb009c72954475d627bb25e371a27ea SHA512 8612efb9fbb3e0b37a467748ba6063ec502e493d3a3b93bedf96c3f8ddb175180a09615fe53c90d48bf6130eba9dd1077144e849645232453148b754450103dc
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.19.1.ebuild b/dev-python/pycairo/pycairo-1.19.1.ebuild
index e1530fe4f8f5..8891e2387526 100644
--- a/dev-python/pycairo/pycairo-1.19.1.ebuild
+++ b/dev-python/pycairo/pycairo-1.19.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index cd8ff41d4ff4..90bde04450f1 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,4 @@
 DIST pydocstyle-5.0.2.tar.gz 68063 BLAKE2B 6d7bf04e97c853e50d953342d332847d0e80b080d5ab044f9d444536ed0352ad44402a1af0c3a6f552ec9f3bb3a372a84af2a5bbdaee58bb18dab585cad5dddb SHA512 5ac2e017ae95ff5c7759d6a2cb9ac990f94f668f5fd940792d927cc62628cd036afcf39ab5db6a11100dcca32af344b47f4a7319dd3a47c36367844d0c06d34a
+EBUILD pydocstyle-5.0.2-r1.ebuild 955 BLAKE2B 502baf37756bf949530e39f2ce7f224321752371361b1d32921fd2735ecc5d0b31333b31d9c345fad113de3dd396bad7dda30beeee75f3104f4648842b75dd05 SHA512 b18e9594a8639359770df2f2bbac727cb6623bf9a71bbc507d8d0e6593b1efff1f052405eb613fe4e2d9a421eedf667fbca55b3cd890fe768a2e7e465c2da791
 EBUILD pydocstyle-5.0.2.ebuild 907 BLAKE2B 90267da429cbb2ca73745f1fcef6571f6b7b35cda0c2440acc62a640ad17c2d2a98d03684c28f777a37114b29fe58c77645c0ff89b8fbbe977185bfec300a229 SHA512 acc11f13453bafc2494c3a522a4e11c5d3b973951b67fa23bcd5032bef59a05f3227e2dd4a5e95b973b950b8530124369537123c1bfda586f9694766b6f8f3c0
 MISC metadata.xml 762 BLAKE2B 3beb9d084f02d336a8b8785df8bcad21c5e49f972b3a9a255eba79291630a1cb6dedd77d1a6c72c7cf787149b6a8ed0c4df2cc49dfb3eb0d9094ca271bbd5220 SHA512 8c3ddff21e08bce744df0d7f6157e0024f13f4e6dbc51c053b46058152c6c889ab529dcc423659f993b79b8292a5a76ad1bb161e3fd949a9bc3a3e7b416a86bb
diff --git a/dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild b/dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild
new file mode 100644
index 000000000000..1887ba0bb246
--- /dev/null
+++ b/dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/pytest-pep8[${PYTHON_USEDEP}]
+	dev-python/mypy[${PYTHON_USEDEP}]
+	dev-python/tox[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+src_prepare() {
+	default
+
+	# These tests call pip.
+	# pip install fails because we are not allowed to do that inside an ebuild.
+	rm "${S}/src/tests/test_integration.py" || die
+}
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index eb59a3402e9b..e600cda2779b 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -2,7 +2,7 @@ AUX pyfakefs-4.1.0-openpyxl.patch 1239 BLAKE2B e30306dfcbfe84a26e96550ce7fadaa15
 DIST pyfakefs-3.7.2.tar.gz 180195 BLAKE2B f1e76b652fc67f630fb45798974dc22455e9e99509829fbcaa479f36887c90207d7b6f087e89c9e113bb44df8c4221dc4676129663740812a9426d84a1d47401 SHA512 33bdbf7e21f1135c0ee048943a4b7dffec96e018285e4ee2e6a1c6a7f9e595e27348c83af3803d80322e7fd12a59985a6bf6342aa6211ba95c74ffa20929fb5a
 DIST pyfakefs-4.0.2.tar.gz 177627 BLAKE2B a52bd900466203af6170bb9ce92f1e5f73f246d576f12390f5b52224de34fa69a3a4c426319b701953f040e343bcf267e20ea2a33df62c4a46f6397f760330aa SHA512 ba14cbc278ece50142d441b7731b01ba316ba9f11e5d442476e12b8b678490aace9578eb3b2fa2e47d6805795ceaf85574d3c5fb992a098585597c7e96d7143a
 DIST pyfakefs-4.1.0.tar.gz 185920 BLAKE2B ee61e5ecda697150374bef035054038aed29e23958c58a3b135aae8dae7b397a194586ef6fd3ae70db1d136572a23a876d7f2dacb7e5814c1bedc9bb4502c3fe SHA512 946e21e34643db2b84e53d14bd9758c8edaa9e5e40b827fd74b245f018e8084995f55256900bf795c23a5aae29f124d9fcb80caf08442f6292adb80ee59d79b4
-EBUILD pyfakefs-3.7.2.ebuild 893 BLAKE2B be547a900bfcf7bfd2002f6130df9a6f4f705dc328649ce7c40f53e1da41c8639437ae1ce0577fb128c8655f67a213155d7a282fd663600b673097bd5b1e829d SHA512 5e82fe6105bd4eb5a6c6f75367d9a679a58d5bfcc0330e523bc26f36f7e5db497ab30654f44faf4bb1ddcdf6461ea398a42ef53cb32b83a0f74c501d7d08f75d
+EBUILD pyfakefs-3.7.2.ebuild 892 BLAKE2B 3ebf4ba41ca07acd72abc453cb46df877206aff9c4313599136f586adaedc16185e5fcd4acb0c00144f0bbd00a0722a8182ff35a28b1175ca24f677b7e7cf894 SHA512 5eefc97a54193a2350151ff21d3f230e0fcdc7d98ceec98e0d7559e91f9f72164d34ad0b199664ae7e8f38f7ff3b5a8533372d59cd685ccdae8ab7df649a122e
 EBUILD pyfakefs-4.0.2.ebuild 889 BLAKE2B 3dc7609216f1c1835bb608b4cd7a9df19f38d5b0876daf901fd6efafc277e101231be18cb90cb2114b8c34545159a0b2e0d3c40d129befd8ec9f6ca4c599aa28 SHA512 a43a4a42e5c821fb400d94e252c36e08f1e6f4d99d9cdd4e5ef5e1eafc628425b7c5eb70f22ca34a1b15811c5d5c45ed8e07a71f5cfb411793e781ffdefe66c3
 EBUILD pyfakefs-4.1.0.ebuild 772 BLAKE2B 7fd219f87036f54ba8c076e033e485f7ad4e76f8e16108655d2f1402e87a8f257e78c6d4ce0393380cbeefb832c7e7125f454d2dfea90aa2ba85b0320ea5ee1e SHA512 aa8daca9922600e6fa81d418f4b147faea44e83356c8af01d6b0e0b19c65b87703a5918b2215d99b30e010e82bf88491552a254d64ccc93f86e258c205fa4e3a
 MISC metadata.xml 394 BLAKE2B 634b3dfe1c293b5c4918de8dcee95766878982f71c1d73c169e0e5a6dc68f84485af2edeac3a4cb924b04d4f265b84be309021f9ab4a1d4b59c5aa13d5a9dfce SHA512 4320246ff77e0e68f22065ae24232541bd1a2f6793706fda02fa6b0ef89eb3b3322d224026024984ada6cca4bf468512dde648f54d8c7737830b3155531921b0
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
index 93e4afe825eb..02e466b85f9e 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyre2/Manifest b/dev-python/pyre2/Manifest
new file mode 100644
index 000000000000..5035c01c2b66
--- /dev/null
+++ b/dev-python/pyre2/Manifest
@@ -0,0 +1,3 @@
+DIST pyre2-1.0.7.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
+EBUILD pyre2-1.0.7.ebuild 462 BLAKE2B ca80fbb9a73042cfac03b4c70ec2deba418ef54794a2c9d1654b36a28e25f627176b1e210aa3828881b4232279d479f227bb17e4876cc0604aaa7ebca2145e65 SHA512 fb3fa2a2ebd94237e6f2b84f4c32c4054af9accdc5466270f6acc2f7229006d7b302283994f4f86c68d408bba339fe390d77a26ae1bb58bd05f3ac90328edb1e
+MISC metadata.xml 354 BLAKE2B 02eb3aef38bba7e6decf621a35bf48bd60df852cbbec84441757c218da75cc46866dad50078f2f158966b5b45fafc301739dd7924cd5d96bc2dd9553d83b72eb SHA512 4c6f434e4ec394eb393248a08ba165e29fdcb74b681627d9caa908e376ae08463b673848a3d7497b5b06ac59924c203b9020a43a506f52f23f02660c18dd5b4b
diff --git a/dev-python/pyre2/metadata.xml b/dev-python/pyre2/metadata.xml
new file mode 100644
index 000000000000..b218af704866
--- /dev/null
+++ b/dev-python/pyre2/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyre2/pyre2-1.0.7.ebuild b/dev-python/pyre2/pyre2-1.0.7.ebuild
new file mode 100644
index 000000000000..89d8eb68d771
--- /dev/null
+++ b/dev-python/pyre2/pyre2-1.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for dev-libs/re2"
+HOMEPAGE="https://github.com/facebook/pyre2/"
+SRC_URI="https://github.com/facebook/pyre2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-libs/re2:="
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index d6dad2f9a19a..985a6cc5093c 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,5 +1,5 @@
 DIST pyrsistent-0.15.6.tar.gz 107424 BLAKE2B 432ce7223fee524cbcd65237171af6f0fa16d23dfcc65b7cb5bc8d19dc8216344bf21660d2acf9b07eb1bc9b883840c0b5de679cfe52a0f977e64cea21cd584f SHA512 42b259c66e118d5b09bcc64e57441729146ed9b40e9fd18cda83c4aa0523d5bc3acde3177113e1f2a1b5c1e3a14d15b369df9701a9218a88a656ba0359b5ff10
 DIST pyrsistent-0.16.0.tar.gz 108012 BLAKE2B 62283b8ef478302964fc6b1869c3646c23b78762c5f4fad68aa239433c54d9c652544d5ce05dee18107c8f9604b689043d07f67b9396f6dce0cce3aab022e2de SHA512 d5764b1a185d4578bf308f338037e0546b06e79a3e7189b904e24e95e0e907bc98d7c1c68becc5549a541a5864df75aba6088cafa3558ecb0a63dafb22f5674a
 EBUILD pyrsistent-0.15.6.ebuild 651 BLAKE2B 379b5169b1bf9ec52c6470d1398730189491c67ad65a0d756dacbd9cd8abb3a254bc29f3a415940380a2300c1e0694440d8176becadf236bf6051d1a03db1f4f SHA512 29d8d5250cbf300d3df5a9176631663e5f2849fb8347798180d64ac32a12a5a2381067591278757c81a572dd574819f6bd1792727e7903d5bb7538f63c5b84a2
-EBUILD pyrsistent-0.16.0.ebuild 647 BLAKE2B a8a1bf26960bc496a33e1f74ff072b6a66bd024d166431d8293bcaca388754c647cc86ab987e599a84354cf43ed483100ee2531c58f34e24431df6c80db4bc5e SHA512 c9aa0f65f1e3920fa6cf4d698c652b062dca437e3ab107db834cf66fe0cebf103c7c9fb2059e907591bb12924698ce7a8e4448122b54929ac24ca00166b5339f
+EBUILD pyrsistent-0.16.0.ebuild 646 BLAKE2B dfbda08ad6d2f9359e23d1208275b763dbc0b1f30148070d39ffa44556e9f80783cb9fd5214e3b59a47d7d0d846cb08f924707797c1c9daa83415b9558565706 SHA512 3598e0806a7b4a0cb43dc2c32a79f143278c5fda354862f8810d38692742a8163f8c746129e6a803e754f1103110687727da2b5831d3fd81024520270434c504
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
index 04083f6cf990..e584c29e93f7 100644
--- a/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-cache/Manifest b/dev-python/pytest-cache/Manifest
index fc1f0bc82b0f..6fc77650c2cb 100644
--- a/dev-python/pytest-cache/Manifest
+++ b/dev-python/pytest-cache/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-cache-1.0.tar.gz 16242 BLAKE2B 90ebe56fab442c67513025bf3921d9d3ef4220de49fed5ae14cd31e5b8966e2fce4551faafb14bbaf1c3ddb45a8bc2d0ef4e3e9ab6fdece053d173b37e4753b7 SHA512 55eb66718a45fb0ad8931780d96fa4715cf0d9f2568be2a1b08b3399d391b818a7ae8b2afeb74b50aaf8ec8f7f0d8da8e7a7483845a50e884822ca6ddbca03ea
 EBUILD pytest-cache-1.0-r2.ebuild 860 BLAKE2B 216b73f1199fcaf51c682132f9acdd50e73098315ed0a7154a5d5c4589ab4c312740174f5f4a79a805b4dff8bbf686b1defaf52173fc39459cd6b3e52eebe82e SHA512 2dd9b128e2693951ad9c81cbd3adab0f8e19aa694f137e77aaaf5ef53a54196a7894fb86dfdd76b28ff65e11fbb678af5cc050f6d38944b00140b87212f2cc64
+EBUILD pytest-cache-1.0-r3.ebuild 857 BLAKE2B f8d731cc55345396e27e7467c5e7c2c47c4b75d3adb7c0efe9401c4e207c13671732fe2911c7b84cf928ec526f1d210284fa90e5d21afd7b2a3dbd9bf932639f SHA512 04af9a1ba401552b492ab4af0adaf2ad6444e6e5fc15ce90cb71d21723fa50bbf0a84b38bf8e8ebc849f89292178dd8278c3edf791ac877a7837059d6f5b0726
 MISC metadata.xml 424 BLAKE2B 9699f4ea942fab1f467f13318ec34b3827aafd5946f863fe73ed8411c8967c3aadd75d210d59a194f44cdd40a60f7911231b9b9f1b0da91b88be636b007cd205 SHA512 d5cacf7c2874eec32bd10036f6fa03f0d357569e99b229b397df2ca1978f3961b9f3e7cd892cba677e4f6c4e39a5d69ef496166285adf089e08e7406446c9a35
diff --git a/dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild b/dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild
new file mode 100644
index 000000000000..32f786371d38
--- /dev/null
+++ b/dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="mechanisms for caching across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-cache/
+	https://bitbucket.org/hpk42/pytest-cache/
+	https://pythonhosted.org/pytest-cache/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-python/execnet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+	"
+
+# https://bitbucket.org/hpk42/pytest-cache/issues/12
+RESTRICT=test
+
+python_test() {
+	PYTEST_PLUGINS="pytest_cache" py.test -v -v || die
+}
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
index 737ef02b82b0..3330601b3eb7 100644
--- a/dev-python/pytest-pep8/Manifest
+++ b/dev-python/pytest-pep8/Manifest
@@ -1,4 +1,5 @@
 AUX 1.0.6-MANIFEST.patch 178 BLAKE2B 498bebd63c6be42e3a73063709dc2f315a2c8ec2234d43436ff3f076f768acf566d81a21ed76412fcf9da929290d355cef02200d91938a9c76df08a296d1baa4 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb
 DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
 EBUILD pytest-pep8-1.0.6-r1.ebuild 693 BLAKE2B d55f9cc32e4a4c615a52dbeeacc691f7a5de136597b620cb0afebc8ed9f9711c3a2e430020eb6eed010be16b2c1bda50c64f3049a8b8f1734668759318552d41 SHA512 f9bc0090b948c6b3a6b90717f8b2e53c31af7fd6695fac1a1fefbb72994ac2046ef3eb2a7b70944364b48de3a7aaf73628bb9c789eed36274b89fcf58112d720
+EBUILD pytest-pep8-1.0.6-r2.ebuild 679 BLAKE2B 0c43a5b9200a9112e3d6623acb207cfde7730622cb64a8f48bb6f66244171a764de407a0d7f66724240c76aeddedfe242c13a5218682e75bce9afc1afed0ef3e SHA512 a4f79a8b49f1b36b8c23d17e77d94fcbec3e72447cecbdfc925813d4337b37fa496fbf5983299b6bc1cbdf88dc05adc22623206ee3ec4b0e333235d0f4984e95
 MISC metadata.xml 324 BLAKE2B 3e0d5894a9d05fcf94a05abcdaba2da483d9b6db134df730bd436b85295a60504b2b30004eaf63396c31783d62ea042db28e0a28e24ff27255c40c4e4704b09d SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..141399f020e7
--- /dev/null
+++ b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} pypy3 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin to check PEP8 requirements"
+HOMEPAGE="https://pypi.org/project/pytest-pep8/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
+	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	dev-python/pytest-cache[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/1.0.6-MANIFEST.patch
+)
+
+python_test() {
+	${EPYTHON} test_pep8.py || die
+}
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 75094aea8ade..48fafd6816df 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,5 +1,7 @@
 DIST pytest-timeout-1.3.4.tar.gz 12255 BLAKE2B c8991e0255a490048f43e1163d0315cb8fabfaf9d96deb476e2d59da7efce8c63da09b1e8e6f9d6f3fe82b3c6f67608b5e5db117e6378a041ca6e5ba9c71fc05 SHA512 29af25f3c3776d9ef63c6b7217ffc6b0cedd873b8cc96be742a642da84d12c8988bb9b409e00850246e554b21908d6fd2207692650b154cf6831f38c4395bc80
 DIST pytest-timeout-1.4.1.tar.gz 13804 BLAKE2B 45e9bdf6eb39e706cac2c9484cd34a9f16096d71d0146251bef9591c35c269043c95e641bed40b25e3d2076fe29a5782363bf9130b331eb04c4e867b1e8f646b SHA512 b62b090365c1cfe1a4d544b5645f828e451ec5229313c50a26ce04ba6cb203ff9ab487c61fb000af342f3d499e11f67aff5f84ff5b00328a129f1f39d4aabf28
+DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
 EBUILD pytest-timeout-1.3.4.ebuild 752 BLAKE2B 059b1014e51bccdddbad59eac0ad718b5523073b6b032838458ddc365897027eccac6ada911142b41d72443cbca27b9b81a248fb0d8b400bf03bcf695fb2b4b4 SHA512 0fc9cf5951d8faa9c6790ca875aa97653c6e6fdf08c73314b5c31589e891bada76e22a08da66ffdcf80b3bee2fabf706c8f7708ccf023cec0183cba33c495c94
 EBUILD pytest-timeout-1.4.1-r1.ebuild 838 BLAKE2B 9b9e4d996627e0e98d20dd9a2d9aad09aaa2998ddfe3237ac05dbcc79df982c9bf98b31f001a136c37dc6ed3d79ba34b736885dd03cc13edb932a3cdbf6f01a6 SHA512 f98cb57629c3d6a4c96cd960ab100a7799f5dc52dc8a486d4df1b43f5ebe57a8401d45f79543dfbf674f9018d7ac55d7910f05a4293bd099d0cc53bb875ca0af
+EBUILD pytest-timeout-1.4.2.ebuild 838 BLAKE2B 9b9e4d996627e0e98d20dd9a2d9aad09aaa2998ddfe3237ac05dbcc79df982c9bf98b31f001a136c37dc6ed3d79ba34b736885dd03cc13edb932a3cdbf6f01a6 SHA512 f98cb57629c3d6a4c96cd960ab100a7799f5dc52dc8a486d4df1b43f5ebe57a8401d45f79543dfbf674f9018d7ac55d7910f05a4293bd099d0cc53bb875ca0af
 MISC metadata.xml 352 BLAKE2B c3aa8ea91e07badacd5ac6d00f8580b4a2616b3909ce79f56e9760af95597289379072b6e4cfd65e9da4306ec0f1b0c4a77a920ef8cc10821b83ee5013c0e5f4 SHA512 3459606d8b5c8b639ce59bc18c85581076f10384d42cb00288a88159fdeb7c30cf51efec99e1696c69b69793da42ea25bab3674343629b1bd979f8836bc488dd
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
new file mode 100644
index 000000000000..516df2f00d54
--- /dev/null
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin to abort hanging tests"
+HOMEPAGE="https://pypi.org/project/pytest-timeout/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# do not rdepend on pytest, it won't be used without it anyway
+# pytest-cov used to test compatibility
+BDEPEND="
+	test? (
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/python-fastimport/Manifest b/dev-python/python-fastimport/Manifest
index 04f4755343ad..629e0e178082 100644
--- a/dev-python/python-fastimport/Manifest
+++ b/dev-python/python-fastimport/Manifest
@@ -1,3 +1,3 @@
 DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-EBUILD python-fastimport-0.9.8.ebuild 777 BLAKE2B f983c1de7881eeb768a49a34e5448416d691f2b00750fefca795a718c5aaab7535a735bb56f116e00dd69d61c2ba0fcb7df0ef77d3615492f10ae0df13220af7 SHA512 6e576dda8705d5b5744bc4d39fdc443aa35575883748eb8882569274f85f03f8936e5e8e5909c7f084ab71464db23b69c7d523e0b33c62d3fafc1539d11639c0
+EBUILD python-fastimport-0.9.8.ebuild 782 BLAKE2B b9051a9ce9a1f592c32161e74d57af1df19a00e20f80de38ec66b2888589530cb52d2ed70f54538ef92943abac6fc3f4b1df7734e65ff11150c2fbf043c179a6 SHA512 917f0d169e37f6f79ec21a37f0eb55d19cc83eff83e9954457e24a0a428548c6f731523e88b90a76171655251c022cc2c0c161a39e9cbd64fc2ea6a2f3798d75
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
index 723334075aca..2e4a3c90c52e 100644
--- a/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+++ b/dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 50a485d2aaf1..d6fe7d2091b5 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,5 +1,7 @@
 DIST python-language-server-0.31.10.tar.gz 66009 BLAKE2B 9c5de5ab3d3e75273f4039ef11a7a94e14acc2b28a8a1b08fd664d24464e41a3c00b49e6937b8e6479028a382805502c27dfeeccc06d6daf0b848e4809d98058 SHA512 2f922fff1b88c197314816e5d749cd1d1148ce00ab3eeadbefe45a71fd1f521bce386be9494d882a4d1b001a9797a5b31e42c6a4637dd0343eba419b9fccc6e6
 DIST python-language-server-0.32.0.tar.gz 67137 BLAKE2B 83611541c36ab70ab16fd3814a198280dfbb878cb8982625855e102bcd76fb605961fccd7efbb099f3f7b4dc7f974f12a5e064170140880eb5b9cd0a71702e9a SHA512 7c4a6de3998f7a09cca18530e0803629924b26eaec4f1a1a4001996c680fcf35195052013f390569b0f79da94000ec86f92e9d68215dff53018080567e28ca0f
+DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
 EBUILD python-language-server-0.31.10.ebuild 2470 BLAKE2B 5066a3eb83e9a1d70bbcef89371a978eadb63c9154d3a0aa4bdb9edd0c74b5b1ef1f3acd3dbfa1780d7c89c3556a66a9aa3819462fd9a01d0ff641d1e42fa557 SHA512 f3c3887d4a120c322e4bb4ce053be61a8ce3380b04355e8f7e7c3310ac7d0351a018ef45d789ef00c4d4ccef12c1390357b25370673cc7ac4663693cf5b64af8
 EBUILD python-language-server-0.32.0.ebuild 2321 BLAKE2B 9d42354e8ef82c7ba08e02866e686f2cc787123e25da7d4a25fb481aa4903b3c9fad3b003a2a1acc1d20910c19facbcf551feb1b11e2b8f6f4db866575134fd6 SHA512 38dfdfe29e768ac075ece3c8115c63820eb6a6584e1570addce3c111fffa79825057755a9233aaf29607a189a39f9f897e8636bd8a06e2a38a7cff0672c33622
+EBUILD python-language-server-0.34.1.ebuild 2321 BLAKE2B 9d42354e8ef82c7ba08e02866e686f2cc787123e25da7d4a25fb481aa4903b3c9fad3b003a2a1acc1d20910c19facbcf551feb1b11e2b8f6f4db866575134fd6 SHA512 38dfdfe29e768ac075ece3c8115c63820eb6a6584e1570addce3c111fffa79825057755a9233aaf29607a189a39f9f897e8636bd8a06e2a38a7cff0672c33622
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
new file mode 100644
index 000000000000..e3eac548d087
--- /dev/null
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit eutils distutils-r1
+
+DESCRIPTION="An implementation of the Language Server Protocol for Python"
+HOMEPAGE="https://github.com/palantir/python-language-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.0[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
+	~dev-python/ujson-1.35[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/autopep8[${PYTHON_USEDEP}]
+	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	dev-python/pyflakes[${PYTHON_USEDEP}]
+	dev-python/pylint[${PYTHON_USEDEP}]
+	dev-python/QtPy[testlib,${PYTHON_USEDEP}]
+	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+	dev-python/yapf[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependencie
+	sed -i -e '16,18d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	elog "To get additional features, optional runtime dependencies may be installed:"
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index cf206564acd5..0275466b6532 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,3 +1,3 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
-EBUILD qdarkstyle-2.8.1.ebuild 1378 BLAKE2B ea48f645c3e9332a82869ec6aa545c6bbd62465e8d643f8bb0f394a65a08d24f44cc615d980500d2feb4e6b2bdf6c5aed5c16fa8754d710e121c4357b01d5066 SHA512 315816213eba0741eee55aa2923e8465672da1061b4e5220bc77600ad704dd483ab42ec7878f14521c74eb498360c0f7d2fc40b50a3ad2ebc5294dee3befe194
+EBUILD qdarkstyle-2.8.1.ebuild 1380 BLAKE2B c0c7908feec638ad73404e1fde7b31b4f9dc264ecc127d7a9cfa6af51d5276d1a2202713e526e32263cdcae50878ccbda5ad04a575dcaec0a1a8b6323188fab7 SHA512 0a9f95414cb8dbfb7add285fd75d8df747bdca310207b293c98ed70c2d2eccf7258e78dd64b172a6593ceea6823228faddd3997e88afae82600b8eb501a0e004
 MISC metadata.xml 376 BLAKE2B 66f5bc55ef2f40919601f4ed1fddd0bac47a7e42cf87f4a5fe085a90420d6d3ff21fb156319cb6c241b1241f7dfb261612ba0aa20d54dfbeb9801cbad34aeee2 SHA512 9741d92e63a63121645ec2c8f08a37850524b299cfdad5b4e70def0a8a50f35dde5c9417f4d4c067edee641b2050a128c7a792ed6d59137809e1b1a77fb469c9
diff --git a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
index 9e29ded805c9..2e031c10132c 100644
--- a/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 9650114ab893..fb9739357bdc 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
-EBUILD qtsass-0.3.0.ebuild 651 BLAKE2B b6f7fc7d027b4df7ca00d9f3359cab5ea497dc804d3bd75a7cea3dcf9cf670aa828604b3a42d1463951fcab880c9a3020d2585c7ebe267b2a4b1b5fa17fb5115 SHA512 78f85d22536361311b9e0bbc1ed80d62ab82121d8b114acf4cc8492261a3c50e245c0acfffbe6e15eeaad01c0714290daa2f8c3ede53b6a120d6a795bcbab7b6
+EBUILD qtsass-0.3.0.ebuild 653 BLAKE2B 9251a12d9eb0bbcaf6ea4f22b5548944348847c077a52902833081e179b0bba6357ed8e272d7307d19f56df544415985b46711529bbac28015d68d855c708c78 SHA512 30b3a1815bf45f684690d0eb0128d3bdee90c48ee506048ec8da46ac308e4295ac72624697003269fcb88190f2e0f1af788b8e609a7a8437d106b50dc17f2981
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
index 16dcf1fd7207..55b1d70e7d73 100644
--- a/dev-python/qtsass/qtsass-0.3.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/regex/Manifest b/dev-python/regex/Manifest
index 942ee6390d70..a4d9f8f38f0e 100644
--- a/dev-python/regex/Manifest
+++ b/dev-python/regex/Manifest
@@ -2,5 +2,5 @@ AUX regex-2019.11.1-pypy.patch 10520 BLAKE2B 7ba3b494c1562475ab3e5b996083bd75e22
 DIST regex-2020.2.20.tar.gz 681215 BLAKE2B cc23ec03dc83068320155e4e660ee27e00935d179566d007e21879506f80dd67b2c1abdd6a4dac789a239474a8b3358f1fcbcee53af91b3d2b7ef71ce19c7ab1 SHA512 0a35b9512048bd36bcbf8a03905cc77f007d204f9ed9a0aaa3d5fcd72392bf37285c35ec0f04b1520e486b651028063c799ec265782c52ca4ecf7eeb0581727a
 DIST regex-2020.4.4.tar.gz 695848 BLAKE2B 0dc41e1f1464014bcdc10b7209f7ac0506aeb6a3e09c16b4ca302619aaa8271cb06138627e8ed7f64ff80cf661eb83f07b4514828cf7fa94f21211fc42ae9f7c SHA512 95eadaaffaf87a19b31024ad3cff670d34a31de8b9be430fc276a533a584203842d1634b66a346c4aaecf2407b973bb1ae9c8ee8b48785d03bd5e45a67a271a9
 EBUILD regex-2020.2.20.ebuild 885 BLAKE2B f0de99b16a108fa8f8482715b6bf5f5d8c7c9f4bff71e99639a3d237ff82ef8b7780ff09809cfc242330b634ce49da7923acde092a14e989f4d806f5a5353c85 SHA512 e7cd546f566465ed6604fe4f72533448e7291bacec1f068ea40e81c8578a2deb93d0c50437357d2c303dc15ae503a675377f1a06aaf58c4587b0d7cba916e8f5
-EBUILD regex-2020.4.4.ebuild 885 BLAKE2B f85caff263d0d59310a73df58358d5181dfa67f00ea15a694c8277e068460430fad189248d18862f169ef26481eecef218d8a8a7a5fb037886abe668bce27538 SHA512 28543d34649ddb583364fbcf4568170e6afd1eaac2f273e7eb6b32ddea998d7eec227d4d95dbe98de8b9ceb4dfa04ee68715131337a8c46d92931ecec01f65ae
+EBUILD regex-2020.4.4.ebuild 884 BLAKE2B 887c9215e1a9f7574b1ab65d4d798c3fcda668f0a897e8043fb0be005bf9398de5690aa78fe1d035d611fd37d56e5a9f9413e977afea6f79e18705af0a074cff SHA512 677ddb3380776e6839382d46e4573a1548adc61dcab70e6bbf716651a8ea97de82d4ad89f449bd2630482cd6afa39fa9f9d33db14beedda4b9d4d614ca71bada
 MISC metadata.xml 384 BLAKE2B 4928f66b54b5e4de6a8b913207ec6e46c124e55510eac304a7fd46c6ca63cce60704757e9289bf35d2d58e9ddcd4aa98d751a079c79f09dda9206553096e0561 SHA512 3db0a8abe7036cd9d0fd8b1450598436dbb30581806380ad51c3d0f49d129325aba1bad9700d14adffc7cfd199c4ec3377e6eb0225244bfc82368bbb50548e07
diff --git a/dev-python/regex/regex-2020.4.4.ebuild b/dev-python/regex/regex-2020.4.4.ebuild
index a65acd2ab661..af9059b06afd 100644
--- a/dev-python/regex/regex-2020.4.4.ebuild
+++ b/dev-python/regex/regex-2020.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc"
 
 PATCHES=(
diff --git a/dev-python/reno/Manifest b/dev-python/reno/Manifest
index 17eaeae5383c..e2d317d628a8 100644
--- a/dev-python/reno/Manifest
+++ b/dev-python/reno/Manifest
@@ -1,5 +1,5 @@
 DIST reno-2.11.3.tar.gz 73296 BLAKE2B a09c79c12945396425f2d3a45259e15e1fe8909df107de90884a51c87a5f4ac9f425907c1f9f401417d979e8762f80f188d2e783a7ff36541c107a9497a12746 SHA512 8d5bfe30c7a886d295d77b3d38e7fde09a8febacfacbf984f919bd5c813d81999870684f7da5b3e77a95436c912ea8e275b68548622462218356e23ad084140c
 DIST reno-2.7.0.tar.gz 65269 BLAKE2B f3ba0e33246d40f7f16739f367ad313ce440cd33c6f03de268f2e02293446e0d3a043287c36492d8cae44b65c682c09d13ab0e2c86beffc23a85184ef27a751b SHA512 daf32dd7c08f9f75a9a334db8aa9e8c4fdad266bd5e68a43a87920751cf57549fba7906da26dc6c8f79b97bfaf51ad481f80ce99168cd65cfbd62848cb3d0cab
-EBUILD reno-2.11.3.ebuild 660 BLAKE2B f8ef3731cb902f8c15dc554d97f77ae0fd5b7caec41f04a15ac900b2c58935564a078602d9d659d03fad651608a570ff2491bb173ca356c480271eb15198a986 SHA512 00c361e8a9e5277db4f75430f187ef4f502f9bd9b66d8276bf108ea24164fe42ddac705730a82d4dd69f33f042dc172590505a4ed05aaf2c3b42ef439a22cb75
+EBUILD reno-2.11.3.ebuild 665 BLAKE2B d4702b195018ffe1b3466cc655991360b8fda1dac2a900d9592cb30484aa3a00677f69146b823fb42d5f45494265bec590e669760c7ab385000015576735bd17 SHA512 06571c596ff4a51f9cef99fd0fe74a0486855926ade0fc0b06c64c8a6ac158fb0b5b33443234806308d65953c23a27f73bf10f8ec8e5a02a7fc753d3444f8ee1
 EBUILD reno-2.7.0.ebuild 706 BLAKE2B aa8edbed47032a22469d92dba873d39f254977553518b906a66e1a7f3e7ea63eabbbd5eab690c24117928ee378f0a3ea68c43728d1ffbd44d6f00538f2b3800f SHA512 46ce5fe99b2ee072273fb576c9b6edc980848133ece62e986eb5db11603711c12c9c117749bcb87a3d42a4db2143ea7986dc82f26d3fb7f656dc72a4396aa329
 MISC metadata.xml 321 BLAKE2B 3b8c9d905cae94a3bc7282b1a0fe9ac0471c6cd319e0e6c29ba9159e7a4a0d95f3eefa370a85c0741576d215719be3859e491af4a76bb4e494b84dc176337387 SHA512 fa7cc33d444469e942598d32710f8fba3999cb738407d96243fb0c2efa0573b330e5dbe38685a5cc8a7c0848ad89611c5ac11d2d9d1a693f9a7674bc8dc0a4f5
diff --git a/dev-python/reno/reno-2.11.3.ebuild b/dev-python/reno/reno-2.11.3.ebuild
index 627cf75489e2..67a2d6e5d14c 100644
--- a/dev-python/reno/reno-2.11.3.ebuild
+++ b/dev-python/reno/reno-2.11.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE=""
 
 BDEPEND=">=dev-python/pbr-1.4[${PYTHON_USEDEP}]"
diff --git a/dev-python/requestsexceptions/Manifest b/dev-python/requestsexceptions/Manifest
index 140ea2b69ca6..1df4efeaede4 100644
--- a/dev-python/requestsexceptions/Manifest
+++ b/dev-python/requestsexceptions/Manifest
@@ -1,3 +1,3 @@
 DIST requestsexceptions-1.4.0.tar.gz 6880 BLAKE2B 7539cb7993de817a9d22db3f2e1121b65850cc80723c149243e6e540df7f1229abf66a5a443ca41eb855510caa3f10ca6829d89ad39745fe8180359a92037cff SHA512 f631fa650a969ccc74eebfe7522b16e969de4bf48b6f7140eba46a301cfc5a56b9a8354785990daabae025a8175f6b62bf0870d73468d96ba92fa09f4ef3c566
-EBUILD requestsexceptions-1.4.0.ebuild 560 BLAKE2B b769c1545b27c579213a5524d591e12a55010c549cf328a548407c6ec261b09749b1832b0c1e0adf396a2d252dfb76f8d237e46b2b9cc3a83a6f5a88f819c15f SHA512 f2ea012e6fb207c6f4c6fe4ad1e6cafa6b3cefa1874b8835c9d0dc0d03cb811d1703acacc49eb943ff168eb80817be8e22d36dec11f969291fd4e156febf870c
+EBUILD requestsexceptions-1.4.0.ebuild 565 BLAKE2B 98e4fa751eb2d299c10d3347399d9785559a31d9dc3cd456bd150f27f5b4285f0e844f75aa88afdb30b23ed9282cfe0e1865170cb118fec5c2d46c4b31036cf2 SHA512 7951590bb598fa4dfff3f7f293923df002258395cddfaeb0bc3be20ad83b8ee59f901fb2663491e10bbccbf810d3dde102fd785b565e2b80ccb8dcaa5de27467
 MISC metadata.xml 846 BLAKE2B 976db0a8f9189f66aced98438f40a832c3e059f5c4d5be2466d5de2baa99fb4420a6fac98948801b6d5d363e8884b7f3110e8005323eced4c01414358f2d3da9 SHA512 d2ee4202dd7751d3caddc2c90b3d3c309b29ba1c7caf3427853944a7a5bea1d26a171fa59fff4f80e07235b3853990faa9dbad24ac0075fb813c4b91ddc4ab08
diff --git a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
index 44dacc0e238c..5c3d976f6a4b 100644
--- a/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+++ b/dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 4d590d097481..b71a1af944e7 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,4 +1,6 @@
 AUX rope-0.16.0-python3.7.patch 9140 BLAKE2B 911b730957faa7828252f3e4c58ff9d3dfee41c1d2ed841f7df95ba9fb890207a57b5e44ad641f75d5a14ed03112c0fb5c6202d7d5c3fb29e679fb5356fac4a9 SHA512 629deb4f13c207afeb570dfde81c28d8cf623d83dd8b9b004627e50b6634834f308ac7bb450c37d4ffa416b4c5f01d20ba6f071a567b82a4a7647204257f7c59
 DIST rope-0.16.0.tar.gz 243304 BLAKE2B 2c41572687ef245eb20abfccebcc9f12ecaa177be313cec59c85be5102b7358566570730a7140f952b0a1c515b479c3d21740d32d4678e65c4c572acf86f4e27 SHA512 33ba57b246337e413126309a521c54e861899b03fd250e148b97d9789cddf6eceab36609ea6e36e84ad1ac514bc3363f4937b01bcb96b6103c2a33bec1d4fb75
+DIST rope-0.17.0.tar.gz 248629 BLAKE2B 7c9276b5f400dfa9661f81d365eac150a124620824d400131d5da7361475e5a2d548c8b53a88e61e7ae6e483a47c8ca4b8ca773235e209e8c6fb47b0088327fd SHA512 c27a17fdf73ed0ae85fe417132acd999452ae88a7b779d84fdf73134094fd34510ae08017dc24ddd7c34cb70353b5a43021229b88819002371790e7717b8ae46
 EBUILD rope-0.16.0.ebuild 975 BLAKE2B 89c9f51d3778b6489640f0d4511392cf86443fd1f2b0213eed77977e60dffa1d586e38ba03b9fdf6f4781385aa18d9015313344718e0bc1f410cdad38d8ece7e SHA512 10cb6f677aa258cf00853fa75564a6166e093579cf7ee6f3054a213428810379760e6ee2fa87adaf25b47fdd9685037aafc1e63a1aa1fb05ab4ff518022e2dea
+EBUILD rope-0.17.0.ebuild 926 BLAKE2B ff270efbeada8f97f33e2c0029960505361f5da37ddacbb5913120e3655737f3dc8eb35e3d2609f7f2ef89686aaa17361993fd071c8cc8024d6c4588bc9a2af7 SHA512 0ef0b660b8cfbe018fc23c1fdf566c4699d47b573eae0910b00bbd69ae8070c8e0ec97912dea46e6fee753ce68b9e0ffacbffc1da950b0977f6bf0669096e3eb
 MISC metadata.xml 426 BLAKE2B a90ca25878154783f5448189564061f85cc6dd9f92855046a0965b864c496d5b0c608c128330b7cfcb395b615666aaaf6298b1f0f729832e4be07aa0d6f14f01 SHA512 aba585c9733078704e38b5474b1e3dc29a5cd1f8e07501d00f025136ccf4c65656c967831ac2901f8f0a90b9c3240e5cb4b6ee3fd34846bde17cbd1932853697
diff --git a/dev-python/rope/rope-0.17.0.ebuild b/dev-python/rope/rope-0.17.0.ebuild
new file mode 100644
index 000000000000..c5d96a7c3916
--- /dev/null
+++ b/dev-python/rope/rope-0.17.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python refactoring library"
+HOMEPAGE="https://github.com/python-rope/rope"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="doc"
+
+# Dependency for docbuild documentation which is not noted in
+# setup.py, using standard docutils builds docs successfully.
+DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_compile_all() {
+	if use doc; then
+		pushd docs > /dev/null || die
+		mkdir build || die
+		local i
+		for i in ./*.rst; do
+			rst2html.py $i > ./build/${i/rst/html} || die
+		done
+		popd > /dev/null || die
+	fi
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 83f6680775c3..6a73b666f6f3 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,5 +1,5 @@
 DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
 DIST rsa-3.4.2.tar.gz 40956 BLAKE2B 9a6353c84329303c655e7a25fcfa2ca42ea846c913fac0c26fee4a27bb85f9380de876b2ec07ae2212eb37efe5d2e401b2672f187f74bbeee1e9ef1099629e36 SHA512 62b0ff31fb3b9c18ae65bd102329e69726b853560576b1b66b9b89b26d3ff79154239af7e7a581b6a27c7017cc013f738762cd9662777ef594cc11c5b1f8e267
 EBUILD rsa-3.4.2-r1.ebuild 726 BLAKE2B 1148a8eac8fff822edad880881c00287cb6b524f8de887803c2dd9e74170474d84c26294115d2ae5eb59ba6ba1c4a78eef00ed320ab4a0afe102344f1db1eeab SHA512 1cdb51bc1b094f54e9af7a2e598ac7d2a2865fd81352d6b614aa1a7864eafd52a2e7b5bdb747d6bb4d6d6e67ac27097eb61548563583db1e6eb6c7b1ac432fae
-EBUILD rsa-4.2.ebuild 760 BLAKE2B 30cad7593757c76f85437b01165fd78f48dfe0295ca9c4d4c9abbe5c25f6f60c15cc359d77446f2bdd2903b52b1c38731c952bdde67d0225f7b43d6b4ef74ab6 SHA512 8e5dc874d209deb935a234f62e403be5b0a1d5821a1de0a5ae778dba8d7758f447a5acbdf84a1a50fba9aba2e01c7a9e87449ec580fba7b142c2bd44fdd8137f
+EBUILD rsa-4.2.ebuild 765 BLAKE2B 4d2118ade0070fb504035ee70d1847a65cf1fa5165fa70dd0a1b24276ef43aaf934fc5a19ebef8598d3bcf4d858e561074ab776a540acbedba07f22e2b8b1b82 SHA512 23756c4125e0bd79c600d9c4675013c96c237e6f7bb2e0e202e1c6a6c4002444c1972a38a2be142ad28e2e82034505ddd8c68919d2914a14d0bd8bd54e9541bf
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-4.2.ebuild b/dev-python/rsa/rsa-4.2.ebuild
index 6a29cff3b3be..35c8068c1a04 100644
--- a/dev-python/rsa/rsa-4.2.ebuild
+++ b/dev-python/rsa/rsa-4.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 6949c333bd8f..2223388e4e92 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
 EBUILD scrypt-0.8.13-r2.ebuild 607 BLAKE2B 9deee7b947e08fc218d3bc78905266cea8b9e2f1cfc7af751b17bb95e9ee66934d89b1f6234bee49a229bb9e7729af646bf20f5ce0a0f474b2cf89f5e83b28be SHA512 e90f6576379e5b98fa233bf913e59559fc37b44e7d6add3ee9401ae59fe55ab214705a725cdd4d7c305924a52fd8f2c066b466a6d0b3308810252411d33633c3
-EBUILD scrypt-0.8.15.ebuild 603 BLAKE2B 7b8a503d33e8c2c3d8b60a5996982d7e1fe0f0c9433748047a9ff5d5bcd4d21daf12952bd7931c608a923c93a0bf6a97237d90d7cd53607f3fc85c83a5c8ee00 SHA512 b509ea379f9b6e0de0bdb9cf43bfa418743b52aeb547cb7f2d2e6fa8ec9c6033c52c92a5a0e47fff703db08cfb679aa17c1dc20c64c0c9ed2a4a5cfe9870716b
+EBUILD scrypt-0.8.15.ebuild 602 BLAKE2B 4954b4734491f465faa676eed627bfcd7924e83e3a5309d2225b5211086aa63dad82cf74225f761450ecee38add2ce9b5f6fdc130cfe39938b6d5303ebbbe48f SHA512 415b081aad9b877f54cbd60f66305aeee2df3617ec5099def3f79f008d9d1b9738860ba64dec26ae603357b130514fd4222fd3c0879ca1e2a495820a64bd7dda
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.15.ebuild b/dev-python/scrypt/scrypt-0.8.15.ebuild
index 4c30326218fa..bbecfe7218ee 100644
--- a/dev-python/scrypt/scrypt-0.8.15.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.15.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/holgern/py-scrypt/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index aaacdea9ac17..eceff507eab9 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,3 +1,3 @@
 DIST SecretStorage-3.1.2.tar.gz 17848 BLAKE2B 3d108f98fd0c26958860aa65554a21924822a5d51a90ae20c5496792f4571babbdfd2aec5b70d1bdd908498ad1b61606130d5db2900406ae85f8e3367ad3013f SHA512 c132b21556c55b5912354fd27b6062d32c0f510234f7fe57f6e8e0acb08393ad95e0896967b577de97821387cd714e62b657359230296449e4e0a7ae5a797803
-EBUILD secretstorage-3.1.2.ebuild 1144 BLAKE2B d15f3f72742d8acb7f7cf92442e4fbf2b8283e24b769b84d537e3db718ffb99f70b202c590f03b90c490e896b55ec1b8ec267a41abc511093e547b048e089d89 SHA512 c784ba0e2a387ad13c82ba270dbbbcfb4b67ee768579cf879226502d19aaef1ed77521faa78421c5d1611eac426da9dfdfb71a533af7bb64e411125862f7ff22
+EBUILD secretstorage-3.1.2.ebuild 1143 BLAKE2B 84dd5fd13ec653d42e342e8149a3694e8a9dfd70ff471ff6baac96a3d4cd05f89927ac13cbb6e6fb5d2079b8fb24b84b90d4446914b0fd683839c4ed6b100d9d SHA512 6855a24866eac3b6845ed683835c831c893068830349d1f8fb63240560adeb2ea0d12105b99b922486c8ad09b3a6265fb4c35bac9c70cee7e24a132981ee1510
 MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.1.2.ebuild b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
index a7f6e63fccda..6035612b65bf 100644
--- a/dev-python/secretstorage/secretstorage-3.1.2.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.1.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 0652da7e0017..944c34e58590 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1154 BLAKE2B e5f120b6d780e19a1dc4efc4d959e60752adb6347ee0bd7ab27784dbcda920b4b29c7b5fc146ff251bccb4140639a40d39b2ea6a7d62cc83e61eeae061d77040 SHA512 a561dbf3b23a3bf3a91a1b7902fad5375ccb41dbc134f28d64e2d89cee0d778e3c47ce73e5fc27bc3beb6e6e2951a442bd54ea9eb81ff233e13c43d854004d36
+EBUILD selenium-3.141.0-r1.ebuild 1153 BLAKE2B 4bdd29affbec3534008cb2ce82b46939e4f1f735765e604cb6770b82192dc52df0ebe6644e8d043fb014657a614c5fd584e2b890e2c8a62ec298b476a5ea8242 SHA512 5a3dceedc738d7ab2f8a84547eb9c0ca46834d30916a52b5ccdc5dc60ba2520dfc864656b325f68b9f76ac40054569da4474041ebd8a1ae40813845882c89685
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index 9fe259faec8e..a65c1f33f536 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index d156dabea6b9..e80154aeed12 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,5 @@
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
+DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
 EBUILD simplejson-3.17.0.ebuild 774 BLAKE2B eaec307788c130d7e32ccc3760379e3712f1407b9180c1a087daab1327ac230caaeab92fe6a32df2d58219c11264b9c24317fc64b536a67e24ebf870fcb49a37 SHA512 69226587cf94ab5de79b4a1a0687ca2554b545807d9796ea23a9c82419b53d0d1ab6f36ef73a51936514a66c773f3655cc6c2b74eb690e1ac1a2763929d6eb03
+EBUILD simplejson-3.17.2.ebuild 783 BLAKE2B d5b387e615ea31826fdf8b5d620f970c98f9cdb1698fcab83dde5cd82fdbe9bf1334005378d8d0fd34603d829ac3c8a68803f7eec81da2d5930ecf7c76e2071b SHA512 8ab86b3c0c26fdbffd7115430aaf84bac3676e817c7453f9b54fa73d6d01930abaa385e049c24f4aa54d8440895ba5b834fe5be2c583b83b49903d5cf6efc835
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.2.ebuild b/dev-python/simplejson/simplejson-3.17.2.ebuild
new file mode 100644
index 000000000000..093a002c8044
--- /dev/null
+++ b/dev-python/simplejson/simplejson-3.17.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple, fast, extensible JSON encoder/decoder for Python"
+HOMEPAGE="https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT AFL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+DOCS=( README.rst CHANGES.txt )
+
+distutils_enable_tests unittest
+
+python_compile() {
+	if ! python_is_python3; then
+		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	fi
+	distutils-r1_python_compile
+}
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 7e7eb70c355e..070b898473da 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,5 +1,5 @@
 DIST six-1.14.0.tar.gz 33857 BLAKE2B 711ef5b79118c1280c9868688869cc475668c248e6b0c2061145818842d5b4c28809d86b1388709af24f6e92fe5926ea6261f1b85c62db749f79664cbad93e4d SHA512 4dea0f4e7961e8b582d665501c65852dc3b73516a0b6f78b0888c8670f1450df58bd3eea418777f41080b842ab6c3d8633be1034bcf920192e5590d5316e2c9e
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
 EBUILD six-1.14.0.ebuild 689 BLAKE2B ff4f54f7fb3e48bbea4fd2dc414668e95cd55cb78ed55f91934e304de9b9ec95b3c70e60e144aaaa36d39ac8351f324293803deecd35e8b13bf096435e39a499 SHA512 3b89249aff7ee4847e88a3343096ec4cbf5930b16c1dba3d9dce77a8359157e7c2c45d2aef508d6a34d3349a1ef5973b496db898478339bc16fdbd7f574e8159
-EBUILD six-1.15.0.ebuild 695 BLAKE2B 93161790ccfe5d05c899250d9f215948a7b762bfeef4b106d817f7b993703328a01be55894d046dd59d7c5e88a1b6ab64fed62bccff8a900d2024a877d41aecd SHA512 2baac77df821456056823ae784569102055c90764091fd68e8e17ca9cd1855cba3aa63c48e3e7632415d5f28bdd7fdb342d580e62ec3e58d9b090ee5c3cdf8f8
+EBUILD six-1.15.0.ebuild 691 BLAKE2B 49ca8f129495ebe8af17da6336f454de3f5ef97dd8805c97f74f4cf1d8b88a1944a9426def28d111091b1974fde659880ceefe7d02078fcf988d5c03650bc4ae SHA512 226f52169078c7a4d4d62d2917372812bc11fe5ea311c5fa62af874b5c074467ca8e4037618517b471df4143913de852665d81e725fb9e37b1162b860c15f265
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0.ebuild
index 18d6e360909e..685f6840a365 100644
--- a/dev-python/six/six-1.15.0.ebuild
+++ b/dev-python/six/six-1.15.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 distutils_enable_sphinx documentation --no-autodoc
diff --git a/dev-python/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index 9165b97c88de..ae8349f50736 100644
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -1,4 +1,4 @@
 DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
 EBUILD sphinxcontrib-issuetracker-0.11-r1.ebuild 1379 BLAKE2B 395a2ab8c1ad84da7f0332f3c593533d49067710f80ad80deeb43ede5d72187eb338aea8dbf960423487f6f3a19b86aac4a93ac2fd71c572bea7576860468d67 SHA512 49e8a09069cbec8906d669cc022b6943e96406dbdfbb167fd57051c87ea011d017954e51da91720d60ecbe947f436ed54ce16eafd6dafbfce560bff7d4efefef
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1553 BLAKE2B f8761fff3f034af58ffd27d2cef10ad5023abd6514539ffb4b9ba0ec6ae0f94e5140e455e48017fbb187569c9e47353f279bd098f3e28cf3d459128df34354f8 SHA512 eb05f7b553643638588c8f5b5d7e22252be65b695716f26025f3524f978e280dd6f4b7a6efeea787d2e2809228c5331329864ad15b147a8a3d62d8c335607e77
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1378 BLAKE2B 5c56c20365fea3da92735a3ce36d0d07dfb8dffc30946ace90cf9be3c800c57fad97dae2b3bfade19cb323e33c73b1bf162ca2a4d7d5e78d1ded01775a5885e3 SHA512 2347baf248092c226c73f3bba2864bd04af7e078f3a94c1672990d537f918c2e7c4234969666fcfe484189b85905a9d2d5cc42d2056d29b14a4c1705aa949e1d
 MISC metadata.xml 254 BLAKE2B 5631905be15b8e2a50e4ad6c9d74ac6ca52a48dc470757d354f3a1a7b7cfa57f8bd9a2598c002a74088b84f8724aea98914e15430f83a24dcf0019e99c4bf37c SHA512 802bb4521ef941c7965f90668559d1a935ac922903521c0e65ee933360be2854415073ec46e874dc34092e35e0520a701186fb809940e2e2766c09cb8003ae3e
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index 5c20acaa206c..cd4654d3001f 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
@@ -14,20 +14,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
+
+# ImportError: cannot import name 'SphinxStandaloneReader'
+RESTRICT="test"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)"
 
+distutils_enable_tests pytest
+# KeyError: 'refdomain' with sphinx-1
+# AttributeError: 'Sphinx' object has no attribute 'add_description_unit' with sphinx>1
+#distutils_enable_sphinx doc
+
 python_prepare_all() {
 	# test requires network access (bug #425694)
 	rm tests/test_builtin_trackers.py || die
@@ -36,27 +43,9 @@ python_prepare_all() {
 	# and virtualx.eclass.
 	rm tests/test_stylesheet.py || die
 
-	# Avoid redundant objects.inv from downloading, sed more lightweight
-	if use doc; then
-		sed -e "s:^intersphinx_mapping:#intersphinx_mapping:" \
-			-e "s:^                       'sphinx':#:" \
-			-i doc/conf.py || die
-	fi
-
 	distutils-r1_python_prepare_all
 }
 
-python_compile_all() {
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/. )
-	fi
-}
-
-python_test() {
-	py.test || die
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	find "${ED}" -name '*.pth' -delete || die
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 27dbc26e532c..c3048b4a07d2 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,3 +1,5 @@
 DIST spyder-kernels-1.9.1-gh.tar.gz 71106 BLAKE2B f6ccabb86d0b594c586215ffcd55697aaeca6b038178a4715df206dd77676e75e6e51d1de799d5d5d1e07cd935dc4bcf2c7c7d50417813391ea3b655bfa910b6 SHA512 856931663f7d3e964831e96bce8c3b6ea81596604dc5f53be132a536612c63d98e6b3862d4153c5ea64e6dee5cb1e27156d30b94edd7b7010ba7c6596ed6e5b1
+DIST spyder-kernels-1.9.2-gh.tar.gz 72034 BLAKE2B c6ba0f911ecc7ae000ef57605276cf7a089eeee580d78d0b9ba5b4a667f493754d0956690a8ee14e3e5031cec0407915ee4c8526e815a2226a7d50cc849cb414 SHA512 f7aab11bcfc746d56d67c28162ebadc5d583f0e05a5dda27ec30f5ac37f736c1f8d785371b5080bb19b964087d6c730d5f377c29781b7bd7bee273ec533799d9
 EBUILD spyder-kernels-1.9.1.ebuild 1220 BLAKE2B 6e75b9282d3170c0cf4263b00b8008b1ac9a2c2db8f3a51b15b7b02e8585629077bdb5442fe025c36304eb97d4bab1b89b8238aa73698fee3b0886a838d7e313 SHA512 dae76ce065076f3da0dad78f9ed4f8a09bafe000ce299013fbdc1ddb8d6e6c419063199309db7e802beedfd871751c95114d1741c74a136d55f4f8fce6a2122f
+EBUILD spyder-kernels-1.9.2.ebuild 1241 BLAKE2B ad7f9b1d68ea4fc423f5d04c416d66396f4ed40fb05e05f1bc5b82a2db045e23b48ee8738c586fd20d9709d386151ac5bff790d5a604c743ccd76f64295b9c59 SHA512 ece1339283b209085a507d9b7eb0d0b3c134a66a441e6b06d42a4c602e035c01a183f7393573e33f31e7c7654cd56b5fb77a8f9cccbaf45cf6067d217bf17115
 MISC metadata.xml 648 BLAKE2B 571d097dacb5bff623fac2098059d24dfe73241f2dd75f77a451859479779b945d478c13e22f4f69716de473437576bc6db870a01002a66e046d5219ab052af6 SHA512 13b2c212ea44acd0a21b30386e84f6ca2b0fa49e9ca5bcfb952d951215abd5bce5d14441cad0bfba0b39685c8e5f5e2fe1a1659101f48cb6787d17a8403231b9
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
new file mode 100644
index 000000000000..5f51d2e2363b
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# assert False
+	sed -i -e 's:test_dask_multiprocessing:_&:' \
+                spyder_kernels/console/tests/test_console_kernel.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 5e930998f85a..b675eb8044e7 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,6 +1,9 @@
 AUX spyder-4.1.2-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
 AUX spyder-4.1.2-py3-only.patch 2100 BLAKE2B 95223b087b2d85b5069822d96cc185f1e4005ff75d8a894a4684dc0a2ca11e2807ea912b0732dabc7ea5069fd3547ad30932cb92f5ce899c2313c6c784723046 SHA512 ec8361268d511888ac19326ff558198f39415237d528910ffb6ececba49a2d5bfacdf81f3f6deb299ac9375908ab371fa115211e77366409c87aa3e64b971466
 DIST spyder-4.1.3.tar.gz 11610111 BLAKE2B 5cc25a6a8c6609dcec8e5e0d4beddfa582b2f632a4d1c61ef68e68e82f3cbc2b29694ddc7cdda216e4a8143254e6c1cca1e817a3f72be324671ff0196f3f0842 SHA512 0d0568c500c5b153bcd0073897eaf4e526e62bbc82c4a795683185cdac86f00c24d3b2efaa1f6bcd2f60305e387cda46bb732fbeaf21391e9d80ca4b18787b7e
+DIST spyder-4.1.4.tar.gz 11699453 BLAKE2B 208ba4f32fa548ef8478d72c046e70ba43a2fccd2040629af03f7f56c379ebefa1e90594054f15a92aebdd14307d001c68ee5e6d2401a841e408c4af42436c33 SHA512 8a5f63b11648002838e0b4e5427b1c7cf9cbe4a4fd20af7e33e5e789cddaf6393bb7200bfacf8c7af19d723f12d99d2e962a769706b806335f7146ddd6853735
+DIST spyder-docs-0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz 29749238 BLAKE2B 9cf655c2a6fdf84278eaeb2e6f13c92eb4e585f213fd4f164a2707bc3cf8cb8abaaa213c5e781414fb0eecb3cf26b1f1708b394cd1ca12fa353ccbdd33f01dcb SHA512 8ed005cbfc32d7c68cf633790446d5d271f4d38ad190c09b2bcfd3ee96f24af5443d911bcdea90dc6ad94c5dab78437b9db02d0d4a7ceb9afa37a31e4bad24ae
 DIST spyder-docs-6abac0ce8be017c6ecfb2b451700bf5b0e4c36dd.tar.gz 15821929 BLAKE2B 843510c87dc9ca616a6114159445894d2f4728201a93f424131f2524c8bc833d1b1540740d1e7cf473c4aed501cce775a073a9ee8748fe29b4193c927da70820 SHA512 c9161a7dc4bdef8e9a1ebe84ee7cc01fb9083965b54fc421d006a999ff753485c3d4a615e9646a6be47826663a64dc9af7f442dc2e4c81283c6eb5de55a8a3a9
 EBUILD spyder-4.1.3.ebuild 6278 BLAKE2B 23e63cbe40558640b4dee615d8f7149ce031295fa8217dc3011ad352e47198f008ce7c9af0ea9584528aa79fcad2a1c04765a165d74625c9bfd1b7bd8bd80f66 SHA512 02b75ab6a973f80f079e5a0dff490605624eab3cb30d56a537a2c172861560dda569c1f17a5879d2e05a0e608bf181d51e76b3ff9f78bd84e8e7388eef4553b8
+EBUILD spyder-4.1.4.ebuild 6065 BLAKE2B 60946f019296720480b43224beec7608b65a96b06bac0f7291443c18c38b31535831b18452f2d8724186d20f9430e1b4a3910aa4accae0e5913d9818af3d95ab SHA512 f773bccebff54a16d00f74eaf97a11e44a5b49bd8c327a0c83ce34c94eb61cd763e6025fe6fe327c4318062612b018ab9422128dcc7a1cd9396c7441cedfddce
 MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
new file mode 100644
index 000000000000..184855914157
--- /dev/null
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit eutils xdg distutils-r1 virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# Tests succeed, but freezes at the end, installation does not continue
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	>=dev-python/ipython-4.0[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.17.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.34.0[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.9.2[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-1.10.0[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]
+"
+
+DEPEND="test? (
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}]
+)"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.2-build.patch"
+	"${FILESDIR}/${PN}-4.1.2-py3-only.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc --no-autodoc
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# these deps are packaged separately
+	rm external-deps/* -r || die
+
+	# some tests still depend on QtPy[webkit] which is removed
+	# spyder itself works fine without webkit
+	rm spyder/widgets/tests/test_browser.py || die
+	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
+	rm spyder/plugins/help/tests/test_widgets.py || die
+	rm spyder/plugins/help/tests/test_plugin.py  || die
+	# fails to collect
+	rm spyder/app/tests/test_mainwindow.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# AssertionError: assert '' == 'This is some test text!'
+	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
+		spyder/plugins/editor/widgets/tests/test_editor.py || die
+
+	# RuntimeError: Unsafe load() call disabled by Gentoo. See bug #659348
+	sed -i -e 's:test_dependencies_for_binder_in_sync:_&:' \
+		spyder/tests/test_dependencies_in_sync.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
+	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
+		-e 's:test_transform_to_lowercase_shortcut:_&:' \
+		-e 's:test_go_to_line_shortcut:_&:' \
+		-e 's:test_delete_line_shortcut:_&:' \
+			spyder/plugins/editor/widgets/tests/test_shortcuts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx pytest -vv
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
+		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
+		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
+		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
+		optfeature "Run Cython files in the IPython console" dev-python/cython
+		optfeature "The hdf5/h5py plugin" dev-python/h5py
+		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
+		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+		# spyder-autopep8 does not have a release (yet)
+		# and are not compatible with >=spyder-4.0.0 at the moment
+		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+		optfeature "Vim key bindings" dev-python/spyder-vim
+		optfeature "Unittest support" dev-python/spyder-unittest
+		optfeature "Jupyter notebook support" dev-python/spyder-notebook
+		optfeature "System terminal inside spyder" dev-python/spyder-terminal
+		# spyder-reports not yet updated to >=spyder-4.0.0
+		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index b644dc44805a..59ddd26e5393 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -2,5 +2,5 @@ AUX sqlalchemy-pytest-deprecation.patch 2695 BLAKE2B d71c791e39a6caf9d8e67dc61ed
 DIST SQLAlchemy-1.3.11.tar.gz 6007784 BLAKE2B c889ea28ae08fcb83d338ab01a64533142428ee91a6c11b9a7f2116f99161c066e66f49d76bdd2c7600f1a7f86a2add217f49dda4cf97566a875f28d3d4b24be SHA512 c691539db4edd62af749087728dfd424010bfb3ca2cc8503a4b96c1625d059d4c2a748b9a35cc870cc99ca9df61966cce406f9b570b25e55c3632a99b8621e74
 DIST SQLAlchemy-1.3.17.tar.gz 5979141 BLAKE2B f0fa46493461f532ebca9420fc9f49a2c04af888aa99653946a5bb563d40b8bb714a03301300ebb80cca76a99f8226ddfcde4216e8fc2593d3a161b5072276ab SHA512 6f6d54b9018ece6c289f28a3a41ffb1b2216206edee08c49f387e9f30740969dfe0f8272654ce4efca159a2a6619e76c41b2ad2b10c391cdd64681ac17d0bc79
 EBUILD sqlalchemy-1.3.11.ebuild 1598 BLAKE2B 6fe7989cee639c1299f36553fb1af8c2b94968622db2ce909d3a7af2443fe9ee8875dd5ea2c0fd862a62a42e58e18425c7ce3f7b7db74e3244f6f2cec85edc80 SHA512 c18a8f06666afd03c7852e5bbd5ea380ac28684f26af01b656cdbe8589754cf0ad6dbd57a2a059616a0bc55c02dad0130afdc265ed86d7ec41b3c7e37e1791fb
-EBUILD sqlalchemy-1.3.17.ebuild 1475 BLAKE2B fe09c762b240787ecb90e7ee1d00d8fc0f6dedaaa307c93135cdb3859dbf0c1f2f7049079a6111d0eae944f472a89eb2b4afb1f1d3c70cfe0ac524706bbf6b76 SHA512 dca8f7f3be9b5b3fd4df985ed4e40243b7b527a861329391de8ba2a8d9ba5208ad53ac700f24ddc667e4b557700fa871162db37b12323f3389d6b9997480963b
+EBUILD sqlalchemy-1.3.17.ebuild 1474 BLAKE2B d33b6480d43e2e1f0e4f10395bba3306c2473bf42eed17a4ac48a2356663cd594e1930260ae90a49c2441bcd82ccbbbea7f050f76802b984e998a5ac3a687e79 SHA512 d0fd048a60fde48ee469221c4833c43f2aaa199b2ecb99630ecda4e82277efb2e3b52bea5807fcd06873eff3827fab7a930d6745d5a1a6ade6a1f18681784c8f
 MISC metadata.xml 313 BLAKE2B 71212a9a3076b472b488bdb4e12fef98e16881a32a8383c5fa6a9008353d2e043dfe64cb536ecef145ba74ba77ef3a6c43d705d5072d1b56e11eacfadd1d0edd SHA512 ef6298f9e38312117a0d1ab1e63f2fb21ae51ff149053603c19437b90d954827858579ab8f021cb52919aff4474a27f5a598d8515a7e5a9f2e7e35aee53c5326
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
index 77e3392221d4..5bd22ecd4782 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 REQUIRED_USE="test? ( sqlite )"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 0297f6b455a4..5688f876768d 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -3,5 +3,5 @@ DIST stevedore-3.0.0.tar.gz 510351 BLAKE2B c73a6baaa4179f8bd45bae92491fa6f87d635
 DIST stevedore-3.1.0.tar.gz 509580 BLAKE2B d19d70bef6573259f48c171b81aa6c08efa2055825ae8834e30f5713e3049cb75fe6adc07bfd37b4a1b17c0d4eb03cc31bf208cf01b91b94dcd436069e03dcbf SHA512 d5b800b6bcbf21935edc71241de2216690bf879f829264b762ff29402a273e7fa6b20b551be3f38a433eb967ff4f248cb3d2f359bd00fda03e79b21cdc800207
 EBUILD stevedore-2.0.1.ebuild 975 BLAKE2B a1214a513f6d8e9ce1169a75d78de1acc88d1a18bcca671364ba3431c2293830532967dcbb2f3f6f5b80299d93d41a418272c98b96c3394f4a7ded23581e23a8 SHA512 c72a9db74ad2cbbd020ca4e2f363f836735cdcf6d440517b452661953b62d8207e8ff71928c4849d0e22190ed8bb5061da0a0cf4e3d1688dc6c05e9b00269723
 EBUILD stevedore-3.0.0.ebuild 1119 BLAKE2B d17e00401bd3c7ff628a11477445d0f5e4b53bea9bdc50822830f6460fd864734020a534a83e9bfcda9ef73c1af78cf5413c7ee4c8e27fdf96b21241dcee260d SHA512 3fff1943075f920f1d673c4887c8737c6bf66288931b317ff3dac82242c984f1ec95cad1311f6010a13fefa04d6ebf28db42165a53e238b58ef869213695614d
-EBUILD stevedore-3.1.0.ebuild 1119 BLAKE2B d17e00401bd3c7ff628a11477445d0f5e4b53bea9bdc50822830f6460fd864734020a534a83e9bfcda9ef73c1af78cf5413c7ee4c8e27fdf96b21241dcee260d SHA512 3fff1943075f920f1d673c4887c8737c6bf66288931b317ff3dac82242c984f1ec95cad1311f6010a13fefa04d6ebf28db42165a53e238b58ef869213695614d
+EBUILD stevedore-3.1.0.ebuild 1124 BLAKE2B 128ca4f978a6499ccfe9e7b0c4ea3b2f945785c8c4f36e3d2e9bb7054b5ffb20d67629651cec90599effab949e00466434ae232b0dd47899946380371fb58382 SHA512 1b259c89d92fecd9cf9a2c17a89a9eab047419d346ba37160a5de4e3694dbd89c16b0f625a78cc21280edd68dc044aeb5b8c2d52b28ce40646832e988bfc1d24
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.1.0.ebuild b/dev-python/stevedore/stevedore-3.1.0.ebuild
index 5a3e7abb647c..9bd342f667de 100644
--- a/dev-python/stevedore/stevedore-3.1.0.ebuild
+++ b/dev-python/stevedore/stevedore-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 47edad50bfc7..acb8c4d8f6dd 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,6 +1,3 @@
-AUX 1.0.0-tests.patch 1058 BLAKE2B 4373418085d6382351a99bc6cee59ad8c65b4048ce83df2abf3b4c895976d52de658cd98dd9e3c971d96c185f0e9e82f12c42e6bea7193fd7a960193ebe89cd8 SHA512 b1accf4434415357a8c235c6b660cec440096616887e62fb45a2d15e314a3abb9be825bf4e8ec8d4b18d7ab08197cacd6916bbde87dc5b88c6f3e80ca89b1de0
-DIST subunit-1.2.0.tar.gz 460532 BLAKE2B 7f8a459afc576efed8fbf271a9d2e175ae9de9dda68acb26322f222ac46f12fee5dece4cb2679fca608ba307a3692aa84b13d0e093606bd89a53c69b2081cd44 SHA512 f6559fd771ad0732985230d11a9a8326ef35c817b62d1f50dc332f0032f7b08559a46d2534983b7d3964e45682ac49b3e348581ee0983861390abcd4ec20459c
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.2.0-r1.ebuild 2621 BLAKE2B 4e4f4caf6ea78a783a23ee20c251051bc78fcc933b099e4729c1ecd1a3d9b63a86519ec76d29eaba337c932ab969bd0493419ab2eb50436492e7894fc3ac6bd9 SHA512 f0d0a2053f0f09155605d1fdbb2fcdb089d4b6bf1881c61e8caef4d470bd6281f1ef8b11d2202e1b0ddf8cb90f7cd0657570c777694f707b7396d69a0d1da320
-EBUILD subunit-1.4.0.ebuild 2394 BLAKE2B 49f8f8e05883a99a62f830f78cd1157a8517b326a86d10c0d6bee024db2fb6d8e4f9924bbfe51b3953edfcd5283c2eb3638e37eb2a8dda7898a0371a4dd9e4ea SHA512 311585d7498a9e4e45ded3184df64ca8b285256467dfdcfab3cbae8182b71b9a1959afacc9c2f6902d888e4b066c677757f8d0282685f9cde5154b359354b343
+EBUILD subunit-1.4.0.ebuild 2393 BLAKE2B 63ab420a93aca76d9d7c92a6f3fd50ced3267a6bbe076688e904220a6e9102de3138944faa63cdad2bbbf441233659e1076003d0c55812e8a9c9ea276849f106 SHA512 990b8897a6bd8b3af9f101bbd23677bf18e265e2089e793d2c188a5632abfea4e59f5dc10341800b7e01fd1701829f4aabe19c7282bddfebb60253704f41cbd4
 MISC metadata.xml 422 BLAKE2B 7835651c50d6d889887dc834dcc5a387cfea9c61867570b6c98790a1c7ea49c01a75868f6bec4f31ffc46a38dba51eb2c4ff0b6da8f8acfe6059e11e3db7f727 SHA512 dcac9ba5ff93016141b433c16b9d1a526ec2babd39721d75a6edd235eb6388500ea8228b6c8c88eacbb12c732c36883c0b698f7039aca7909890fe16cb895cb8
diff --git a/dev-python/subunit/files/1.0.0-tests.patch b/dev-python/subunit/files/1.0.0-tests.patch
deleted file mode 100644
index d83a1900cbe1..000000000000
--- a/dev-python/subunit/files/1.0.0-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur subunit-1.0.0.orig/python/subunit/tests/test_run.py subunit-1.0.0/python/subunit/tests/test_run.py
---- python/subunit/tests/test_run.py	2014-11-18 16:59:26.000000000 +0800
-+++ python/subunit/tests/test_run.py	2015-03-26 13:25:19.193341069 +0800
-@@ -77,21 +77,6 @@
-         exc = self.assertRaises(SystemExit, runner.list, None, loader=loader)
-         self.assertEqual((2,), exc.args)
- 
--    class FailingTest(TestCase):
--        def test_fail(self):
--            1/0
--
--    def test_exits_zero_when_tests_fail(self):
--        bytestream = io.BytesIO()
--        stream = io.TextIOWrapper(bytestream, encoding="utf8")
--        try:
--            self.assertEqual(None, run.main(
--                argv=["progName", "subunit.tests.test_run.TestSubunitTestRunner.FailingTest"],
--                stdout=stream))
--        except SystemExit:
--            self.fail("SystemExit raised")
--        self.assertThat(bytestream.getvalue(), StartsWith(_b('\xb3')))
--
-     class ExitingTest(TestCase):
-         def test_exit(self):
-             raise SystemExit(0)
diff --git a/dev-python/subunit/subunit-1.2.0-r1.ebuild b/dev-python/subunit/subunit-1.2.0-r1.ebuild
deleted file mode 100644
index 69fe77e2dca1..000000000000
--- a/dev-python/subunit/subunit-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 eutils ltprune multilib-minimal versionator
-
-DESCRIPTION="A streaming protocol for test results"
-HOMEPAGE="https://launchpad.net/subunit https://pypi.org/project/python-subunit/"
-SRC_URI="https://launchpad.net/${PN}/trunk/$(get_version_component_range 1-2)/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
-IUSE="static-libs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
-	dev-python/extras[${PYTHON_USEDEP}]
-	dev-lang/perl:="
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-libs/check-0.9.11[${MULTILIB_USEDEP}]
-	>=dev-util/cppunit-1.13.2[${MULTILIB_USEDEP}]
-	virtual/pkgconfig
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/testscenarios[${PYTHON_USEDEP}]
-	)"
-
-# Take out rogue & trivial failing tests that exit the suite before it even gets started
-# The removed class in fact works fine in py3 and fails with py2.7 & pupu
-# The setu to restrict this patch is just those 2 is not worth it.
-PATCHES=( "${FILESDIR}"/1.0.0-tests.patch )
-
-src_prepare() {
-	sed -i -e 's/os.chdir(os.path.dirname(__file__))//' setup.py || die
-
-	# Install perl modules in vendor_perl, bug 534654.
-	export INSTALLDIRS=vendor
-
-	# needed for perl modules
-	distutils-r1_src_prepare
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_compile() {
-	default
-	multilib_is_native_abi && distutils-r1_src_compile
-}
-
-python_test() {
-	local -x PATH="${PWD}/shell/share:${PATH}"
-	local -x PYTHONPATH=python
-	# Following tests are known to fail in py2.7 & pypy. They pass under py3.
-	# DO NOT re-file
-	# test_add_error test_add_error_details test_add_expected_failure
-	# test_add_expected_failure_details test_add_failure test_add_failure
-	# https://bugs.launchpad.net/subunit/+bug/1436686
-
-	"${PYTHON}" -m testtools.run all_tests.test_suite || die "Testing failed with ${EPYTHON}"
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && distutils-r1_src_test
-}
-
-multilib_src_install() {
-	local targets=(
-		install-include_subunitHEADERS
-		install-pcdataDATA
-		install-exec-local
-		install-libLTLIBRARIES
-	)
-	emake DESTDIR="${D}" "${targets[@]}"
-
-	multilib_is_native_abi && distutils-r1_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index fdb92b5f6639..0719cf5c65f3 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 75b2feb5c3c4..b2f651ea6be5 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
-EBUILD sure-1.4.11.ebuild 701 BLAKE2B 5557db5f72ba4815d96d8f7599adb717e6bae583cdd6064819ab7468f8c68dc06034277b1c147c2bbb46669b3cedd27e2a045f93008dcdb9b0a9e66d3e2ddbd0 SHA512 953ef6d01b39ba5f49f3398ec025d1462c5a0d6036f8cf8a7cf25724c714e5b9c148f44f3075e0fc0ca4255b6637258050d1a3020400e44358a5fd0075c4f219
+EBUILD sure-1.4.11.ebuild 705 BLAKE2B 4c7d21dd2ed8178d1bf97d9da8d1a9dd6832ad22386324acad969ed6fca0399493cce42931fe58510ab3971d66f4152df6bb147b13b710d5d79b1d907156f1f6 SHA512 9fa24361ca77e061f8c1c16d3bc1eb1ca362494b01e75f8fdac82f89cb4e313c2722290cc7200a9e59068941253a7dba7a65254c09f3fdff28cdf65ddac6ca7c
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index 3109e20a229e..9476b51123a7 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 7a58ed04f97d..146c5d726d30 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -3,8 +3,10 @@ DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62
 DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
 DIST tox-3.16.1.tar.gz 294080 BLAKE2B 692ef3f498f78f239ecbb3f9ac5745462430a96bb67df7a732e5c5756d1b579c4ee8582d528d5eafddc7b19905057c01514cccaa42d7c1a442ac24cd531a656f SHA512 83fefc4b82fb33adbf2ece9a6fd6ffaf27771ac6076af5d2939dcbf68f1dd88b8edd0a105b0ec86dc7ee37b127d27ed46748af61423811c7435d0093d2e8e1eb
 DIST tox-3.17.0.tar.gz 294481 BLAKE2B a4fe4c94616d003f348b2c4a58276a93887f479a3727fac3734f998071a03cd3c8da2e3b1c3bc27f0695b9d596c6d966e6c591506ce1b6ebbb5b0826c3dc20b7 SHA512 0a04b1fde7a8f7eaa24823bba59dc25c3bc48c7159866f85131bb55c0adb61d21e8c5bf88598fbbd09de58bdc51cd740d256802549e3566565af400ef7e1e95e
+DIST tox-3.17.1.tar.gz 294492 BLAKE2B 1a2ed9a26ad366a1ae7343289b45a338a8d2a58c1b6df2aaf716a2e8bbcc1cbc797c70fb51665411cf1bb69243aa8415f7fb7c82d78afb2ffb7117e4ae75edad SHA512 b084d4552609c90d006573dc95d46d0b27cf53c40a54465040e3c625b5d33eb19f95f3fa488439f11029e30ca414ce4e9ed6793a44072023826bc1f4398aaeeb
 EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b9b26106edfaac9bde6b0fc6025989a56dfa3e55660d0373f5cbaf65811474ad39957711fcea028881e29b0 SHA512 c9d973a77a9ad1f8b7c37af20184971bd41ce0233352dced8625f01b911c84c46d1e388cacdfdc19a7775b2ad27273e966e32515e9d671f2a7ec258eb025948d
 EBUILD tox-3.15.2.ebuild 2232 BLAKE2B 6d349ab579b1e5e7aeb7a6fd7ee0713cc8651d00b8cc7c6a08b64252183c3246a5e4ab82c15f97cf184b18e9bd72d1b25254564e3680f7853c7411675145db1e SHA512 b0121e05176ec9079dbf7eabaade560f5e6a7c37a9823d2c09c307aa306924b1023c7fdf7d630dfb02dad6c28e926f738db3a6f93012f2b069b121089bf3c8c7
 EBUILD tox-3.16.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 EBUILD tox-3.17.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+EBUILD tox-3.17.1.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.17.1.ebuild b/dev-python/tox/tox-3.17.1.ebuild
new file mode 100644
index 000000000000..499658c518d4
--- /dev/null
+++ b/dev-python/tox/tox-3.17.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index b156c894f5e8..c516ebae313e 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,8 +1,10 @@
 DIST tqdm-4.40.0.tar.gz 129225 BLAKE2B 85030c11bdba6c1d6da461e3c648bae6ae173577fb18986e3153badd73a28352f807782759aa52ed082d7ee0c13dc5f850c1da563ee5892f6bf5e8f49c48c7ee SHA512 1c326d98130c79f614cea502723e4202baa57b7b4639e208133cb464785e4a8d4eaa9d262ea484246d45e5eb8f21994e7ecf3fd6ef0f4966f9049fc8013d7442
 DIST tqdm-4.45.0.tar.gz 140990 BLAKE2B 8699b3a820859406e9bbafaaa48ba1b418e3083898d2b6c3401078996dd03431db259d5ad8a377226a50b80513ef0fc55bdaf2b67fc4a2bdd490bc5fdc04d681 SHA512 7b35f86205c6581ede9bdb0788e7f55be525c3f0f77952803046661c6a7a6cd3c15ed0323376ecedb5cddace1b32a41fee1932033dcaa49f9096dc3b9b674f10
 DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d9243308592519ecd2c38f60d6b621fd7362dd87bdd0759a39f25c19cc3cc889e9a8376dc658ed565ca7e19fc68cd SHA512 4023988cef757f43a6f59f7eddc8f40246cbca4994cea91dbb4a788385c0706f376f4c0fd5c8c47146c10eb8c52be2c9d4855b7bea0a5036162c55447aac95d7
+DIST tqdm-4.48.0.tar.gz 148578 BLAKE2B 95ce438cc14cad5a4ad7b9b2b89b38d5a5c49e27a4ed797ae1a05d7eb3d9539dfaaee72f6330cd5f3f18721ca4259c5ee3f643ae8dd509f1e2261566ee9c3f02 SHA512 9c23b103603c5f56f9cc84d04e68950a0e6431cf40db856918f6e2f21aea61fafbbf466eff6d80fc14c40bb2a11dd0be80e801c55adbab02762c36ce9bed31a9
 EBUILD tqdm-4.40.0.ebuild 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
 EBUILD tqdm-4.45.0.ebuild 1362 BLAKE2B 8c284acd5f8820259167a4100dff9807124962bb371f3ec531ba68b2c042bbb84c9d1e8bc4c34a549b4b195fa28e54e16d4fd84cd922859ed39d6909714b2f57 SHA512 11eb92a0e926f93d667464d413ed5a8f76f1ac06fe3bfd1d6620204c79b0a4848d9d277380d0d5bdcb9a3a3b7092f9f8359d09582bc7253cbb2f451358820ca9
 EBUILD tqdm-4.47.0.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
+EBUILD tqdm-4.48.0.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
 EBUILD tqdm-9999.ebuild 1332 BLAKE2B c372057e509aec0113bf1fb8c8fefc3280f569e543c4f4d524bfdd1d6e52e78d5127edd3ba41d4e773e864f81da752d36d231a9ba909581c8f03f49128d882ec SHA512 560ccebe59bc49c9fcc04d9982e245a70d8d90cd3a571201f9a91c2a3fc91e2a096aaa55947646fc62e0fd2796df187de58647a39d0a9baa780a41fb69860836
 MISC metadata.xml 803 BLAKE2B 459df7dc960e21c114e5e688d60ade18cf4e2280fe7a55794d7097e8371c6daf3cc0bfad74ddf418684e2941ca97bdfde695e1398fddedbea10c65d962a1fec2 SHA512 673f0bc8c48f3d0c24d79304e6ac32e8da06d3004fdb7bb57f0b2db93ec555f9237812a894290b0999152e7fd5e1baadb43f45e0835bb6da7b2ca98f2e3aa85e
diff --git a/dev-python/tqdm/tqdm-4.48.0.ebuild b/dev-python/tqdm/tqdm-4.48.0.ebuild
new file mode 100644
index 000000000000..563276f5d141
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.48.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -r \
+		-e "s:'nose'(,[[:space:]]*|)::" \
+		-e "s:'flake8'(,[[:space:]]*|)::" \
+		-e "s:'coverage'(,[[:space:]]*|)::" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# tests_main.py requires the package to be installed
+	distutils_install_for_testing
+	# Skip unpredictable performance tests
+	nosetests tqdm -v --ignore 'tests_perf.py' \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/ujson/Manifest b/dev-python/ujson/Manifest
index 7c8ddbd13735..f7fd6fc14424 100644
--- a/dev-python/ujson/Manifest
+++ b/dev-python/ujson/Manifest
@@ -7,6 +7,6 @@ AUX ujson-1.35-use-static-where-possible.patch 19904 BLAKE2B dcf5691a43dd068635f
 AUX ujson-3.0.0-pypy3-test.patch 2694 BLAKE2B 415ba9375614c69aa4397aa0401e6093043d2f847ee68287b2f3fc497ee0bd98fb3974cae86e8bf9b0af69d088250b90871b5597bf046cb803ceeb5a64d6f60a SHA512 d59021415229142e673059bd18d313ac3886b70f39dc9e53bf592d4b796ceedd096468adb5c5aeaadf99c2cad2d2d6188ebdbe5b32aeeb83ba9cd1890327226b
 DIST ujson-1.35.tar.gz 192027 BLAKE2B 320058e7142f2264bee8b02a411bedb3b32d1c2fc86157eb47272f75cb401e6c75ce7d9e3dba5092cd1db99dbded8804347d4c7be11eaedb47bc8b4b8125fbd3 SHA512 931d8f574fc4920c9ded48369774666060e951f40982606ce9f1d9de3420004042af7d797075a54d92a2b25c4f313572a5e1a30f3bc8ce387ef8f3881193eee7
 DIST ujson-3.0.0.tar.gz 7128523 BLAKE2B b19525edf1528e3b2a43cb08ecbf7b5d070f2455fb0bbffbe4b866bbaca91df09d7f4d46509dfb92d825095d4b922fc866fa36e051fa0e27af60fe558c69c854 SHA512 058675627c1275df1dbada02fca3750e544e25c0d0842b4a4268a664456cae1869423d832b7e4af40e56168b687ec711adf124e9ab34b7c06a244b61f7e2fdfc
-EBUILD ujson-1.35-r1.ebuild 916 BLAKE2B 6ab2c9fc8d238905603795685517d7e7d8885311653acb0fc3dbeb329ac91f0a465315f25437d42fdca24627d8a1584becef51d61aab1af49eb85f28933124a1 SHA512 1f0e47f81964b8d7691863477836750ef7c9c44e900f94502c0498088fc5d2ff2e7770342273f1a2ea4356900741fef872c99bdc2636f247ee495ca4af269883
+EBUILD ujson-1.35-r1.ebuild 918 BLAKE2B b6924b75688ae427d726f11bb6acc73ea26cd5554a4d4c505c44e17aaa149be62673aa5c47677caf42c3e03b47f730c6abf37a44e6e51e3baae3212929fb44ad SHA512 5085de8190dac63d4e951d7fca160de6b1d68708ea6f1293f193f1dc93a34a48e5b9193d7e683535e2ea4a06c5cc3cfec3ef085ca8ca03179b2b5cfa3d8fc448
 EBUILD ujson-3.0.0.ebuild 632 BLAKE2B fde34e2bd5e778a8cb4d19009198089098c6240108a8bf641774a7a2038418a1d16ef8810d2655b636601bd6e048b2a946b33b396e835d43c178d31a21220892 SHA512 63b48c85bd65c7c0e57c5f6c763a8c4f75f5c45d31870a14df7deccc7998c0ecb055a6396ed8a248cf0c53c709a57baf5152ac0ef51f4b142024312e92e8c28a
 MISC metadata.xml 432 BLAKE2B 9218fa7b4dcf0c44ae1d5b30869a2f8981dc03714245aa258de0552e5f27de7cc359acdcb8d22da82069bcf465a91ac7d4401f111cf52abedbe4451e08d67153 SHA512 485e866809b2704a344436f956dd242b8720ecf46daf53a7a64fcf8a5edd3b3915faf59d48da4224b361ba35f7ab8c346e16b0a037cf8846d663d175486bed8f
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index 4a266318bd20..e2968cdabfaa 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/vcrpy/Manifest b/dev-python/vcrpy/Manifest
index 93d8c2d276ef..0f1e36e68c4f 100644
--- a/dev-python/vcrpy/Manifest
+++ b/dev-python/vcrpy/Manifest
@@ -1,3 +1,3 @@
 DIST vcrpy-4.0.2.tar.gz 324196 BLAKE2B 8910ba40bd56c7836a92c120c480e633063c78beb1d7c4dcfffb6180135cf0e28586410307ba3e19b3fa484a72a176dbf877f781ade7bae7c81110fde2eedd32 SHA512 17eebc9574ff14f97ad200b99c50b0440a93fbf38afe8ad95f443370d84c43177ac55ab655ffea7e7985b0cd76124eff3c394898e71a0ba0c434014f07e526f9
-EBUILD vcrpy-4.0.2.ebuild 1390 BLAKE2B a69935c76adac66550da45006e3ae333a6819f94268c56f13372c839a5638a5636ef5bf411fc378ff69cdfa4f0bce3f9f33f5af4579a588200b3e670dd73982c SHA512 f8705f758f8d3e18d17d31c03739b17a1210a228e614affcff0468ba09cfd350718d2e8679b75cb377f50a65c8636784f0b495ed56abee3c628fb2b8168f66cc
+EBUILD vcrpy-4.0.2.ebuild 1389 BLAKE2B 84a6c873cb48a40c6f7b7e133863d58bef6ae00edca2faa3a9739bccdbf141f5f45aa413170508abb27fd70a039685eeab9dd0abe6b51e622fca5bc8ed1eb78d SHA512 2f56198bb62bc2844b37e99dcbdf2ec909188ec16db101ffde5f03fe799aca29f7b73262d347f38521fb3859a1bc618f1da813e344e9d2909fe93a495053481d
 MISC metadata.xml 363 BLAKE2B e447766d191bb1c155e27a7b892fd38df143e2bb0f45be8b635df6bcef92f6f292db010b22659d0e699f3f333f84d0be24d3c9a293e1a2f00f641e21a356daa3 SHA512 7cb4c7132da46b1a34425492476204519a02b71643cdb6dffbda39281ada4a55b45577707076783add52639ff5993f0c90c48713b94ca1230eb3559ad1207804
diff --git a/dev-python/vcrpy/vcrpy-4.0.2.ebuild b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
index 1b9a5deb5fe3..d2d8fd9f9217 100644
--- a/dev-python/vcrpy/vcrpy-4.0.2.ebuild
+++ b/dev-python/vcrpy/vcrpy-4.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/kevin1024/vcrpy/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/httplib2-0.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index cba1fe04261a..1cf578596893 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -7,9 +7,11 @@ DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecd
 DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
 DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
 DIST virtualenv-20.0.26.tar.gz 8264088 BLAKE2B 0d5bfbae10fa7de73ec3766863415a5a8f6680b168ef4ef25984b91a9291645189b987bfc63b96897b6f421fd692b4a388eee7a36995b0b65fe52d3019813da4 SHA512 d81fa8f25b7752fbb76494cea62f76d5f40e1397853ef71c1eb8078ffe8748fb365f275cc34ef04f64a001e3300a6f26f872542f68c047bee1eeb74cd49180a7
+DIST virtualenv-20.0.27.tar.gz 8265353 BLAKE2B 31e0a5fa11d988b5340b130615dc5095a61321393fdc4f72fd88e70d88bc7922c2f8f289b995fb623d2fe900a7da8f012433d4a7bb2ecd7ab53810865e05ea2b SHA512 812a17d1461c8e62568f345aba0722204dd22d0d149720d00e37712a34a9d2d614e1b854f07d7e89e1eb6e915ca3f90e8e81fb9c2442ed637efdc6b2120153d7
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
 EBUILD virtualenv-16.7.10.ebuild 1757 BLAKE2B 43f7239ba29c8bf8b7ce797f323e959a9ef10801b25c658664615991575c450f7a08d8bca83e1c9b9b4f116ab340a197f6b87a3ce93073dfa7cbe35711744d0b SHA512 de679a36bdd8ebe0b19f2ead964d42170b233a48589c18849dea017ac78d97b777a0476986db317508ce2d32500e727dd0deefced94e00eaa0788f44c1359760
 EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
 EBUILD virtualenv-20.0.23.ebuild 2582 BLAKE2B 5c6421e1682a7878d89e40754b1a9445de3f5da7503ddbaa2b728499c0c1bbead6e3f6c1239950778a4c0c181326193e7d7dfc79aef5f0142ce24a7e4bf4828e SHA512 52bcf6f1ed5bc14634d31c250948efa486bfa9c25bf69f958fe3286ed43ad1f9e5ace94288907465e2b4d8d9da8f82669cdec7f2ef57056a3997f7bcb41c389d
 EBUILD virtualenv-20.0.26.ebuild 2537 BLAKE2B e0960719ec67dec66401d46c15f71d4b55bbd577eaddfe5e69cc624995dfe1fe322545bf5fdc5353fc7bb78630d4b82e2e722006c39ad55125125958aa2a37cb SHA512 7f4236a633ec70cb58684618ec242c2635b7513aa118eb8eb6108f17842b01f72626834495974a4d34436d3b915b729f1056200737535580d19f0130dddfa921
+EBUILD virtualenv-20.0.27.ebuild 2537 BLAKE2B e0960719ec67dec66401d46c15f71d4b55bbd577eaddfe5e69cc624995dfe1fe322545bf5fdc5353fc7bb78630d4b82e2e722006c39ad55125125958aa2a37cb SHA512 7f4236a633ec70cb58684618ec242c2635b7513aa118eb8eb6108f17842b01f72626834495974a4d34436d3b915b729f1056200737535580d19f0130dddfa921
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.27.ebuild b/dev-python/virtualenv/virtualenv-20.0.27.ebuild
new file mode 100644
index 000000000000..a8a3d84852f0
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.0.27.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6..9}} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/contextlib2-0.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pathlib2-2.3.3[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' -2 python3_{6,7} pypy3)
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
+	' -2 python3_6 pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/coverage[${PYTHON_USEDEP}]
+			dev-python/flaky[${PYTHON_USEDEP}]
+			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+			>=dev-python/pytest-5[${PYTHON_USEDEP}]
+			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/towncrier
+
+src_prepare() {
+	# we don't have xonsh
+	rm tests/unit/activation/test_xonsh.py || die
+	# require internet
+	sed -e 's:test_seed_link_via_app_data:_&:' \
+		-i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
+	# TODO: investigate
+	sed -e 's:test_cross_major:_&:' \
+		-i tests/unit/create/test_creator.py || die
+
+	distutils-r1_src_prepare
+}
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	# TODO: fix/skip with more granularity tests on pypy3
+	if has "${EPYTHON}" pypy3 python2.7; then
+		einfo "Skipping broken tests on pypy3"
+		continue
+	fi
+
+	distutils_install_for_testing
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/waitress/Manifest b/dev-python/waitress/Manifest
index 360b616ba309..c2c85dbf2173 100644
--- a/dev-python/waitress/Manifest
+++ b/dev-python/waitress/Manifest
@@ -1,5 +1,5 @@
 DIST waitress-1.4.3.tar.gz 173767 BLAKE2B 4d64279c69403347c7048024b0c70f8192af5fd5ad32f873d66ddae53b011d1445fa2d8f6db0f98ab86bb92855c8882bca4903dbb3657bbe86e7cdbf6a9b67e6 SHA512 b4fd6d174fe63d83686708ffb83f61421e94cc6c6e9ebc7deeae93ea50a0c11ee523d4448e602ba03ade942912accb33d482c13a367d7dcba61ba6b4871bc3b4
 DIST waitress-1.4.4.tar.gz 173124 BLAKE2B 5521b6c983cb23bc768986e9e8d19e9fd94b1dc632661b0f136cb60176b8c9a81306b8c9604b2a5b4a1a821346cedfcea281f49ecd81686a944f60b387e1cdf9 SHA512 87d57f8cd241e3c88c30a34351d57255dc1388b5ce1bb216e1b94760db09c1f184d20ea5797b20a91bc2cf0815b5067569099f4639291b4a79e885c0ab8a9fd9
 EBUILD waitress-1.4.3.ebuild 579 BLAKE2B d3b5bc9b454dae714b1dc0e602016a051c3b7f82ade431153fef929edabeb6abdcbac0ca87ca59452ad27d9d4c79099c3286d1d35db0a87e764b8c53f4cc4f14 SHA512 136f1fcd0acca762d447f5b33113f6adc33ac5ee64ab2fcaf13a8aabe0ada16ff5120414732f0fcfbbe31bcee6b95c6c69f58ac1dfad3a2cdc4c9f4aa0d9bbe2
-EBUILD waitress-1.4.4.ebuild 669 BLAKE2B 79c3e0352064721c664736bfe41ab589cadd55e18ba649256195e7595bc35773233ec6be5a71f943efe24994ab97c6760cac5b310e800a09c78f72fe395f5f3d SHA512 bc7d26d364bf5af113d16c12fc309c582a63e4f94d6d6d7d96eaccfe1b788b2e92cd5e1955b4e095130dee0a305d819e508bda8e61146cadad5588cd3f96e4d9
+EBUILD waitress-1.4.4.ebuild 666 BLAKE2B f841e9c2d8a0fc3dd464f4a8bb326df5b8bfb21abbdce6a3881da939854c4912d9c2074769a9cd390862a04aaf877e4803881b7aa1862005438e69bb2f9d415c SHA512 0ed46ec7dfd72b564a06a0cc44ce152fd742432dbddcadf47e23c1935a79059d9b4456672794b57a7505a46b05ed7b0d595e1a83e20cccf26d8c33b6845967dc
 MISC metadata.xml 403 BLAKE2B 7fd0afda3d808404b7b7836afbf014eda9746e3ea718bcbc4220b1a9f4d399328eee971e71e1cd3b64a0fab3621f4ce3be8632875bd5489caa7222482a774a68 SHA512 6d59404fbc08bf9bd67845c3febb4075de455b4241c221444831c09231636afb857823b747fc24cacc03656f7c310cedd426d848c55d6513f52eb558d919e423
diff --git a/dev-python/waitress/waitress-1.4.4.ebuild b/dev-python/waitress/waitress-1.4.4.ebuild
index 296b2bee0904..71b73588288f 100644
--- a/dev-python/waitress/waitress-1.4.4.ebuild
+++ b/dev-python/waitress/waitress-1.4.4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 6863a5930655..03526aa3fe98 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,5 +1,5 @@
 DIST WebOb-1.8.5.tar.gz 271955 BLAKE2B e1d22e91e8e04c88d6adcb4dcad93e1e0c37b5b3894eee7c2b5a92d2eea41719d3b42e05916bb355a3ac9a2f7357fe791ce6f776261bfc764eadf59d4be37bad SHA512 cc0b956a7c3b8ae58d6002baf5c6de4e442201280468f8fc8b5fbd2c7f7cb7a8f46447f97b98a32a9959c8d1aa7a2a8a7b9d624cb27ca79b2ad1ce94f891801b
 DIST WebOb-1.8.6.tar.gz 274606 BLAKE2B 0419e60faaefd4bb822387bf5624f77765c6ad528da791d54204b528b7c827d0cc506cbe260ccbfc7d23ffef73132254dcf133ffb1e0377d75ee5ae83d4deb84 SHA512 b9a3faac114c55f3e9a6eb71a78dd921d928da99a427dea05bc798bc1fe249f0f1cf8c9b9fcb1b73be2737b9132bbfe2250a8652e3a8a1199ac74fa62a59d44c
 EBUILD webob-1.8.5-r3.ebuild 779 BLAKE2B 0e68feb8b835e93a8460a6dc34d5cb213dfec4d79d533f213f08277a5588b8a63646c9a7f35e924f17f43bbee9f997b121336645cf7279b5466596c4e3255991 SHA512 c0dcc0f8fa35144c7a76be4d48e3fa8601d237bbb14ccd9fe156aac0305343cc7e3edc062a4a898c4bbad4961dc0e15ea9fac70526d55509794b58b934e4bd87
-EBUILD webob-1.8.6.ebuild 727 BLAKE2B 3b7e6d548901de95975a946e870e463636032575cf4003b6f509aaca0459ab8b0b8fa89cb262930ac84e0bc35c887478cbe4180b86266ab3d2a626d5ca865ba8 SHA512 da51675a6c26508a82353f864bb9739af0f269dac30be454da8993932c6a291534a1c100410c981c08da788cd7add10cb6b69cec54be0edcbc78a6ee75796802
+EBUILD webob-1.8.6.ebuild 724 BLAKE2B 53c0dee1e3f3eea45eb6aee0f4101b0b1bb5f8113bd2499d2e625c5fc3f60563030c4880b1814ba2a51909e3f261134419a9d4dd2e217bd1e84178d6a55544f3 SHA512 38ed5d72c158b320239232dfa80315e713761f7ac196f38bcce5281722477bd67f1c034066e1310661032a946083786b7d28ca3ca2c28e13aff1afca9d92a459
 MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.6.ebuild b/dev-python/webob/webob-1.8.6.ebuild
index c985d4d4c7b3..4a074d7135ad 100644
--- a/dev-python/webob/webob-1.8.6.ebuild
+++ b/dev-python/webob/webob-1.8.6.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 8d6ff5d42cd3..2e734085c0fd 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,7 +1,3 @@
-DIST werkzeug-0.16.0.gh.tar.gz 939220 BLAKE2B 08f77bfbb8703b25be00dba018e9aea16cb4a6977ff3906f636fe24b4e16662f7777584839c8e153532f32a0551281a6fb28bf618da5d5e6c42cdc6e8b391162 SHA512 78e7d2ccceb8764f92a3252b2ff670065a42fe2ad1d2b4631e05c107d2128f8f6f4090e32bd975526e4b5985dbbdbac22e9ad1514d14e88ecfb064483107d0ed
-DIST werkzeug-0.16.1.gh.tar.gz 937876 BLAKE2B e5f962e9cab4a06a6f2d63ac35df896ed764377b458ccdc744800ffa5d2d456a836f0a7c4aef08b750b95904e955ce3b0241102d48bd28080e91fe29823e789e SHA512 52611b2e22b8af6b643471ca1df6e6f262067ef8882363768f21d9b0ee837aedd192c358a3a41788b2036d6c6cc0156043f1f5b8f6a04b2a701790b66837a62e
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
-EBUILD werkzeug-0.16.0.ebuild 1173 BLAKE2B e3bccc385cf6fbf35d2ec9dd5a162816756af220f6b272ce8184877deea82bbfdef159c7dc4da20f9201d193ba3b66e338dd68e978c66876d836a32b21605147 SHA512 14365bd1768d04ed2968043e74945a36ea3ca879b83125f9d21dec62420dc6479f09f8a70196491df4d6d81bd45e01ff664be7bb353fc50f541840df643fe612
-EBUILD werkzeug-0.16.1.ebuild 1001 BLAKE2B 90c598018f5e117d58af89ebb846e4fe4bd30299a3898a0f27fd085a891ab9f782fee565169bf03a40f8d385e7fc4bcf41ed220deef3de50c5f290c5679d3d29 SHA512 409bfbf53b3d73e6364a9277f2eab5761da10b9af3a82e0f74620cc520f8e32d7e7fd64d30b0b816e6bf5792e5c84cf52e6e522a5f20f2e3ef70972f3c2d4250
-EBUILD werkzeug-1.0.1.ebuild 1354 BLAKE2B 27f504544bdc1e45800ceb66c9639d7bf9388cabdfc4c54c6b3cdad3b5905f48fbe09be7d14a03e6e3ace18194142510eccab6a92475baf4347a43eb402d8637 SHA512 583f72a79b6dbd52a93ca14b738bac04fd34002fc2321efdd0f15f07193a497d7d4e78003e7f2498f193d6f7733cb1c750ac33e298dc03c9b87282242d9c9ae6
+EBUILD werkzeug-1.0.1.ebuild 1353 BLAKE2B 2dbd5b08025d6ebd1ca965470b20c8cfa4530c0c3f659904b2303462657c43e904ffc28f2995d600f34d664548349ee06ac14308ee15d0140f9bfe9c8f4c2ce8 SHA512 13c4837d28effc70e6cd149cb4845a42807ea91c986deb8c700a3cf9dd03602e4baec1352683c6001d5855dac7a70eb93e6408d68efe741ba3e4db405270eefb
 MISC metadata.xml 321 BLAKE2B f2d43f339f0bc82cbc2b0081d1c571cba47744e59bceb960e0a9708d3401445e5d416fc3fd956f6bafc6d8e1d9309eaf5bdfc28e938f5450a9acc1b80cc88b9c SHA512 8c4768582ab693e8a95ad3cfb28b7ed6d7b926700393739c05b50a0297a31a37bad4b2b3ee388a963820258410dc8e2af2a40436821009c746916d0969b1d97a
diff --git a/dev-python/werkzeug/werkzeug-0.16.0.ebuild b/dev-python/werkzeug/werkzeug-0.16.0.ebuild
deleted file mode 100644
index 4a26883cb765..000000000000
--- a/dev-python/werkzeug/werkzeug-0.16.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# dev_server seems to be broken with PyPy
-	# https://github.com/pallets/werkzeug/issues/1668
-	# TODO: exclude only failing tests
-	[[ ${EPYTHON} == pypy ]] && continue
-
-	pytest -vv -p no:httpbin || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-0.16.1.ebuild b/dev-python/werkzeug/werkzeug-0.16.1.ebuild
deleted file mode 100644
index 7bc514bedc16..000000000000
--- a/dev-python/werkzeug/werkzeug-0.16.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Werkzeug"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Collection of various utilities for WSGI applications"
-HOMEPAGE="http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug"
-#SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
-DEPEND="
-	test? (
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	pytest -vv -p no:httpbin || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/werkzeug/werkzeug-1.0.1.ebuild b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
index d62768654941..8491e6fa715d 100644
--- a/dev-python/werkzeug/werkzeug-1.0.1.ebuild
+++ b/dev-python/werkzeug/werkzeug-1.0.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/pallets/werkzeug/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 DEPEND="
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index 8099ba08f703..566f13ba283a 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -3,5 +3,5 @@ AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58
 DIST wstools-0.4.5.tar.gz 201047 BLAKE2B 34c8d2c52ce9d1d67749ef6d0e1d5684a60718ef613688466d0992306f446b153d681b802fb142d1594bccaf37390495fb59e765f662e7550432d8866e038110 SHA512 24779bc2c2f3e32a515bc5690038e3f8e487fd45c1b7822d587e1bfd0bda660b837e3d5cbf8248459e06d7606e6d1c404dcee4de35b1f0d353bd5213e197d83a
 DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
 EBUILD wstools-0.4.5-r1.ebuild 821 BLAKE2B 21629f745d6bbffffa6495e5cef50c56e3bde0f5568fef88c5b47f7d5a3f7d3fef1c774926038f3e9415d5a31541392ad7bd42128926a11dd1e67d29096efe48 SHA512 12c38791953f9a72e971ffbce13ad500e46524cf27c674545c93f2ab51d782f29a9caf21753c18fba1a9f77cd5f766ab9607797430956671270d7bc403c60dc0
-EBUILD wstools-0.4.8.ebuild 775 BLAKE2B bed27811461e03a662211491bfdc8e4050b29d765d7583b95ad050ae35d53fa12d0ab8adeff0d12785dbbbbb851d4605c36a1bbb38cc2cb0e2f663396b3b0f58 SHA512 f2c793e5ac2b2583d309a1ee18f60506bdcc6ab1bfe7cf431ec70ff668b2e29b55ba627b9ec479678ece967c5ae7b867d19cdbad93e027b395609579fff2a986
+EBUILD wstools-0.4.8.ebuild 773 BLAKE2B b472741f6b5e67321f8a6b3eee88b018450558f19e42bbab36a7fcf4681d38432e14762221e91d7404b1a928aa34a30dca2a5ef1caae35be7d7dae1d0eb1c440 SHA512 7a1998d4881a79810c6250fd093c43ee4bfe3b796ac95239873cecc43b6c99dc6e9c5d7180e7ffb16ee0b5f6d87c33b46515dc90cfd6a3be09d0a31c8a64601d
 MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index 95caaf8caad5..f1784423d1ea 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index c7824ee8c2a5..70b7e400bc08 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,5 @@
 DIST wurlitzer-2.0.0.tar.gz 10203 BLAKE2B 526f1fa1cf2f257c126a4f2c67b27b373b23e113552e72372029ab69a6b629d9453c39feac083c1376e3996a44af8ad823d1ca119515b420d9fefbbf326da38e SHA512 5cafdf84e47e6d18074f6ed3af6bab2eaa1f5cfd3d658ea02a49d387127e9a9101de05c864480af42f5a7650cc47e0a218e822912a4ba3ef826e71206dd2f3e9
+DIST wurlitzer-2.0.1.tar.gz 10638 BLAKE2B e5350a3920ae072f93a0043ec368766d8e190558b3e897e68b272b06d0d6ff7907f2aeecfd41a99b54804a596ad9f7d7062995a5c465724a2b87419ee801daa3 SHA512 06f67b666c2a364b5ee497fa2f0ab8640aeb2953b678e35b13e1558ab29bc5554f479731f9942d8f033275f5151bb9f86408e0f04b1120bae0f29b27649d783c
 EBUILD wurlitzer-2.0.0.ebuild 563 BLAKE2B 75fa4e8a559e826c23d1578d54144e7502c8645e455dcbe9a2c8aaed99b1b6c0a883802ee79272f73102f78dbb8963900f5a4b65929e7dbb337cd96cee8b0774 SHA512 fe2b9a2be875d49e8f9b08474140853646c05f4a24163530fea1b79f09d9859dd73f1e17733bc454ada2057ad0f404693d6240d71308fc97aa47342c32e5d2a1
+EBUILD wurlitzer-2.0.1.ebuild 566 BLAKE2B df1775c1c9a9030736814eda42fb5bf92974abcc9995b4f48fa99cd05dc38b87ad512bea34a885b90222b40cecab4883dc6068df3e69b8ee72d4cda3f94a4d46 SHA512 f18d7e74e7d61537a5eb07c799cead8918871f6169fc3aa5f3392cba786d8338b3658f70e30f1bf7a1952b410ae6675b4e06033b3c4765ca26ee8e8a84af14ef
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
new file mode 100644
index 000000000000..f920b819d1d0
--- /dev/null
+++ b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Capture C-level stdout/stderr in Python"
+HOMEPAGE="https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 659a83356884..f36eef189b58 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -2,6 +2,6 @@ DIST xmlschema-1.1.3.tar.gz 298490 BLAKE2B 70c24424fd6a5e87e07591451db920d22c1bf
 DIST xmlschema-1.2.0.tar.gz 314580 BLAKE2B d42b221d2730d2b5cdab655269f7b885c72bce1794f12111b4110a80a1288e1996633ef5f00e9fc3ef7cd66a4267baffbdb6a906d0a0c3caf418d31abda93016 SHA512 1a6644b02e96beeea68bd737a4a66fd02693b4cb3c36a07e569a2b2c3e2b0db4fe01a475fcc3c4e5372c6000b27ef824ba5859215a03212fe4c0f2ec61f7103b
 DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
 EBUILD xmlschema-1.1.3.ebuild 715 BLAKE2B ff2c4beb54ae9c1fa034c19a977448806b9aebb956cc6af63a5687977f8b65ffe4f340a609b4952f4f6c086fbca4d34ba5d0dbbbb1ea8a706ea73b4e88857d72 SHA512 6dfe31b4561c5a575824c60bf8eadb1f8c42fd704688989759cab2ecb4706f9742174329f8356b9e63a19b3c5ccd3f36818bea0e4728b12f64c9dc249c9d6a4a
-EBUILD xmlschema-1.2.0.ebuild 751 BLAKE2B 1ef92eb7bda94f3e8f56245307ec0bcad6686c18501bf522e357ceffaab09a51942c78c6603009425ee1da582115351713aea71fb8a14960d714eac63d20d14f SHA512 1ee959619a2d81982110ef7bd34a2ec56ae5148169ca8440c205c62683cb2f52d6c1d0d30c474883a9574f7091e1247c19178a333f437875a659287e7c97148b
+EBUILD xmlschema-1.2.0.ebuild 748 BLAKE2B bca871dc01f5e9cfec3189d09540db766a9259e5d81c5eb31e8ea2088760c81a6459808f0be9cd9a457a9e05a31b7aaaa843771882812dfedc7590ee99b02a50 SHA512 3d6792c9678b7fd981e372098b9580f7c4199db3f60428a5091c6714056ac7315329681c1491f8a0a3f7ab0214fb0b3a2878ee6d84bc5f1898d9e31403f98063
 EBUILD xmlschema-1.2.2.ebuild 944 BLAKE2B 047a699dc2086c6c6ebbd465790f9520039384213271c648359028ffb0f1f4f006ddca51a17c1dc1179f84cfec9c6b27fc8b48c655575111776f6f82b1c3dcf1 SHA512 713bda426841e62007dbd58abdbd1d4774a9001ab2f0f513a02cbc4f097a9dfe0223c8830f568738bca6c7f1632995f620354e03cdf50258481f647cf4c36c06
-MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
+MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/xmlschema/metadata.xml b/dev-python/xmlschema/metadata.xml
index 266e3f19ca59..e59516686a44 100644
--- a/dev-python/xmlschema/metadata.xml
+++ b/dev-python/xmlschema/metadata.xml
@@ -4,4 +4,5 @@
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/xmlschema/xmlschema-1.2.0.ebuild b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
index 7ac991a0aa0e..41b1690b4c7a 100644
--- a/dev-python/xmlschema/xmlschema-1.2.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index d6e2955d55d3..44259b470a6e 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,5 +1,5 @@
 AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
 DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
-EBUILD yarl-1.4.2.ebuild 724 BLAKE2B 59d9702d9f762cb2cfe3ac71153cb1136967323542dae728a7808e3382c7048bef46a3e2ae9b499014b4669ff87c8be4d3127c3af9dcb0e111b80fbfff8a3d2e SHA512 35dee2f4adac9f37c8132567b5de3a38b2eb245ca8e817783119811a8708e0705b217554904ba0d55769441a5287b9d13b9afc1ce3eef94fc63ce347bfed5f98
+EBUILD yarl-1.4.2.ebuild 723 BLAKE2B d0ec747247e1342272e63daf606b5637d413a06fbed263a73cb04cd3e89ed15c16c31416a52c966075cc0c9ed0c33280e8e6447f494b3c29bca1937752d3c70e SHA512 39c3dccccac74e8244d466b5c62ba1959b790545680cab67a67ce444453295b0665872905ca4f39ce42e0d001ff758f137b03057ecbb05650cacc8af99aa6387
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
index d538cf008989..f58f2871d2bf 100644
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ b/dev-python/yarl/yarl-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 9cf0d1d22019..904ccab735c7 100644
Binary files a/dev-ros/Manifest.gz and b/dev-ros/Manifest.gz differ
diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest
index 30904afa70da..aa2305243ad0 100644
--- a/dev-ros/actionlib/Manifest
+++ b/dev-ros/actionlib/Manifest
@@ -1,8 +1,4 @@
-DIST actionlib-1.11.13.tar.gz 98518 BLAKE2B 918c541f3a6192ee9b89e4b2759651e027d447acc305aaf9bdeabb9587a527b6bd924eb812314c8c83baec3b6829ca0b5d126550ea70acc5d2739f7cd83e065d SHA512 273499a0a5b1c9b40147ba0bba61b44a2530c0a16d757a51f6b6211c95790e18ffe2c397582a429de84a639209779c2641a3013f71f75a2fd76d422115033601
-DIST actionlib-1.11.14.tar.gz 98789 BLAKE2B fb4f7afbc2836f43ccfbb5d477a7e54ec4feb13244a797a057922b02cb97886052b2b6b2f2cb3cdf0ecb1b0c7dd09a24768ad9bc459498e0606ba534a82598c7 SHA512 147fc8642e8d46cf6dc353b4f8850c2682204a6f256a7e0a065db5adb67b72c54e2f40ff4cabbec2fab6d1a1b0c82ff0abbea571ae4202774892c3dae01ad8bd
-DIST actionlib-1.11.15.tar.gz 99063 BLAKE2B 23cce02de41b7705645cd1bae35f90d8c89171f809c689323683bf4f644b7df8c46dc4c5cffa2de6a2791c3a77957964785fe6d99a77ccea25eee43fb88e4325 SHA512 3f6deb469b284ca7809a20779f8362cb48d2bf12d8fc4a546fb1fe28fc06baa9693f9efb576f27f1cac976051bcb966a2c47df1185847bea040c0ac0a915b6d9
-EBUILD actionlib-1.11.13.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
-EBUILD actionlib-1.11.14.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
-EBUILD actionlib-1.11.15.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
-EBUILD actionlib-9999.ebuild 740 BLAKE2B df2e5f48b95d5b7dff2992dc5cc128fa6f52d9c71150d75cbc9db8f8078e899c9562533133bcb0f08e951de7840c7b5eaadf7bbca09856cb4d8c5b942c034861 SHA512 e7a774d8f3167ff7862e33f7c9ddd4ec82ab2ee6ced7939747d90cfdc58f86f9bf4c84f9c0157b9a0b13a6566c3a37257707e6ddc48d03629d0d8ee0a45b2abf
+DIST actionlib-1.13.1.tar.gz 100763 BLAKE2B d1c9bac94ed5928409e831087893cdc4921163592b5c141deb6c888eaee5bd581141ef84e95735b67f18e0dcf7c24d3486c6d6f0a36018a0e24dad91427956b3 SHA512 1b2cf48c0d3d635d4a37f177f7c05dbb21ed027dbddb4ea713f765fea0db3fee00ae242b8d51907d4841544a9ed231785959241947126dfb857daee0ff7e4cb2
+EBUILD actionlib-1.13.1.ebuild 717 BLAKE2B f79bee19f4d580a66985fed2addabdefd82738add9785f1ac15bf60ce835dccad629ad200d364b1130a655fd7d3ac5619a0d10d121e4036417c4ee5ce89111fe SHA512 70f8915113b8fbec438c982360e7230cb16555ad17f25701e0e28022e8af9ccd7ba8e1f81af856ad9f57c7ceeea6153edfaa6f23c407dbc31e598102affa70b4
+EBUILD actionlib-9999.ebuild 717 BLAKE2B f79bee19f4d580a66985fed2addabdefd82738add9785f1ac15bf60ce835dccad629ad200d364b1130a655fd7d3ac5619a0d10d121e4036417c4ee5ce89111fe SHA512 70f8915113b8fbec438c982360e7230cb16555ad17f25701e0e28022e8af9ccd7ba8e1f81af856ad9f57c7ceeea6153edfaa6f23c407dbc31e598102affa70b4
 MISC metadata.xml 327 BLAKE2B 007cbc7d1abad4e0f3aaf4509c5c3856044c3ac530924921d0f21d795123c8651001b05d7ec26d9ff22304784bdd5bca25a2fae2474f3c5b5f031b9518a59f3a SHA512 f76c38a1b5699078331b74d7ed7cf40de05e2d24b398589b6dc9fdd03a486c438f2109ddab42de0ad41fb72b8eff87e69cdd7f21e79cabd03a8bbb8a8d3ce7b8
diff --git a/dev-ros/actionlib/actionlib-1.11.15.ebuild b/dev-ros/actionlib/actionlib-1.13.1.ebuild
similarity index 93%
rename from dev-ros/actionlib/actionlib-1.11.15.ebuild
rename to dev-ros/actionlib/actionlib-1.13.1.ebuild
index 78149321f929..cc7b760ccf5d 100644
--- a/dev-ros/actionlib/actionlib-1.11.15.ebuild
+++ b/dev-ros/actionlib/actionlib-1.13.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/actionlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
diff --git a/dev-ros/actionlib/actionlib-9999.ebuild b/dev-ros/actionlib/actionlib-9999.ebuild
index 78149321f929..cc7b760ccf5d 100644
--- a/dev-ros/actionlib/actionlib-9999.ebuild
+++ b/dev-ros/actionlib/actionlib-9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/actionlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
diff --git a/dev-ros/actionlib_tools/Manifest b/dev-ros/actionlib_tools/Manifest
new file mode 100644
index 000000000000..6bbc89a2e94c
--- /dev/null
+++ b/dev-ros/actionlib_tools/Manifest
@@ -0,0 +1,4 @@
+DIST actionlib-1.13.1.tar.gz 100763 BLAKE2B d1c9bac94ed5928409e831087893cdc4921163592b5c141deb6c888eaee5bd581141ef84e95735b67f18e0dcf7c24d3486c6d6f0a36018a0e24dad91427956b3 SHA512 1b2cf48c0d3d635d4a37f177f7c05dbb21ed027dbddb4ea713f765fea0db3fee00ae242b8d51907d4841544a9ed231785959241947126dfb857daee0ff7e4cb2
+EBUILD actionlib_tools-1.13.1.ebuild 649 BLAKE2B 0a93191adae80200da02ffd08e53098af9b12e8f5c108bfd8782d987bace218a5341abe739c15d3f8d4053030ee8ec67a69e4d45c3825c066ca94850db3b8d8c SHA512 b82fd9cef83e0cb1613ad682294e6520006374dc7cbaddf6b1097403ee25af73371697cd524f1167de6525e705ebaaf3a41acc8995fde459fc36c62d3d4706c0
+EBUILD actionlib_tools-9999.ebuild 649 BLAKE2B 0a93191adae80200da02ffd08e53098af9b12e8f5c108bfd8782d987bace218a5341abe739c15d3f8d4053030ee8ec67a69e4d45c3825c066ca94850db3b8d8c SHA512 b82fd9cef83e0cb1613ad682294e6520006374dc7cbaddf6b1097403ee25af73371697cd524f1167de6525e705ebaaf3a41acc8995fde459fc36c62d3d4706c0
+MISC metadata.xml 327 BLAKE2B 007cbc7d1abad4e0f3aaf4509c5c3856044c3ac530924921d0f21d795123c8651001b05d7ec26d9ff22304784bdd5bca25a2fae2474f3c5b5f031b9518a59f3a SHA512 f76c38a1b5699078331b74d7ed7cf40de05e2d24b398589b6dc9fdd03a486c438f2109ddab42de0ad41fb72b8eff87e69cdd7f21e79cabd03a8bbb8a8d3ce7b8
diff --git a/dev-ros/actionlib/actionlib-1.11.13.ebuild b/dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild
similarity index 61%
rename from dev-ros/actionlib/actionlib-1.11.13.ebuild
rename to dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild
index 78149321f929..1ac660059dfe 100644
--- a/dev-ros/actionlib/actionlib-1.11.13.ebuild
+++ b/dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/actionlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
+DESCRIPTION="Tools for dealing with actionlib"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-libs/boost:=[threads]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/actionlib/actionlib-1.11.14.ebuild b/dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
similarity index 61%
rename from dev-ros/actionlib/actionlib-1.11.14.ebuild
rename to dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
index 78149321f929..1ac660059dfe 100644
--- a/dev-ros/actionlib/actionlib-1.11.14.ebuild
+++ b/dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/actionlib"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs"
+ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks"
+DESCRIPTION="Tools for dealing with actionlib"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-libs/boost:=[threads]
-	dev-ros/roscpp
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	"
-DEPEND="${RDEPEND}
-	dev-ros/rosunit[${PYTHON_USEDEP}]
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+RDEPEND=""
+DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
-	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rostopic[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
diff --git a/dev-ros/actionlib_tools/metadata.xml b/dev-ros/actionlib_tools/metadata.xml
new file mode 100644
index 000000000000..d032087311c0
--- /dev/null
+++ b/dev-ros/actionlib_tools/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros/actionlib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/angles/Manifest b/dev-ros/angles/Manifest
index db1938a6ea12..e011767005a8 100644
--- a/dev-ros/angles/Manifest
+++ b/dev-ros/angles/Manifest
@@ -1,4 +1,4 @@
-DIST angles-1.9.11.tar.gz 8317 BLAKE2B 12fcae35abb3f1b013e2830d330f0f0f1d6bf7d0b245e37f853bf9cfc4584e291ac8253f15c921ea4f7b3176fd98d6c0b7c0bf98ad2e6f85b55e086e0be17be0 SHA512 e9b3a13ffeae1909e6306df9d2996d684decb6da82c836742f77c7c609b5de6eb75227ab83c4670359a58f32aa71ad7910ffd3e65af7354d5ab14d0ffaf36c58
-EBUILD angles-1.9.11.ebuild 410 BLAKE2B 25b3901a719c46a843bc93cdf219ad1b857035ebad4836ab0b1704f303b9476416815cb29bf3be0a21c52aa19ed8799528f58e60331923c9e1a9ee20a779ae7a SHA512 bb7454e9ae16ccc701c11caffaf72414cf018c2f27480bf1238082480725926a789585aac5449b884b139547ef6c79dc4ab66f1c9a068319af0f45e885bbd7a8
-EBUILD angles-9999.ebuild 410 BLAKE2B 25b3901a719c46a843bc93cdf219ad1b857035ebad4836ab0b1704f303b9476416815cb29bf3be0a21c52aa19ed8799528f58e60331923c9e1a9ee20a779ae7a SHA512 bb7454e9ae16ccc701c11caffaf72414cf018c2f27480bf1238082480725926a789585aac5449b884b139547ef6c79dc4ab66f1c9a068319af0f45e885bbd7a8
+DIST angles-1.9.13.tar.gz 10511 BLAKE2B b38a330e8dda296cf68db152a52e046a2925a1b45e6c9e1a508c3b2f030f93bbef15b5b6d54f95a0dc93a28e109f583466b007117847e5a42e93322c8705e042 SHA512 fe2f2bd3f415b41db2f8c1d40d5277589dd1225bfb784c03bae4560104d5696a83912a2a3bd8d612ced9884e4016e5ed9490b4c66a4da089dbe4477bb2b188a4
+EBUILD angles-1.9.13.ebuild 370 BLAKE2B 77d77f1cea34e498d6e44406726d2d871f158735810aaef199ff8e88234cff4163ce6e9f98ce00df14cbd1a0d771833e02ac2dac99586280ee7a733046d88858 SHA512 a72a921132671f468629ffb9648f6f59f66cc169d2044dd74c135a808e4af510daaff934a186a9ff4209f11ad502bb143f27a30d89306798306556173084aa84
+EBUILD angles-9999.ebuild 370 BLAKE2B 77d77f1cea34e498d6e44406726d2d871f158735810aaef199ff8e88234cff4163ce6e9f98ce00df14cbd1a0d771833e02ac2dac99586280ee7a733046d88858 SHA512 a72a921132671f468629ffb9648f6f59f66cc169d2044dd74c135a808e4af510daaff934a186a9ff4209f11ad502bb143f27a30d89306798306556173084aa84
 MISC metadata.xml 324 BLAKE2B 9c2342e7eff009e1e0172fd743d80eada80e85d8d072ab90fccccc17630771fcf9b6ebf085c133b65157addcf26710cab59ea8e550f3fb40c37657e5ea966557 SHA512 e12a7fde24a91c6c84b0f44cf917534c3a323ff626daf176a0965095e9259d27d3def6dfa1e7715829e34fd04e4fcd29cb258e46ea8476566c264e2283bd7353
diff --git a/dev-ros/angles/angles-1.9.11.ebuild b/dev-ros/angles/angles-1.9.13.ebuild
similarity index 88%
rename from dev-ros/angles/angles-1.9.11.ebuild
rename to dev-ros/angles/angles-1.9.13.ebuild
index a2832af02cbb..5c99989816b3 100644
--- a/dev-ros/angles/angles-1.9.11.ebuild
+++ b/dev-ros/angles/angles-1.9.13.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/angles"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/angles/angles-9999.ebuild b/dev-ros/angles/angles-9999.ebuild
index a2832af02cbb..5c99989816b3 100644
--- a/dev-ros/angles/angles-9999.ebuild
+++ b/dev-ros/angles/angles-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/angles"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/audio_capture/Manifest b/dev-ros/audio_capture/Manifest
index 43f3a0e5ec79..114c5b4cb248 100644
--- a/dev-ros/audio_capture/Manifest
+++ b/dev-ros/audio_capture/Manifest
@@ -1,8 +1,4 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD audio_capture-0.3.1.ebuild 631 BLAKE2B dae17522efbd9720eafcdd88995639cb6f16dbde9153952982b8d5c84fcedade72c0298798c5e62aac07866b8b33cba0e92d4aa89608c152a4867984bcf663c9 SHA512 c6e306409c32142860c2159e41bc79d9102ae3d47e66e27fefb1b1f77c9c14a700206b6c5dbc45ab18e0aeecfc1260ccd4478e3487fbe5a9c2ab4095008f5a99
-EBUILD audio_capture-0.3.2.ebuild 631 BLAKE2B 2fe8f579ba0bfa753812e437a3b03ad3a83db53514b78325876375021bf13912269fb5993b255a8720eda4ea33c2aca9d708a25ba9672f84eff5e4545176e83d SHA512 adfff3b15e61af59ec0b76b096bc40cdb2d948f7ba5d0e3fd0169295ce114cae74ce22a45a41d2a6fca3a0e41507d3a9175bbe91fd1d5f0a536290316decbbac
-EBUILD audio_capture-0.3.3.ebuild 631 BLAKE2B 2fe8f579ba0bfa753812e437a3b03ad3a83db53514b78325876375021bf13912269fb5993b255a8720eda4ea33c2aca9d708a25ba9672f84eff5e4545176e83d SHA512 adfff3b15e61af59ec0b76b096bc40cdb2d948f7ba5d0e3fd0169295ce114cae74ce22a45a41d2a6fca3a0e41507d3a9175bbe91fd1d5f0a536290316decbbac
-EBUILD audio_capture-9999.ebuild 631 BLAKE2B dae17522efbd9720eafcdd88995639cb6f16dbde9153952982b8d5c84fcedade72c0298798c5e62aac07866b8b33cba0e92d4aa89608c152a4867984bcf663c9 SHA512 c6e306409c32142860c2159e41bc79d9102ae3d47e66e27fefb1b1f77c9c14a700206b6c5dbc45ab18e0aeecfc1260ccd4478e3487fbe5a9c2ab4095008f5a99
+DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
+EBUILD audio_capture-0.3.6.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
+EBUILD audio_capture-9999.ebuild 640 BLAKE2B 2be2d58a1ae636ff7f9b3b3289188cb495e2be5a7e23c8a58df4c223dcdfc8433c09db9ca88f186808f72a91e366bee6d5d464416775ac05dbde773311d23884 SHA512 d82edbb3a5a93bcd2f479c6cf64972edb0daf0ffaac40ee767a029d4e99443a44d19d73495cb71caab66b5b82707fb443855c9eb3ae3f47b8e0a40c2f076243e
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_capture/audio_capture-0.3.2.ebuild b/dev-ros/audio_capture/audio_capture-0.3.2.ebuild
deleted file mode 100644
index d38f48f10b16..000000000000
--- a/dev-ros/audio_capture/audio_capture-0.3.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transports audio from a source to a destination"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_capture/audio_capture-0.3.3.ebuild b/dev-ros/audio_capture/audio_capture-0.3.3.ebuild
deleted file mode 100644
index d38f48f10b16..000000000000
--- a/dev-ros/audio_capture/audio_capture-0.3.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Transports audio from a source to a destination"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-plugins/gst-plugins-lame:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_capture/audio_capture-0.3.1.ebuild b/dev-ros/audio_capture/audio_capture-0.3.6.ebuild
similarity index 91%
rename from dev-ros/audio_capture/audio_capture-0.3.1.ebuild
rename to dev-ros/audio_capture/audio_capture-0.3.6.ebuild
index 76c8baa40806..ef0806b5c857 100644
--- a/dev-ros/audio_capture/audio_capture-0.3.1.ebuild
+++ b/dev-ros/audio_capture/audio_capture-0.3.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,15 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
 	media-libs/gstreamer:1.0
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 RDEPEND="${RDEPEND}
 	media-plugins/gst-plugins-lame:1.0
 	media-libs/gst-plugins-good:1.0
 	media-libs/gst-plugins-base:1.0
 "
+BDEPEND="
+	virtual/pkgconfig"
diff --git a/dev-ros/audio_capture/audio_capture-9999.ebuild b/dev-ros/audio_capture/audio_capture-9999.ebuild
index 76c8baa40806..ef0806b5c857 100644
--- a/dev-ros/audio_capture/audio_capture-9999.ebuild
+++ b/dev-ros/audio_capture/audio_capture-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,15 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
 	media-libs/gstreamer:1.0
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 RDEPEND="${RDEPEND}
 	media-plugins/gst-plugins-lame:1.0
 	media-libs/gst-plugins-good:1.0
 	media-libs/gst-plugins-base:1.0
 "
+BDEPEND="
+	virtual/pkgconfig"
diff --git a/dev-ros/audio_common_msgs/Manifest b/dev-ros/audio_common_msgs/Manifest
index 3f11990d0272..d3abb6137563 100644
--- a/dev-ros/audio_common_msgs/Manifest
+++ b/dev-ros/audio_common_msgs/Manifest
@@ -1,8 +1,4 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD audio_common_msgs-0.3.1.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
-EBUILD audio_common_msgs-0.3.2.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
-EBUILD audio_common_msgs-0.3.3.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
-EBUILD audio_common_msgs-9999.ebuild 413 BLAKE2B 66051e11fe77f212f4ecfac346c4e1d2ce689094b174752e424fc5dff88268c6880ad8884685f34a3115b613a66021e34fd6edc383a6bd8280e48d9b90b17f30 SHA512 b4c3b7e17544f3d4704c7c60726c65840661e53caf0199912eb79849d28ed48c5112893e79ab130e5a2a097580d50ce87e205af5753a695f9af9e7963a649c62
+DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
+EBUILD audio_common_msgs-0.3.6.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
+EBUILD audio_common_msgs-9999.ebuild 373 BLAKE2B 472795fa19e798d97efb732589ac4d77114cb1e113eb217fadce309c89005aba1f4a3de5f632e50f169e43275b465c454cfc7f92489318bb1c16c711ad891699 SHA512 c96dc95bd3611bf372c7c90184c75382bb82e0567530a77704b2f6461c0e79fb4eb057e18abac65a3cd746a717974f3fbc1ad6a2f0e3240d4b7d608037e30940
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.1.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
similarity index 88%
rename from dev-ros/audio_common_msgs/audio_common_msgs-0.3.1.ebuild
rename to dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
index 55090b9ba792..468a27192cda 100644
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.1.ebuild
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild b/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
index 55090b9ba792..468a27192cda 100644
--- a/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
+++ b/dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/audio_play/Manifest b/dev-ros/audio_play/Manifest
index 71cf4f1e844d..6c2b3a6b7494 100644
--- a/dev-ros/audio_play/Manifest
+++ b/dev-ros/audio_play/Manifest
@@ -1,8 +1,4 @@
-DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
-DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
-DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
-EBUILD audio_play-0.3.1.ebuild 593 BLAKE2B 7724b7d05d38e78e412ea54e6c964975c48516060319007608686fad022b693d6cd4cb154b688ac77a7164d785871d493059e21e7cc5f82b73bbf46185360bba SHA512 a48ecc62f22dfb8c187e4f62666038f13bfa4804db30e1e72a3bf04912ab2af77bd3edb0ad3a441c9985f48b18c4c33e9b7b385b6b89d9e9166df157287c36e6
-EBUILD audio_play-0.3.2.ebuild 593 BLAKE2B 2a130ff1c86ca05a643b5ae082bdbb2e0c091fc66295b08431dd67e3a78c3976278b52549c126b4a2f2693f02997df42a2a7476d6c30942c8ac8274c4d766830 SHA512 cb93e0860f3bd966d7d78daebee5e9a1c27bd4c7611cb54f6b6bf5905e4f977be414dd611e5e3731be59af3ed89a286da6ea98a2a81904b94a709f3fe52c8193
-EBUILD audio_play-0.3.3.ebuild 593 BLAKE2B 2a130ff1c86ca05a643b5ae082bdbb2e0c091fc66295b08431dd67e3a78c3976278b52549c126b4a2f2693f02997df42a2a7476d6c30942c8ac8274c4d766830 SHA512 cb93e0860f3bd966d7d78daebee5e9a1c27bd4c7611cb54f6b6bf5905e4f977be414dd611e5e3731be59af3ed89a286da6ea98a2a81904b94a709f3fe52c8193
-EBUILD audio_play-9999.ebuild 593 BLAKE2B 7724b7d05d38e78e412ea54e6c964975c48516060319007608686fad022b693d6cd4cb154b688ac77a7164d785871d493059e21e7cc5f82b73bbf46185360bba SHA512 a48ecc62f22dfb8c187e4f62666038f13bfa4804db30e1e72a3bf04912ab2af77bd3edb0ad3a441c9985f48b18c4c33e9b7b385b6b89d9e9166df157287c36e6
+DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
+EBUILD audio_play-0.3.6.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
+EBUILD audio_play-9999.ebuild 603 BLAKE2B 5bcca4f0ae76e89682834850c413e4bac7d6084d5cdc8783563ee7b86e4098c3562899b99edd55704875d55a26bbd88e5696f65c231f0695f4d98a4f3053042a SHA512 62bcc91c797418be40838909f2d4f5b6e1c8888ee9700ec773349af787df37092d3eb34d37805850e8b6624a8b8286bd7576cb3a329c64ee5ef1ec5e034d67eb
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_play/audio_play-0.3.1.ebuild b/dev-ros/audio_play/audio_play-0.3.1.ebuild
deleted file mode 100644
index bdcbd57e2876..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.3.ebuild b/dev-ros/audio_play/audio_play-0.3.3.ebuild
deleted file mode 100644
index 8f6095935773..000000000000
--- a/dev-ros/audio_play/audio_play-0.3.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Outputs audio to a speaker from a source node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-libs/boost:=[threads]
-	media-libs/gstreamer:1.0
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${RDEPEND}
-	media-libs/gst-plugins-good:1.0
-	media-libs/gst-plugins-base:1.0
-"
diff --git a/dev-ros/audio_play/audio_play-0.3.2.ebuild b/dev-ros/audio_play/audio_play-0.3.6.ebuild
similarity index 87%
rename from dev-ros/audio_play/audio_play-0.3.2.ebuild
rename to dev-ros/audio_play/audio_play-0.3.6.ebuild
index 8f6095935773..b54dfb9a1e95 100644
--- a/dev-ros/audio_play/audio_play-0.3.2.ebuild
+++ b/dev-ros/audio_play/audio_play-0.3.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,14 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
 	media-libs/gstreamer:1.0
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 RDEPEND="${RDEPEND}
 	media-libs/gst-plugins-good:1.0
 	media-libs/gst-plugins-base:1.0
 "
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/audio_play/audio_play-9999.ebuild b/dev-ros/audio_play/audio_play-9999.ebuild
index bdcbd57e2876..b54dfb9a1e95 100644
--- a/dev-ros/audio_play/audio_play-9999.ebuild
+++ b/dev-ros/audio_play/audio_play-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -14,14 +14,17 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-libs/boost:=[threads]
 	media-libs/gstreamer:1.0
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	dev-ros/audio_common_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 RDEPEND="${RDEPEND}
 	media-libs/gst-plugins-good:1.0
 	media-libs/gst-plugins-base:1.0
 "
+BDEPEND="
+	virtual/pkgconfig
+"
diff --git a/dev-ros/camera_calibration_parsers/Manifest b/dev-ros/camera_calibration_parsers/Manifest
index 4783afebc92a..4718aad2a7cd 100644
--- a/dev-ros/camera_calibration_parsers/Manifest
+++ b/dev-ros/camera_calibration_parsers/Manifest
@@ -1,5 +1,5 @@
-AUX boostpython.patch 894 BLAKE2B b9dadc07ac55c68b15c2960ae545a0d7f2984da11d835f41707d6a1b54487650a4507c720e3c372eeb2aec9f8fc20edfb726a4df616349802aa484210ee8bf2e SHA512 222e4ae077e40af8cd2b913d71d43e06b5b798375ae0d8fd9cf6c9387d7ffb1acd2c44208713cdeb8ae24dce74eff426b4b9180d6e07a2041b5d0a6031ad756a
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD camera_calibration_parsers-1.11.13-r1.ebuild 721 BLAKE2B d2264d8bcc8bc472cdefc2436b32b020f9b926e36574dd50ed6390d02a043f269cd4b8e47874a225d30c2c2f25b17dfa7fc82bd051f719e3ba77761e8ba34495 SHA512 5567df0e7e2ac53ff82ea9c02835b7f961d103d8c73e2cda8c9656d40f0e2f5b6fe1eab28a1b2163a96d8463b30b89b6a45e9e363860d7b7f417e3cd72a383db
-EBUILD camera_calibration_parsers-9999.ebuild 721 BLAKE2B d2264d8bcc8bc472cdefc2436b32b020f9b926e36574dd50ed6390d02a043f269cd4b8e47874a225d30c2c2f25b17dfa7fc82bd051f719e3ba77761e8ba34495 SHA512 5567df0e7e2ac53ff82ea9c02835b7f961d103d8c73e2cda8c9656d40f0e2f5b6fe1eab28a1b2163a96d8463b30b89b6a45e9e363860d7b7f417e3cd72a383db
+AUX boostpython.patch 766 BLAKE2B 80cdc502a4a8c0a7d31b7b196069422ef5e4ce773168f4d3065d986f27c82f3865336db304a86e528c830711ae7c0360ae8c2c30121cf030d7c7018ef3d6890c SHA512 37481eb10d2c924387079479c73530821884d8486dfe83356dbaf618c3b9014b0e2afcb9272bc9f3be33eaccfe538e194c874cb06847bb2ffff9479c2b9ad2a8
+DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
+EBUILD camera_calibration_parsers-1.12.0.ebuild 721 BLAKE2B f1a223af7e4ce00382bc8bbe954c1c7d09ed993d74762fbda611753ceab23c79c8ce34f778355a99c9d5656aa2ac4cdc6a925467152f453c147d01e13582b78e SHA512 1065e51739f988ba177e70547f12263212bfa44274bb1a7385d79f6a5bfdda1873ddf4960bacab08e30010e219dfca42d55644c5459b526b2f21da21567b6599
+EBUILD camera_calibration_parsers-9999.ebuild 721 BLAKE2B f1a223af7e4ce00382bc8bbe954c1c7d09ed993d74762fbda611753ceab23c79c8ce34f778355a99c9d5656aa2ac4cdc6a925467152f453c147d01e13582b78e SHA512 1065e51739f988ba177e70547f12263212bfa44274bb1a7385d79f6a5bfdda1873ddf4960bacab08e30010e219dfca42d55644c5459b526b2f21da21567b6599
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
similarity index 82%
rename from dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
rename to dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
index ff27b5050edc..50bf5757a10b 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-ros/rosconsole
 	>=dev-cpp/yaml-cpp-0.5:=
@@ -23,7 +22,10 @@ RDEPEND="
 	dev-ros/roscpp_serialization
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( dev-python/nose )
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
 "
 PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
index ff27b5050edc..50bf5757a10b 100644
--- a/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
+++ b/dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit ros-catkin
 
@@ -15,7 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-libs/boost:=[python,${PYTHON_USEDEP}]
 	dev-ros/rosconsole
 	>=dev-cpp/yaml-cpp-0.5:=
@@ -23,7 +22,10 @@ RDEPEND="
 	dev-ros/roscpp_serialization
 "
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
 	test? ( dev-python/nose )
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+BDEPEND="
+	virtual/pkgconfig
 "
 PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/camera_calibration_parsers/files/boostpython.patch b/dev-ros/camera_calibration_parsers/files/boostpython.patch
index 02019d6458f7..30840401c0df 100644
--- a/dev-ros/camera_calibration_parsers/files/boostpython.patch
+++ b/dev-ros/camera_calibration_parsers/files/boostpython.patch
@@ -5,15 +5,11 @@ Index: camera_calibration_parsers/CMakeLists.txt
 ===================================================================
 --- camera_calibration_parsers.orig/CMakeLists.txt
 +++ camera_calibration_parsers/CMakeLists.txt
-@@ -4,11 +4,7 @@ project(camera_calibration_parsers)
+@@ -4,7 +4,7 @@ project(camera_calibration_parsers)
  find_package(catkin REQUIRED sensor_msgs rosconsole roscpp roscpp_serialization)
  
  find_package(PythonLibs REQUIRED)
--if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
--  find_package(Boost REQUIRED COMPONENTS filesystem python)
--else()
--  find_package(Boost REQUIRED COMPONENTS filesystem python3)
--endif()
+-find_package(Boost REQUIRED COMPONENTS filesystem python)
 +find_package(Boost REQUIRED COMPONENTS filesystem python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
  include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS})
  
diff --git a/dev-ros/camera_info_manager/Manifest b/dev-ros/camera_info_manager/Manifest
index 67a0da59c33f..6eb7691c85c9 100644
--- a/dev-ros/camera_info_manager/Manifest
+++ b/dev-ros/camera_info_manager/Manifest
@@ -1,16 +1,4 @@
-DIST image_common-1.11.10.tar.gz 52212 BLAKE2B 70ad401de41fb7a54fb741168f368a0d3f9a220f15fe7b1064868e3f4d1b34b5f39a842f24e6e22a9ac74919f2377fab28d32fb91a546068244f436ab40ee044 SHA512 dac26cf9f3a7f0660f513fdcfbcf42ff2b772aaa03dd7422e5b7ede6f2f5724e7ba6c50bdddd2511168fbb7f576d05beda786eec1ac86b3b31b6429341dc1657
-DIST image_common-1.11.11.tar.gz 52591 BLAKE2B 21ae3e98e6b80ca8da5c7cb6055f37aca1ecd14950e2d40a936534ecf43df02002868de48bf2e3eff2e94ebc60e55849490885d456a037ab1456c972aeeb4f9b SHA512 3693647935620bc0b223b80c515e2d02718b96eb5d61f57c436098cc635764f359de0f762e5e5e3746b6fbd06e99a490d4cecc33ea38e760f1126e4b321f78f8
-DIST image_common-1.11.12.tar.gz 53920 BLAKE2B 296601a14b0e18e6685924ae4557ead446a95ac91ddffb791f9b0b4d643b8f9e40c17f8ace1a705bb5193647bb07444ac81513c888864b0cdd9b45464c14916c SHA512 cd64edd658092c88060a99bbf2cd501cd27441123c34914fc4c8d8c8a8a1fe6d4a929211e71d813b6eb72e1d844842ee3e12567bc40d32981db9ee430e61fb10
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-DIST image_common-1.11.7.tar.gz 49437 BLAKE2B eb0df420e7bb3a81b21d527347a3f546f680ef33c9e1be65a17a91abf20e5425b0f08b1d0f9dfe034813f9431cca391c1bf73f78801a3217fb24b21df781df63 SHA512 7408b641c75b6227130218862674609521d8465680ac15d45fc296de6ad3372ef1dde225a812740e0d5200f5923b52b4e9c2fca4dd4f96104f0bfe901400f456
-DIST image_common-1.11.8.tar.gz 49596 BLAKE2B 03806c9bd8c375c3611f29696ea523f1774e4d61ee13b8bde4ea1f5e11c175a02fa59c7b1af2056cafb81a641d1adc73ae0441625c5a0c4e43efd8d91e86e3e4 SHA512 448a10466c6ac04d2193ce87741658073c70f629b554df484decfba107c5bc67d9fcf660a12a1dc31ce2c570d69004207c47249e5523276a425e38f330d17f35
-DIST image_common-1.11.9.tar.gz 52035 BLAKE2B b717ef682f70d702f8ace2707a21bba8eada4ed65d8c2e733502b40b1497b9f520415bc012e41da744d19a5e21e360219a10d5928f060679c240fd8a0d7e2275 SHA512 465b66731197384105dff0c499b89ab48d68859aae95411cf7d675fcb911018c7f2d79d3825b17ebcba8297b244491ef848b1b0cf70e620b93b9d73dc9b5bd77
-EBUILD camera_info_manager-1.11.10.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-1.11.11.ebuild 554 BLAKE2B 6ed14f72504dcb4d2274a063c2725209686602d6b463ea4e34d05397da6f18e5767ecce523468bad4606f756657ac990623173c5b4ba3b43987930ac827821bd SHA512 cedf5f5253d977ba04c0a3a8bea09f6e055977d8756acad5026e811d30784019f6258d9dc90097fb9d75004a9b42a5a054c7cbd67da36a03680c7a4941406ca8
-EBUILD camera_info_manager-1.11.12.ebuild 554 BLAKE2B 6969a637ea8b429ec59cc3b47052c5f1da3ddd7b2a05c2953b1844cfd4c50bfcb360c1b58a9dffcf611f27123ec05f5a48eb407f69ab375bbdaaae35e6e0d0d4 SHA512 f606285ed43d507c690702ea18ad4ca2a6d4f017c85f2ebedf7e6fffe01099ee2225906ace25b03d82dce2ab9ffc57f17302c5d6344578f638f036b53b3a40c4
-EBUILD camera_info_manager-1.11.13.ebuild 554 BLAKE2B 6969a637ea8b429ec59cc3b47052c5f1da3ddd7b2a05c2953b1844cfd4c50bfcb360c1b58a9dffcf611f27123ec05f5a48eb407f69ab375bbdaaae35e6e0d0d4 SHA512 f606285ed43d507c690702ea18ad4ca2a6d4f017c85f2ebedf7e6fffe01099ee2225906ace25b03d82dce2ab9ffc57f17302c5d6344578f638f036b53b3a40c4
-EBUILD camera_info_manager-1.11.7.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-1.11.8.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-1.11.9.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
-EBUILD camera_info_manager-9999.ebuild 554 BLAKE2B 882d82d7614daa3cf4c6e75fd8967c18fd36c2d943c27c997b13dcc5f6ee12fcc51ce04c3b3bcdda819531b49f464e553675e90f133fbd3ab299b08d456bc4d7 SHA512 3669d3fb58b48b39ec529ebd2612515bd2ae4a4d99220f0e25508de41c011f902f6d3df295e8583129d5e1b496e41027aae6c4c912c946deb17318ee7a902453
+DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
+EBUILD camera_info_manager-1.12.0.ebuild 553 BLAKE2B eab470214252eb1998f0a655af65255f9fa8350e523229bc49a980d7b28d13c9b9ef502944029d4408461e707326333e6c6d5ba097ed5c61d2d06188c3d3f0a4 SHA512 b8d2887fa39f1ba8204f2bb1e2757f06f0d256f389fddcede65359f0974fea913883aecbb88ee303952620e5cd42e9463c3b7446119e84136c70c5fbe81316e9
+EBUILD camera_info_manager-9999.ebuild 553 BLAKE2B eab470214252eb1998f0a655af65255f9fa8350e523229bc49a980d7b28d13c9b9ef502944029d4408461e707326333e6c6d5ba097ed5c61d2d06188c3d3f0a4 SHA512 b8d2887fa39f1ba8204f2bb1e2757f06f0d256f389fddcede65359f0974fea913883aecbb88ee303952620e5cd42e9463c3b7446119e84136c70c5fbe81316e9
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild
deleted file mode 100644
index 16533def62e2..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild
deleted file mode 100644
index 01fd5f221156..000000000000
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ interface for camera calibration information"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/camera_calibration_parsers
-	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild b/dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
similarity index 83%
rename from dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild
rename to dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
index 16533def62e2..624e1b1e8291 100644
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild
+++ b/dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,9 @@ RDEPEND="
 	dev-ros/image_transport
 	dev-ros/roscpp
 	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest )
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild b/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
index 01fd5f221156..624e1b1e8291 100644
--- a/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
+++ b/dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -18,7 +18,9 @@ RDEPEND="
 	dev-ros/image_transport
 	dev-ros/roscpp
 	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest )
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/class_loader/Manifest b/dev-ros/class_loader/Manifest
index ceeffc5902ae..5a8b1c29d9f4 100644
--- a/dev-ros/class_loader/Manifest
+++ b/dev-ros/class_loader/Manifest
@@ -1,4 +1,4 @@
-DIST class_loader-0.4.1.tar.gz 33110 BLAKE2B 61a93af542124799ddc7341bdd330ca8cd13046fc6a0ce765818bfce09def49b93c351180278c80c32e9449ce46b520ab91153bb4d9630e809623106efdc1f76 SHA512 954ad1e76a8b2b679d4cdd46e4c29471dbdaae18be580bd5babe576c89265c473fb218253338667d51f68bf26780a48d934e476a30983cb986bec4ffadec28d1
-EBUILD class_loader-0.4.1-r1.ebuild 431 BLAKE2B 3397bc1ee2846c81d5032dbb3661b26b1e6438a7c9d28f196c5477a173902e87e7487b59b128f5ed55633349f665c284d184e7342d69a8e95723af254642c6aa SHA512 b0ce9dc25f5fa5c4b7feae5e5371ec39a50f7eb5f2908a8ee8eb129851677e638bcb1e8cabc49fc2ef2778d14fe4075bb1b9b9a91d86d905a724d85049f77d4a
-EBUILD class_loader-9999.ebuild 431 BLAKE2B 3397bc1ee2846c81d5032dbb3661b26b1e6438a7c9d28f196c5477a173902e87e7487b59b128f5ed55633349f665c284d184e7342d69a8e95723af254642c6aa SHA512 b0ce9dc25f5fa5c4b7feae5e5371ec39a50f7eb5f2908a8ee8eb129851677e638bcb1e8cabc49fc2ef2778d14fe4075bb1b9b9a91d86d905a724d85049f77d4a
+DIST class_loader-0.5.0.tar.gz 34165 BLAKE2B 117b93bf263ac616947386a43413682cd4bf1eb4e0150673fa8803ba2af17df3f5137d38f26774a51f1974bd12237f35c36d5824c0ddbe66062a608a0518dc08 SHA512 94070562f164c4532e0da5df245125eae8af0f1d33574f7692a608f3a7bcf5cbac147828600c51457f4f3585b723dd86c8c5cbeea22764c75e6f670383be5308
+EBUILD class_loader-0.5.0.ebuild 440 BLAKE2B 92fd35e808943c679677c5f49b09921782a2886a346f579f1825fba320b1d70ca87c510f52f6dfb3ef523e6b09c06b2b4fc1067712d501d17acc87bb3be5d288 SHA512 47dbbe0e08472a31d6434a31aed0cc27592b3263d6484e0c0b130ecd0d759988fc53651feb9771a1aa722ea35b5e3f2de7468f8b7ed94ec4acbad3fe80db0323
+EBUILD class_loader-9999.ebuild 440 BLAKE2B 92fd35e808943c679677c5f49b09921782a2886a346f579f1825fba320b1d70ca87c510f52f6dfb3ef523e6b09c06b2b4fc1067712d501d17acc87bb3be5d288 SHA512 47dbbe0e08472a31d6434a31aed0cc27592b3263d6484e0c0b130ecd0d759988fc53651feb9771a1aa722ea35b5e3f2de7468f8b7ed94ec4acbad3fe80db0323
 MISC metadata.xml 330 BLAKE2B ee09655fb1ba4eb6310f6ada92765e7a7aeab4cf9c9c3acfc29c54e6248543270aff3f089b13df31bb0b9f4e17c28f9dc82d469a481769989aa410fd392619e1 SHA512 9577bebad3f9dc042eb4d055bda37a837948682da8a73dee93d847b9224227edbb51ca6cdd4002ff0c076387d8aee43428e6c16cfb13fce6a0ee8502b3eab406
diff --git a/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild b/dev-ros/class_loader/class_loader-0.5.0.ebuild
similarity index 87%
rename from dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
rename to dev-ros/class_loader/class_loader-0.5.0.ebuild
index 16fdc81a521a..b832c7497614 100644
--- a/dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
+++ b/dev-ros/class_loader/class_loader-0.5.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/class_loader"
 KEYWORDS="~amd64 ~arm"
@@ -15,6 +15,8 @@ IUSE=""
 
 RDEPEND="dev-libs/poco
 	dev-libs/boost:=[threads]
-	dev-ros/cmake_modules
 	dev-libs/console_bridge:="
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/class_loader/class_loader-9999.ebuild b/dev-ros/class_loader/class_loader-9999.ebuild
index 16fdc81a521a..b832c7497614 100644
--- a/dev-ros/class_loader/class_loader-9999.ebuild
+++ b/dev-ros/class_loader/class_loader-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/class_loader"
 KEYWORDS="~amd64 ~arm"
@@ -15,6 +15,8 @@ IUSE=""
 
 RDEPEND="dev-libs/poco
 	dev-libs/boost:=[threads]
-	dev-ros/cmake_modules
 	dev-libs/console_bridge:="
 DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/cmake_modules/Manifest b/dev-ros/cmake_modules/Manifest
index 6b71d7c4f2b2..c3e377e1ad42 100644
--- a/dev-ros/cmake_modules/Manifest
+++ b/dev-ros/cmake_modules/Manifest
@@ -1,6 +1,4 @@
-DIST cmake_modules-0.4.2.tar.gz 18541 BLAKE2B 448fa9f49c155e60f56094cadfd2f1d26bac426a18ce7355c92f227fb650f77affd49557c98fa4d0b26d4e21ed7b4d2a2e6deb6fdc25a3996705a2b9e3805f56 SHA512 1ab0f9d15296c024caf83f126db675894163ff6104c86e22f105e8027561b291e2a0178e39980439e66e4b691e6122830621fbb09f957eebe94ddd065c23f5e7
 DIST cmake_modules-0.5.0.tar.gz 18605 BLAKE2B 5be0a6f7e69806347eea03796b06679618c071dfdf72bce73d040c3788983f95c967586c800b4429df80ac6996439a0f59c2827dfb96aa50f5fe09169dc3d6e6 SHA512 a7920a094f3b3d8e480c16fd279d960e0c4d919bc4a337ba4f37ad82005805cac0e313a758e0b823986a280a8d3536a5dc36ac9603b7cd43bc0e965e9dfdd028
-EBUILD cmake_modules-0.4.2.ebuild 375 BLAKE2B 0e07ec88f48c4f823b5587eeb764a691265858f1d84386e55cee65f61a06d0cf4d1e5a11f2ff4ea78d04bbb7011e1138c9a21af71457c4ecca4775d710a4c386 SHA512 c3bd32b8ca16b4ed7274d0054fced3ca987854707dda2af695a77cb31d37bfcbfb17e04e52d729c708d4f2f929e1b9b02553bf36f122352b7b7d6128e26ddaa5
-EBUILD cmake_modules-0.5.0.ebuild 375 BLAKE2B d58eca570616a0078c64957f095d5cb737bf55ba2dcb06d54155a93033c8bde2421f2555e3b2938a1188292f690ad879ddc47ea90239fceca2442d0471343b48 SHA512 596c8d0dc809ca711a0ade9c9e7e9323f9dbe397e1486876c0b85a38cf5fcfc0e77064a48b0db87cdbe24e37f4b9f667a1a179b01b16cba65dec197839362d1b
-EBUILD cmake_modules-9999.ebuild 375 BLAKE2B d58eca570616a0078c64957f095d5cb737bf55ba2dcb06d54155a93033c8bde2421f2555e3b2938a1188292f690ad879ddc47ea90239fceca2442d0471343b48 SHA512 596c8d0dc809ca711a0ade9c9e7e9323f9dbe397e1486876c0b85a38cf5fcfc0e77064a48b0db87cdbe24e37f4b9f667a1a179b01b16cba65dec197839362d1b
+EBUILD cmake_modules-0.5.0.ebuild 340 BLAKE2B 4fe361dc29348f8ce71a68880915b2a7a73dd94efb4737db8d8a7294580b5aa249e4cbf7994d3a9752f427915d341594ffb4802b6d1f0ace789e0f786338ca3c SHA512 ebecfb2f53766e51af39b112c2506972c6e43ccbfd83ac854e154cb79d2f71f0c9bb2b29b4a4e02aa34006b24ca92cf2771db87a1be32828f6e288eb62038ce8
+EBUILD cmake_modules-9999.ebuild 340 BLAKE2B 4fe361dc29348f8ce71a68880915b2a7a73dd94efb4737db8d8a7294580b5aa249e4cbf7994d3a9752f427915d341594ffb4802b6d1f0ace789e0f786338ca3c SHA512 ebecfb2f53766e51af39b112c2506972c6e43ccbfd83ac854e154cb79d2f71f0c9bb2b29b4a4e02aa34006b24ca92cf2771db87a1be32828f6e288eb62038ce8
 MISC metadata.xml 331 BLAKE2B 542842b17662d8d11d0e8c9bf8e964a0bb220e9fd9b377a5d85ae41760a836cc66d5f4325fd79644878c7514d5d6487b4231417249bad174e294961404f64919 SHA512 cd2600dbf2b4aa2203c0d84f35ee501e48d3e14d16bd66a66c135dc57dab76b5abd9a9888e62babce118f9fb7c80752be6d4a72b0c7a040f844cf37735a537d9
diff --git a/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild b/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
deleted file mode 100644
index a76cb730354e..000000000000
--- a/dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/cmake_modules"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild b/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
index 4b3ea76798d0..fd800aebb7d3 100644
--- a/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
+++ b/dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+DESCRIPTION="CMake Modules which are commonly used by ROS packages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/cmake_modules/cmake_modules-9999.ebuild b/dev-ros/cmake_modules/cmake_modules-9999.ebuild
index 4b3ea76798d0..fd800aebb7d3 100644
--- a/dev-ros/cmake_modules/cmake_modules-9999.ebuild
+++ b/dev-ros/cmake_modules/cmake_modules-9999.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="CMake Modules which are not distributed with CMake but are commonly used by ROS packages"
+DESCRIPTION="CMake Modules which are commonly used by ROS packages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index a11a867361b7..39ebff4a8267 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1,6 +1,4 @@
-DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
-DIST collada_urdf-1.12.12.tar.gz 73361 BLAKE2B 7c23510d18080614e4f5666fa79d66b8378b6e524ac54249b8df03cefb3edfbcb7977690ca30917f8eab5ca56e689015f236cabff2aed402bd3a6b8d50f72cc6 SHA512 e0628daf905053bb6193cb3919b17b78f0697b1a530d589165f91343ac82a9fd08d86b9b24264e7f7750bef74d3a3b0db28bae63a31e8a484d8784db0a0ef6e5
-EBUILD collada_parser-1.12.10-r3.ebuild 552 BLAKE2B a56ae971ca688d0774f59b54004df43871e6a92ac8b55a1a2b48ba35c53fcaa35938bf968659943429ac7b62cccc95d5a182dd305428a0ddf48f672461134334 SHA512 8f462d2b74002b11b8fe7002d01767c1ad65650b395c142a69f901464e0a2f1566a2b068135c698134517b8927bf0bb199b84b8840920bafb7b97c2cc600bc95
-EBUILD collada_parser-1.12.12.ebuild 556 BLAKE2B b5131c89be3981d39d8d0bc0310a92007b9f2b0377b0096595230ce8b884e54a030bb5356531ab90f738e2d0820188651c935588e27b36fe7887763ee5fe2c7f SHA512 0dc225504afb546744f8fbfe7d5bf99a9f887f9e2cb27ca46784daac45d968c580af672f5c7bace1d5eb3bd9d2cb52b3ab95f486cb947517ce1dece4b4631b49
-EBUILD collada_parser-9999.ebuild 556 BLAKE2B b5131c89be3981d39d8d0bc0310a92007b9f2b0377b0096595230ce8b884e54a030bb5356531ab90f738e2d0820188651c935588e27b36fe7887763ee5fe2c7f SHA512 0dc225504afb546744f8fbfe7d5bf99a9f887f9e2cb27ca46784daac45d968c580af672f5c7bace1d5eb3bd9d2cb52b3ab95f486cb947517ce1dece4b4631b49
+DIST collada_urdf-1.12.13.tar.gz 73633 BLAKE2B 5c3458f9b245dc6b21dde8c78938712316dba25694847fa54e422cfc5b7802f4dd10a79f6fe62c7b9f553d215ddb0b9276e33651d7e75f3d11a78efa3f031a08 SHA512 ec1063b124727bb51d0ce6d19f5203ae8a1d368d3ab21b80fcb1f699022008a639638e9ebccf7d24587c7ff6b88c33e0c81cc9adc3e00334960f830248293e0b
+EBUILD collada_parser-1.12.13.ebuild 553 BLAKE2B 8388f8830821b31faa08f8afbcfa186e4b154a53c27c87272c6e80bc113a296b34a0ee336db270c48e01d0a6a073ec9ac1b2b8fa096f0ad7e58ed60af1b6955b SHA512 b64918f714f27739e222db1ab439c69ed064b47c33ae71fd15b8946a2d9f56ede884f1c0ecd7fe983d787c929b319dc9ee52153de6b03c1e7e8cf810a3cee332
+EBUILD collada_parser-9999.ebuild 553 BLAKE2B 8388f8830821b31faa08f8afbcfa186e4b154a53c27c87272c6e80bc113a296b34a0ee336db270c48e01d0a6a073ec9ac1b2b8fa096f0ad7e58ed60af1b6955b SHA512 b64918f714f27739e222db1ab439c69ed064b47c33ae71fd15b8946a2d9f56ede884f1c0ecd7fe983d787c929b319dc9ee52153de6b03c1e7e8cf810a3cee332
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild b/dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild
deleted file mode 100644
index cd21973f675f..000000000000
--- a/dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/collada_urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Collada robot description format"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	>=dev-ros/urdf_parser_plugin-1.12.6
-	dev-ros/roscpp
-	dev-ros/class_loader:=
-	dev-libs/urdfdom_headers
-	dev-libs/collada-dom:=
-	>=dev-ros/urdf-1.12.6
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_parser/collada_parser-1.12.12.ebuild b/dev-ros/collada_parser/collada_parser-1.12.13.ebuild
similarity index 91%
rename from dev-ros/collada_parser/collada_parser-1.12.12.ebuild
rename to dev-ros/collada_parser/collada_parser-1.12.13.ebuild
index 6358999ff08c..8cb7ca4bd889 100644
--- a/dev-ros/collada_parser/collada_parser-1.12.12.ebuild
+++ b/dev-ros/collada_parser/collada_parser-1.12.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/collada_urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/collada_parser/collada_parser-9999.ebuild b/dev-ros/collada_parser/collada_parser-9999.ebuild
index 6358999ff08c..8cb7ca4bd889 100644
--- a/dev-ros/collada_parser/collada_parser-9999.ebuild
+++ b/dev-ros/collada_parser/collada_parser-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/collada_urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index f1a804639d5a..c04206b482fb 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1,6 +1,4 @@
-DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
-DIST collada_urdf-1.12.12.tar.gz 73361 BLAKE2B 7c23510d18080614e4f5666fa79d66b8378b6e524ac54249b8df03cefb3edfbcb7977690ca30917f8eab5ca56e689015f236cabff2aed402bd3a6b8d50f72cc6 SHA512 e0628daf905053bb6193cb3919b17b78f0697b1a530d589165f91343ac82a9fd08d86b9b24264e7f7750bef74d3a3b0db28bae63a31e8a484d8784db0a0ef6e5
-EBUILD collada_urdf-1.12.10-r1.ebuild 585 BLAKE2B 4ac88d382e17505599c338392d20bc7fe770728b06587e248a1c77a7550e2f1cf4775bad0713891eb25b969aecedc3b25e090f87430c19cfea6cdae357225f6b SHA512 72c1728b7ea621ee064611082ebc3b8fd2f7330891e79c34ac023def00a535fd749dc1a27ffb84beee12c715967b2f12aff66c0480226fe26fe582d835806475
-EBUILD collada_urdf-1.12.12.ebuild 616 BLAKE2B ad46888b5009f1e42e0c08a21e49c93b085be6c13842fbc42d4e20afe61dcffebb7e1fd9b6ae50f8660981ce4f37eff6e3cdf156cb94da29e360a16a1f55d7b2 SHA512 3256d6bcbc557b70a6e6db147859fa7906baab1f21d1a18702dd46c12d3e505e0dbf0462476ea425e427877ecf1b8d30fc62f8ccf4aa0241301734e7a111bb16
-EBUILD collada_urdf-9999.ebuild 616 BLAKE2B ad46888b5009f1e42e0c08a21e49c93b085be6c13842fbc42d4e20afe61dcffebb7e1fd9b6ae50f8660981ce4f37eff6e3cdf156cb94da29e360a16a1f55d7b2 SHA512 3256d6bcbc557b70a6e6db147859fa7906baab1f21d1a18702dd46c12d3e505e0dbf0462476ea425e427877ecf1b8d30fc62f8ccf4aa0241301734e7a111bb16
+DIST collada_urdf-1.12.13.tar.gz 73633 BLAKE2B 5c3458f9b245dc6b21dde8c78938712316dba25694847fa54e422cfc5b7802f4dd10a79f6fe62c7b9f553d215ddb0b9276e33651d7e75f3d11a78efa3f031a08 SHA512 ec1063b124727bb51d0ce6d19f5203ae8a1d368d3ab21b80fcb1f699022008a639638e9ebccf7d24587c7ff6b88c33e0c81cc9adc3e00334960f830248293e0b
+EBUILD collada_urdf-1.12.13.ebuild 625 BLAKE2B 845931e6a9a0136e3faf593dde57cb2928b8ed81652b240e29eb1ac0e6d809571e4a9019533775b20981c032fcf0c611d7340bd45e9332d8ceb119849b82d691 SHA512 a34a2534894347f8f50d8a0149d9cd2e7cb65cd593315657585d7791a7bf854d9145c55e6d313b4e550f5f1c5836b868f04a5bcff30531124cabb604e37cd191
+EBUILD collada_urdf-9999.ebuild 625 BLAKE2B 845931e6a9a0136e3faf593dde57cb2928b8ed81652b240e29eb1ac0e6d809571e4a9019533775b20981c032fcf0c611d7340bd45e9332d8ceb119849b82d691 SHA512 a34a2534894347f8f50d8a0149d9cd2e7cb65cd593315657585d7791a7bf854d9145c55e6d313b4e550f5f1c5836b868f04a5bcff30531124cabb604e37cd191
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
deleted file mode 100644
index 1a3e4542f459..000000000000
--- a/dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/collada_urdf"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convert Unified Robot Description Format (URDF) documents into COLLADA documents"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/angles
-	dev-ros/collada_parser
-	dev-ros/resource_retriever
-	dev-ros/urdf
-	dev-ros/geometric_shapes
-	dev-ros/tf
-	media-libs/assimp
-	dev-libs/tinyxml
-	dev-libs/collada-dom:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild
similarity index 91%
rename from dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
rename to dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild
index 4d2d43f8f971..356eaee4f5e4 100644
--- a/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/collada_urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -23,8 +23,10 @@ RDEPEND="
 	dev-ros/geometric_shapes
 	media-libs/assimp
 	dev-libs/collada-dom:=
-	dev-cpp/eigen:3
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+"
+BDEPEND="
 	dev-ros/cmake_modules
 "
diff --git a/dev-ros/collada_urdf/collada_urdf-9999.ebuild b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
index 4d2d43f8f971..356eaee4f5e4 100644
--- a/dev-ros/collada_urdf/collada_urdf-9999.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/collada_urdf"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -23,8 +23,10 @@ RDEPEND="
 	dev-ros/geometric_shapes
 	media-libs/assimp
 	dev-libs/collada-dom:=
-	dev-cpp/eigen:3
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+"
+BDEPEND="
 	dev-ros/cmake_modules
 "
diff --git a/dev-ros/control_msgs/Manifest b/dev-ros/control_msgs/Manifest
index 47bb30569b9f..471084074097 100644
--- a/dev-ros/control_msgs/Manifest
+++ b/dev-ros/control_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST control_msgs-1.4.0.tar.gz 3636 BLAKE2B c82300bc17e04d4c061ec4907b9fe086d4d7768543cfa724b729e23b1b09a843c495002412bb9da48a1f7cd05cfc201b4d5da156135c104dd7ddb78193772556 SHA512 962e85661c39c3dbc91138ba4d98cfe9f846ee1e4a9b9eda1e4f76b9ef3aa4777a9faa7640e098e301601358a5e6edfe15ff585f3978fecb51b4966c6ec7fab3
-EBUILD control_msgs-1.4.0.ebuild 551 BLAKE2B d03205f52c9d24a95f557f5e219b8c9cfd77a45ad327c7b116d6cc8a447f1357addc0c9df80d4477a08d7fc13971bf8b49a4542557ad5edb523a5fef95eaf0d4 SHA512 8666dbe66c0106e48aee9f1c3495c04aa4fe828914e24657cd7cf1ee982bcba122203b895ef170ae7bbf9aabc72da3128749fb460d16738d1531733240db1a38
-EBUILD control_msgs-9999.ebuild 551 BLAKE2B d03205f52c9d24a95f557f5e219b8c9cfd77a45ad327c7b116d6cc8a447f1357addc0c9df80d4477a08d7fc13971bf8b49a4542557ad5edb523a5fef95eaf0d4 SHA512 8666dbe66c0106e48aee9f1c3495c04aa4fe828914e24657cd7cf1ee982bcba122203b895ef170ae7bbf9aabc72da3128749fb460d16738d1531733240db1a38
+DIST control_msgs-1.5.2.tar.gz 4850 BLAKE2B 4e601815ba16763695df13d9de6de22d0695d130b7f27b2150d1cdaaf72e73ba0720ac8889ae1c4811e2c5100dbd7c4b0312d1aabb75ed602b4131c1796d167c SHA512 2d892153280d4522b64e9aca3d8da7edf89eaf8cb416aed031a73aefd065533a8c03f4ed7fc6576a2a873603ed47ab35b474e1f48ffe238c184dd2bb9218726f
+EBUILD control_msgs-1.5.2.ebuild 511 BLAKE2B e5da41eda7c6f1f45004a69709bf941037f3bfc1f14d9d4f381eabaf72214a6d539837f9ad04ba993f8a44391ae53580d2d0e32e9b8cad841da8b9cceaddd16d SHA512 abfd5203491156f54cf5169fb2e4303a79b79ed24c9da91a35f2d70789cad833ba6ddb474b32cb07098f67f41a1edab0fa0f27a6813115f7aab977a08059f939
+EBUILD control_msgs-9999.ebuild 511 BLAKE2B e5da41eda7c6f1f45004a69709bf941037f3bfc1f14d9d4f381eabaf72214a6d539837f9ad04ba993f8a44391ae53580d2d0e32e9b8cad841da8b9cceaddd16d SHA512 abfd5203491156f54cf5169fb2e4303a79b79ed24c9da91a35f2d70789cad833ba6ddb474b32cb07098f67f41a1edab0fa0f27a6813115f7aab977a08059f939
 MISC metadata.xml 339 BLAKE2B 4773797df970cc9ae9f344c1bcf979bd923e08f6f2420c045a088953edf3d7308bf0beb92984b6f5f44c2587b14b8df251f50d3fd6e61a5e8bf293a0c074d779 SHA512 e240b079a8f504ef8e31bffce71f126ce20ff7446d16b961b195fb2010db830ce8271e6ac9576e785ea6e796619f14317721a0fd50fd45512a23fa04261a40cb
diff --git a/dev-ros/control_msgs/control_msgs-1.4.0.ebuild b/dev-ros/control_msgs/control_msgs-1.5.2.ebuild
similarity index 91%
rename from dev-ros/control_msgs/control_msgs-1.4.0.ebuild
rename to dev-ros/control_msgs/control_msgs-1.5.2.ebuild
index 601f7602785c..2b3e66de6c4e 100644
--- a/dev-ros/control_msgs/control_msgs-1.4.0.ebuild
+++ b/dev-ros/control_msgs/control_msgs-1.5.2.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-controls/control_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/trajectory_msgs"
 
diff --git a/dev-ros/control_msgs/control_msgs-9999.ebuild b/dev-ros/control_msgs/control_msgs-9999.ebuild
index 601f7602785c..2b3e66de6c4e 100644
--- a/dev-ros/control_msgs/control_msgs-9999.ebuild
+++ b/dev-ros/control_msgs/control_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-controls/control_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs	dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/trajectory_msgs"
 
diff --git a/dev-ros/control_toolbox/Manifest b/dev-ros/control_toolbox/Manifest
index 3da58c511243..3755ec4ca3d4 100644
--- a/dev-ros/control_toolbox/Manifest
+++ b/dev-ros/control_toolbox/Manifest
@@ -1,8 +1,4 @@
-DIST control_toolbox-1.14.0.tar.gz 24084 BLAKE2B c4ffd003060e57a6f08b2f064ada0c237eaea782aa719819fcd437868a440e68b278871cd82f6cfb7f877ca7b7f6da6aa17509198a550eb20c53bfbe095da75e SHA512 205d1e8421f3727532d14746f1898536a6bb6144071e8f5c8f5be17242462ed18512d7ede61ef686db46d6beea4b655c1ad22dec1e5940c99e2d52e0a88c1769
-DIST control_toolbox-1.15.0.tar.gz 24096 BLAKE2B fc2288f9b6493b4d3de9eabfa43313602702fcf66bf2cae5091866e9f4989126cfebe4efb73a12bbd67fee4dfb16de4847984f7da3636dd402b47658876686a2 SHA512 e2f1bae35d3c70fb15eff30fb7a3d380cd5857ffebb28cac2d48de7e0f12191a0c3a57ccc80978155f42e6ffc59af14c372ddec0532ecb2a7c2db720737c1a16
-DIST control_toolbox-1.16.0.tar.gz 23723 BLAKE2B 00de0c11804ce31d07877f480d62b7bfecae86ab8ce1a63107948f02449a05a355b75e4fc0f22dc95be5b9000adc133b2e731029d6143d2af8b425387806173d SHA512 942f63b95f4540dd634daf090389b4f839b59a73d85ad8d1636b7180e2cb3c66d75cf131216d53709bafec54543dab2034e6e88d38ab1045711eda095ea77dd7
-EBUILD control_toolbox-1.14.0.ebuild 612 BLAKE2B f0ae704eccaee7d7a5f52ec6013ec7719a846cf1657c51dade13fa5e9916469350502cf7ab0cce0ece8081fe755496bbf733cc93e998550902b6ffbb2a3b5cca SHA512 9073442c13842494217909825a4c914d6a0dc30a69b6ab624b1995b979e81855b6c9ff5cd84a6a72a7cd05a0833cb6ee68043d52824db97a31b5462bb734f41b
-EBUILD control_toolbox-1.15.0.ebuild 612 BLAKE2B 651a30f85c57dcad1307caf7718826bf94005b32a96e036ab3dc9d906ccd0d38d95314d09019a0d058faacc2fafbfc2e54afe065742018fd89faa6982d9cb8f6 SHA512 3a0728bfaaab6258ccbd20a97fad87f5c54ea12a6b2e5b35b7cb9dace982a4c23bf66f0e1b2d4c8a027506e322538c0b39e3dfb18bd860a87a1f7b4ae05d9367
-EBUILD control_toolbox-1.16.0.ebuild 612 BLAKE2B b9c7d3d7d55331055b1314d1d580dbe0d4049cc1a8d76be201d06580588f90f6cca1188a54edfba414d689f4ff30c56cbc5579679d55ffd54c977d9c319b6828 SHA512 8a7f46358516f2198f38512d688c3d8bab1ad25a43d33cff150a2d8d6b7c941d89d9402ceb3a93816fc32fc2b812fd560e0278cbc979598c6fe528b89a3f0dc0
-EBUILD control_toolbox-9999.ebuild 612 BLAKE2B f0ae704eccaee7d7a5f52ec6013ec7719a846cf1657c51dade13fa5e9916469350502cf7ab0cce0ece8081fe755496bbf733cc93e998550902b6ffbb2a3b5cca SHA512 9073442c13842494217909825a4c914d6a0dc30a69b6ab624b1995b979e81855b6c9ff5cd84a6a72a7cd05a0833cb6ee68043d52824db97a31b5462bb734f41b
+DIST control_toolbox-1.18.2.tar.gz 24244 BLAKE2B 13c4d4d6991db496ea6223c6cc33c9b0b7fa7b3e18c13cc330cf032ac67b185a596ca2eb118678faf6f0a3106458e3ce20635dfd99fbc1acf176ee2844e6ec99 SHA512 0b8bbd0fec88b1679260d9b5d5c5762f52fd14f4156be45ea07a410a7967571136a65115f530ae4f7a84e456e56c363616e23d0b54d8c092a38a80fad691c705
+EBUILD control_toolbox-1.18.2.ebuild 582 BLAKE2B 4bed97e1ee2197d5d86551a9143ce99578567e57c8cbbdc7cf9c849fa4fd3db10fcf817a517ffef59df7d2f56ed5cc41cf72a13a3c8fd8570f5c41227dc2f294 SHA512 d1770c8abaff2147bc3b503d3aeaca023317259946a91c2d7cf44d575cde3bd8e80fa3121fb36ec72a7681f58955cca4cafbb5a251f948706eafac1613a46387
+EBUILD control_toolbox-9999.ebuild 582 BLAKE2B 4bed97e1ee2197d5d86551a9143ce99578567e57c8cbbdc7cf9c849fa4fd3db10fcf817a517ffef59df7d2f56ed5cc41cf72a13a3c8fd8570f5c41227dc2f294 SHA512 d1770c8abaff2147bc3b503d3aeaca023317259946a91c2d7cf44d575cde3bd8e80fa3121fb36ec72a7681f58955cca4cafbb5a251f948706eafac1613a46387
 MISC metadata.xml 342 BLAKE2B fb0771fe1ae1d9988202a13aa319eca68cde1c129b68b74405ba854416522c81917bd7ecc26dd6ff0d9c32a02c5b089dbbaa4b13eb6ee3e65c050a09ec6731e8 SHA512 81835aefd67c55665a6f7d2a2cdbced84032d83ca35d6924410a62c00021cf7eb0e11e1094e0bb70becb635b480c8e527c7e9bdfaaa17149918552d440539e0c
diff --git a/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild
deleted file mode 100644
index ac4eb7122b93..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
deleted file mode 100644
index 91cec2668963..000000000000
--- a/dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Modules that are useful across all controllers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/dynamic_reconfigure
-	dev-ros/realtime_tools
-	dev-libs/boost:=[threads]
-	dev-libs/tinyxml
-	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild b/dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
similarity index 84%
rename from dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
rename to dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
index 2c6a1e83f76d..f34a56ae1a10 100644
--- a/dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
 KEYWORDS="~amd64"
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -21,6 +20,7 @@ RDEPEND="
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
 	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/control_toolbox/control_toolbox-9999.ebuild b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
index ac4eb7122b93..f34a56ae1a10 100644
--- a/dev-ros/control_toolbox/control_toolbox-9999.ebuild
+++ b/dev-ros/control_toolbox/control_toolbox-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-controls/control_toolbox"
 KEYWORDS="~amd64"
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -21,6 +20,7 @@ RDEPEND="
 	dev-ros/realtime_tools
 	dev-libs/boost:=[threads]
 	dev-libs/tinyxml
+"
+DEPEND="${RDEPEND}
 	dev-ros/control_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/convex_decomposition/Manifest b/dev-ros/convex_decomposition/Manifest
index c26d278cc98a..ff4cc31758b8 100644
--- a/dev-ros/convex_decomposition/Manifest
+++ b/dev-ros/convex_decomposition/Manifest
@@ -1,8 +1,4 @@
-DIST convex_decomposition-0.1.10.tar.gz 75232 BLAKE2B 24e6460b127a6c6904c7d2db8bc7b84a56d6c32828f8b049df1f5fd0adb3a098d7759394785cfca09030734cc02cf0d512912d2da5aa41b8d8e070cb8f7d7dc2 SHA512 1e2bfd6a2596d3d06b99347f5200ae50b1d934109afc2fa4bda14747571ce8795ac798c5f11950b2cc962426ca4c97ae86e946583436785ef6b84b15eb122497
-DIST convex_decomposition-0.1.11.tar.gz 75259 BLAKE2B 8d0247971ad722fa8ea66501528055739a096d1c558c7542b3c6b3843ce705e54f8a4577963ef0ad77d40fb68701eb3098aa75e6541319f9ddb8221833e6bcef SHA512 b0d061144c3d4351e23f7cf8cc6c6b014b74ebecf32fc41347840e71b0616a95095f8d4ad126b6c2eba25db9129e976b79ffc61a1bd1c5606b2a18b75ee1b30e
 DIST convex_decomposition-0.1.12.tar.gz 76216 BLAKE2B fda1e88cb3efffe3ae7e384216b4f2af072ca25c407efc07eaa8cc7a84c64b723aeb729be05cedb5ef6f82f51292aef1ec6acd48282742a02e9ec6fb49d78e6f SHA512 c6c502e66259983e3462b27253ff8483d56baaa71b8c42037b43fd11aa0c226851d5c6dcf5745b814a3601083b5b85662268db2a1af99e1bdbc8f237c6ff2704
-EBUILD convex_decomposition-0.1.10.ebuild 346 BLAKE2B b2e979c3b3c9df075ed81d317413441822526193695fad834c643cdf88a846d2f41257802a9d8bbf65c2a2fafb4d49c31938bb94ba49c7a862ff9b94def205d5 SHA512 1c794efda5e67b77076aab708b88f52523bd727f39dba949dc04fea722e62962033f7bfbf86ae473250e02866a14b0760e1f383632e8211804dd6a8aeda3b4ef
-EBUILD convex_decomposition-0.1.11.ebuild 346 BLAKE2B b2e979c3b3c9df075ed81d317413441822526193695fad834c643cdf88a846d2f41257802a9d8bbf65c2a2fafb4d49c31938bb94ba49c7a862ff9b94def205d5 SHA512 1c794efda5e67b77076aab708b88f52523bd727f39dba949dc04fea722e62962033f7bfbf86ae473250e02866a14b0760e1f383632e8211804dd6a8aeda3b4ef
-EBUILD convex_decomposition-0.1.12.ebuild 343 BLAKE2B d05812fbee6521f1a40e3994382e55187d2918506636dc32b99cc6091ffcb8f51a6c35b33b669ad09aa57bc4bee4974c3cc8864644e563b2d857209d7394ea27 SHA512 0658888b9e0c6a0f51e761acf44c04c809e6bdc23d7dea3d49a887590914901a1c53f5e032caf813ffad34787776da8756640f594bfff3fb45c022247555598a
-EBUILD convex_decomposition-9999.ebuild 346 BLAKE2B b2e979c3b3c9df075ed81d317413441822526193695fad834c643cdf88a846d2f41257802a9d8bbf65c2a2fafb4d49c31938bb94ba49c7a862ff9b94def205d5 SHA512 1c794efda5e67b77076aab708b88f52523bd727f39dba949dc04fea722e62962033f7bfbf86ae473250e02866a14b0760e1f383632e8211804dd6a8aeda3b4ef
+EBUILD convex_decomposition-0.1.12.ebuild 343 BLAKE2B 1a2a99d1a896c1dfd3d1408a608041860e3f21db8e4a5967133a2473da94b269ea7b66749a5467f4376ac5f145f716d7132de99f20a12e2fc183f81441fa39ca SHA512 213cfa7c83b8ec476331b4043c524e49e2f94ee6aebf46176b62cbb223d29c22c692a1c8f3c55687e5f47c9a6b1ee47d2b61e88c6958f3972610215b7ea82ffd
+EBUILD convex_decomposition-9999.ebuild 343 BLAKE2B 1a2a99d1a896c1dfd3d1408a608041860e3f21db8e4a5967133a2473da94b269ea7b66749a5467f4376ac5f145f716d7132de99f20a12e2fc183f81441fa39ca SHA512 213cfa7c83b8ec476331b4043c524e49e2f94ee6aebf46176b62cbb223d29c22c692a1c8f3c55687e5f47c9a6b1ee47d2b61e88c6958f3972610215b7ea82ffd
 MISC metadata.xml 338 BLAKE2B 9629aa5efb047198fd4701c0dbae8aee71b4ed57d113ba29364cc2aed29cf27a12479ce983212b864148297511b2ab825094a3d4b5daca3dd0f494ec1fed1667 SHA512 7e80090cf6f3f61e7d44024b25e40178b4e7434db9704418cfa397fad7da84b071afe88bbb261195c1d7e40ae328cdba28fb512885054b52c799d1d465504154
diff --git a/dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild
deleted file mode 100644
index a4da6c88817e..000000000000
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/convex_decomposition"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Convex Decomposition Tool for Robot Model"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/unzip"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/convex_decomposition/convex_decomposition-0.1.11.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.11.ebuild
deleted file mode 100644
index a4da6c88817e..000000000000
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.11.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/convex_decomposition"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Convex Decomposition Tool for Robot Model"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RDEPEND="app-arch/unzip"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild b/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
index 417a3b55f276..26c6262a0b60 100644
--- a/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
+++ b/dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/convex_decomposition"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild b/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
index a4da6c88817e..26c6262a0b60 100644
--- a/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
+++ b/dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/convex_decomposition"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index 36cc0262223f..bb8cd3882543 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,6 +1,6 @@
-AUX boostpython.patch 551 BLAKE2B f3cecec73fbc584f324da2c1438ca42e283031fdf6df3f8ac458da9f09c3344716e9ca901de9f35edceaf6cc0223f66a1cef2e77ee3106f7b39b8ab96b204ade SHA512 9b306662ccef96aa9eee0b5c244de4919a9f8614502e1d75e63e787b4a0408ca6363c67b4b6eb897ffd8ca90df856444c357acee5f23074e33f7afd985686f7f
+AUX boostpython.patch 599 BLAKE2B 5076c2efdfd06afa9dbc9e3ad344774c1fca54ef172a4808e4ba7b40f4770250d49b1e478abcee1ac973c3a1012579694499a1dd48fd84c19f996441920c329c SHA512 21c5a6589a1ee19d5f586b535807c35f5eef77da6dae614deb7542d8cb1cf850902b5d7de197d6060016f43dcbef8d6d69d104abc5f5fa0af6131a415a43ba64
 AUX ocv4.patch 12322 BLAKE2B a27a3c0b9303969c2984f283657b6dc9b0d1840183bf9fe875280db7ed9862d16fe44dc3e917d6620431a351cdcadb13000a152b1b49528d90733813ba859d05 SHA512 167a4a3f16e3560c23a354ad2e041e60b5318ee56e9af4d35e9255faa9449cd4d2af3dde9648d8f49fdf64c5d28a66959efd90fbecb5af5a262c3ec090bd7e7f
-DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD cv_bridge-1.13.0.ebuild 658 BLAKE2B eda35a1df52c2c743ef76904a92e74ed1fd711785c846f035657270f14ee21dcccff95a428c49c8c430fe9092cfcb820bd74833d5df126b141d487cbee26a6a2 SHA512 9f9dfd0e6af3a4d0ec5ce10ae41f1e4f14e7fde90fe597505e9120dd8f975deec20f5bae0d053e03dd999d46972f9f7ed19517b8c236c1ebada4d922d8201f25
-EBUILD cv_bridge-9999.ebuild 633 BLAKE2B 43e33f439c1fa4af188c7cadbfc36c16ebb4bf1594cd1b797fdb09dc1cc660b4773d1488ff189666dcd8d6a3cba4024f20b0a7b4ad82c4fa47c33c987b15196a SHA512 757803d5fa063ad1856bb9d758522b2a8908999187742f6a8fb3398204ab4c824d0da8e70b085c0e687e23ed49740ec2073e962c60f49e650ceacee2e44e1a25
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+EBUILD cv_bridge-1.15.0.ebuild 628 BLAKE2B 916a18a3b1df9d1c811a027558e9f9e02c424d8195fc7e4c65116279c30e0d50e12d00d460821db76eb77dfa63105ffb3c267ac28090740f8b39f0347363048a SHA512 92ad3a192cd2b5fce2b4a14b5cc640d2157a5f022481492bc23705bb1578199b7445be4e040f0fc917374c901f42a4b4a4b6478a7958981160b269665bd0cbf9
+EBUILD cv_bridge-9999.ebuild 628 BLAKE2B 916a18a3b1df9d1c811a027558e9f9e02c424d8195fc7e4c65116279c30e0d50e12d00d460821db76eb77dfa63105ffb3c267ac28090740f8b39f0347363048a SHA512 92ad3a192cd2b5fce2b4a14b5cc640d2157a5f022481492bc23705bb1578199b7445be4e040f0fc917374c901f42a4b4a4b6478a7958981160b269665bd0cbf9
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
similarity index 62%
rename from dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
rename to dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
index a592d05deeb9..8280858d30ec 100644
--- a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -18,7 +17,9 @@ RDEPEND="
 	dev-ros/rosconsole
 	>=media-libs/opencv-3:=[contrib(+)]
 	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/boostpython.patch" "${FILESDIR}/ocv4.patch" )
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/cv_bridge-9999.ebuild b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
index 422225d82b4f..8280858d30ec 100644
--- a/dev-ros/cv_bridge/cv_bridge-9999.ebuild
+++ b/dev-ros/cv_bridge/cv_bridge-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -18,7 +17,9 @@ RDEPEND="
 	dev-ros/rosconsole
 	>=media-libs/opencv-3:=[contrib(+)]
 	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/boostpython.patch" )
diff --git a/dev-ros/cv_bridge/files/boostpython.patch b/dev-ros/cv_bridge/files/boostpython.patch
index 72fac8087363..a6192f98be24 100644
--- a/dev-ros/cv_bridge/files/boostpython.patch
+++ b/dev-ros/cv_bridge/files/boostpython.patch
@@ -2,14 +2,17 @@ Index: cv_bridge/CMakeLists.txt
 ===================================================================
 --- cv_bridge.orig/CMakeLists.txt
 +++ cv_bridge/CMakeLists.txt
-@@ -5,11 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
+@@ -5,14 +5,7 @@ find_package(catkin REQUIRED COMPONENTS
  
  if(NOT ANDROID)
    find_package(PythonLibs)
--  if(PYTHONLIBS_VERSION_STRING VERSION_LESS 3)
--    find_package(Boost REQUIRED python)
+-
+-  if(PYTHONLIBS_VERSION_STRING VERSION_LESS "3.8")
+-    # Debian Buster
+-    find_package(Boost REQUIRED python37)
 -  else()
--    find_package(Boost REQUIRED python3)
+-    # Ubuntu Focal
+-    find_package(Boost REQUIRED python)
 -  endif()
 +  find_package(Boost REQUIRED python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
  else()
diff --git a/dev-ros/depthimage_to_laserscan/Manifest b/dev-ros/depthimage_to_laserscan/Manifest
index 7aae46634c37..476aa5017ab6 100644
--- a/dev-ros/depthimage_to_laserscan/Manifest
+++ b/dev-ros/depthimage_to_laserscan/Manifest
@@ -1,6 +1,5 @@
 AUX isnan.patch 672 BLAKE2B 714348340fb583106891e467fb24815cb95e389ef863b39c8ed5d6250c2fc5d5467cf565590b0fa1e163c440fd6e282f6320d77395b676876bd51526a755e454 SHA512 c4993894868cbfbd66374b4062f43e7d58ef8e3d725024b06146144809cd059d6a01ba502626876089847688a58f1f069f8dfb788e657ac7c1a79e9cb8200a7b
-AUX pluginlib.patch 616 BLAKE2B 7ba7ce7e1af6b5f97987011a5f65edc200bcb56904cda31bbfb3e35a5a0ae5250bdef3d207cbcf7cd67a83a0aa04858162116631fdc1399159188d3168338d19 SHA512 f0ad07597c7b375e7b7ba566e19c21ef73a8cee9f7f124b0819056d061dd7a6e6b5a583ac6d9bfd66ced8e6bf4823e11867581789e2c82aa455e229291f26244
-DIST depthimage_to_laserscan-1.0.7.tar.gz 12121 BLAKE2B f8b69ce10311e39eaf963c42fd6ea653c8b0fe1c2381ab128d575d490d236b03d8667a213e8e9eb9423c4a9244697fb9746ebe8385ac0142776e47063fe9e5bf SHA512 4da5fa446d574dbb44c2924dd760f160e527e68d7df119e5d9e74d85efd3473ee31845e8565b0d023d2cf22c945b3b5c56b12a04facd4e38dc3dd1235dad73e9
-EBUILD depthimage_to_laserscan-1.0.7-r2.ebuild 733 BLAKE2B b34108683225362e8c46286ab6f0b68b29173e3f2cf658732bfb2c344d43071bfeefa6a37a9612ccf0cf8a9f79ca2d8c6c31d02f32d899e0db06cfea6b3c7c33 SHA512 eafc77e18ea8ae75459fa5f630ee82ea65df62ba0d0a4996b544d842ab5edcb78556a6b1e15245ab9ab881744fae64ded2cc0e8603fde9978d7593dc32d1e4ec
-EBUILD depthimage_to_laserscan-9999.ebuild 733 BLAKE2B b34108683225362e8c46286ab6f0b68b29173e3f2cf658732bfb2c344d43071bfeefa6a37a9612ccf0cf8a9f79ca2d8c6c31d02f32d899e0db06cfea6b3c7c33 SHA512 eafc77e18ea8ae75459fa5f630ee82ea65df62ba0d0a4996b544d842ab5edcb78556a6b1e15245ab9ab881744fae64ded2cc0e8603fde9978d7593dc32d1e4ec
+DIST depthimage_to_laserscan-1.0.8.tar.gz 12189 BLAKE2B 78668e8768bf9f402b5d94af71045677ce35b9b680c1b298f48a8a0c55f3920880eef24d0ab334150b967fd1378b9e4ada8069965057238e59116adb2f803d32 SHA512 50472016630d10b5a8544c7a2391c215de307dc5b0d8445cdc05d8e2f251651221bf18b18e389d000adacf79324569bb6ad7a23c6c6cce901d5ae1c966b4533d
+EBUILD depthimage_to_laserscan-1.0.8.ebuild 673 BLAKE2B 58a75876cb61769b3801b7d410d1ac5645bc3ac5eaa767634e41178298d3342af83072f59a6a27615e50ed02d0370974db5ac6748f8f6c26412f0297e0988516 SHA512 945075f7b28c9f1c96813220343cdd73069594db5084d73247aae9b2b471280cf5a1ff669605b727857cf8c1f0a1be5e23344c4407ff635e694ba75cf4a142cc
+EBUILD depthimage_to_laserscan-9999.ebuild 673 BLAKE2B 58a75876cb61769b3801b7d410d1ac5645bc3ac5eaa767634e41178298d3342af83072f59a6a27615e50ed02d0370974db5ac6748f8f6c26412f0297e0988516 SHA512 945075f7b28c9f1c96813220343cdd73069594db5084d73247aae9b2b471280cf5a1ff669605b727857cf8c1f0a1be5e23344c4407ff635e694ba75cf4a142cc
 MISC metadata.xml 352 BLAKE2B 925e18de2139370d06d242cbf4c2d15f2d201df3c28036169eb868defaad60ef0e38814cae627c43efbe5efddfa21e311053970f7ad0b648650df538c1817a10 SHA512 3eafc06a8ac658f3f29903c2f23b88b53b2dd5b1a70fecb8788a4027646c5367a3d0384179c0ca1e75e58a8081ce53c00ae6def249f48a7fc7c2ea0365408d2c
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
similarity index 77%
rename from dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
rename to dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
index 2e621e904b7b..77f0689a0e7f 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -20,9 +19,10 @@ RDEPEND="
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" )
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/isnan.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
index 2e621e904b7b..77f0689a0e7f 100644
--- a/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+++ b/dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/depthimage_to_laserscan"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -20,9 +19,10 @@ RDEPEND="
 	dev-ros/image_geometry
 	dev-ros/image_transport
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/isnan.patch" "${FILESDIR}/pluginlib.patch" )
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+PATCHES=( "${FILESDIR}/isnan.patch" )
diff --git a/dev-ros/depthimage_to_laserscan/files/pluginlib.patch b/dev-ros/depthimage_to_laserscan/files/pluginlib.patch
deleted file mode 100644
index a367cd40c5f6..000000000000
--- a/dev-ros/depthimage_to_laserscan/files/pluginlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Index: depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp
-===================================================================
---- depthimage_to_laserscan-1.0.7.orig/src/DepthImageToLaserScanNodelet.cpp
-+++ depthimage_to_laserscan-1.0.7/src/DepthImageToLaserScanNodelet.cpp
-@@ -57,5 +57,5 @@ private:
- }
- 
- #include <pluginlib/class_list_macros.h>
--PLUGINLIB_DECLARE_CLASS(depthimage_to_laserscan, DepthImageToLaserScanNodelet, depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet);
-+PLUGINLIB_EXPORT_CLASS(depthimage_to_laserscan::DepthImageToLaserScanNodelet, nodelet::Nodelet)
- 
diff --git a/dev-ros/driver_base/Manifest b/dev-ros/driver_base/Manifest
index 58d03f59050e..08a66796982c 100644
--- a/dev-ros/driver_base/Manifest
+++ b/dev-ros/driver_base/Manifest
@@ -1,4 +1,4 @@
 DIST driver_common-1.6.8.tar.gz 15055 BLAKE2B 2d9a4c23d65b8e2f60343f5e3b454e1cc41334d34e0246891b533f216acb743df628d95dd2c0087b06284a85e0ea872baad495a7ed7b59c03e8f8ff32eba4ed8 SHA512 b698143d08785088ac13e62f5b96676bd590a84e4ffb147fa3698be6a8ded510f648d043ecdc1d31ba7b95fb3041d06ee1a39b224c359b8612adebdba259d188
-EBUILD driver_base-1.6.8.ebuild 526 BLAKE2B 95ab5407f70b126fd0cb95be1ab8c3ef421455399111f5a7d6e09574a9a6d8976925b5df5c9c49437090e216ed3653a80dcbaab70cf499d6e329cae5aee994e8 SHA512 23936ae388d66770780f853d05138b6f21cbcbfdab3e64cc48ce94422c7b3266bf65147e52b9ecf39039be7f5982ca56757d7c12c2e41dad560d2aaf09594b14
-EBUILD driver_base-9999.ebuild 526 BLAKE2B 95ab5407f70b126fd0cb95be1ab8c3ef421455399111f5a7d6e09574a9a6d8976925b5df5c9c49437090e216ed3653a80dcbaab70cf499d6e329cae5aee994e8 SHA512 23936ae388d66770780f853d05138b6f21cbcbfdab3e64cc48ce94422c7b3266bf65147e52b9ecf39039be7f5982ca56757d7c12c2e41dad560d2aaf09594b14
+EBUILD driver_base-1.6.8.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
+EBUILD driver_base-9999.ebuild 431 BLAKE2B a1c686c72ad08b5b38eaa150994282ed95a5e8ce5498d009f3288cf82be3347d83794c7a425eb37d9b8c1ee37616e219ce4a79ba4dc247b3543ed2a95fb1759f SHA512 7023a565d9447a317b0411748bc72c1b9d918fcfc834db8a4af4f22584779c428790d648af71f75034104286faf5ca4f4697a76126c1d3b625aae4cc556fe1cb
 MISC metadata.xml 339 BLAKE2B 71ed9f79df6d8528f3d967c077f1d01e0290573400356e3749bd24254281651f09507894d2ca4029b8b8a77b51d31d080d9560d9995d3d9fde848f0d71ec083d SHA512 e24ff4ef526475ad5bff434350abb00afccb4c101ab624ee056c1502719d15ec4889eff9170c534af62ba8719bd5fe4f3cf206353244f56e486a29afea53ee7b
diff --git a/dev-ros/driver_base/driver_base-1.6.8.ebuild b/dev-ros/driver_base/driver_base-1.6.8.ebuild
index 9fb280a8b98f..6f9cd6b125e7 100644
--- a/dev-ros/driver_base/driver_base-1.6.8.ebuild
+++ b/dev-ros/driver_base/driver_base-1.6.8.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test"
+DESCRIPTION="Framework for writing drivers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/driver_base/driver_base-9999.ebuild b/dev-ros/driver_base/driver_base-9999.ebuild
index 9fb280a8b98f..6f9cd6b125e7 100644
--- a/dev-ros/driver_base/driver_base-9999.ebuild
+++ b/dev-ros/driver_base/driver_base-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/driver_common"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test"
+DESCRIPTION="Framework for writing drivers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/dynamic_reconfigure/Manifest b/dev-ros/dynamic_reconfigure/Manifest
index 3303e09ef497..7aa29cf5bce1 100644
--- a/dev-ros/dynamic_reconfigure/Manifest
+++ b/dev-ros/dynamic_reconfigure/Manifest
@@ -1,8 +1,4 @@
-DIST dynamic_reconfigure-1.5.48.tar.gz 38764 BLAKE2B 740500b05274c1ebe8423f3061f73fa54bec422b96598d3867b49b5b6d7d3f9d68172d796b49ee4a1b6d6f0c411d3ddd0b9b664cc8fdcef22bd9700f6dfb5111 SHA512 f4bdc00b580c56feaf3e076540d669923e1330c862fef3518774f43c57212dcbf28bb848f61e7196294d4e7439b4d06c33351aa8d133b71042b739ac59e105a6
-DIST dynamic_reconfigure-1.5.49.tar.gz 38883 BLAKE2B 499fc907c6015941caf151dd8b8f84ff90b1a9abb08d499be00ce4281957045cd50900eecc79be21c77dede125f2e5c03c2bbd7ebae0dc4b62637923dea0e0aa SHA512 c8cba24424142333df4d66c013915526573c791a4ef97e51baffe8040293dce67d313c57036807c308fe4ca17af92f277e467cde6494f166f6e4ec4aa34050cf
-DIST dynamic_reconfigure-1.6.0.tar.gz 40026 BLAKE2B f08be83ac741b70af7b516623afaca494cf22d9d90e568e7f63599709ef48402dc17adfa25678f5c8388d3cbb85d1532a445f1f624946ea9590d92ee842de907 SHA512 3a43780af28597d5761264b09b26a9c82fefcdc33d9b08ad46a6b0ddeb23bd06d0ab6436bfbc546a8c626eff21fddac453e42eec7369b22e19f2f9c9178b0d4b
-EBUILD dynamic_reconfigure-1.5.48.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
-EBUILD dynamic_reconfigure-1.5.49.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
-EBUILD dynamic_reconfigure-1.6.0.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
-EBUILD dynamic_reconfigure-9999.ebuild 561 BLAKE2B 743c828fed64bd5a556fdeabc886cd825718c03e45ef529759beb09ce29140693034f454461ec99abb50d0020d0080e42d1743703fcf755e6f963feaf9433e61 SHA512 66bc324c67cf7a064a49f4aa1433d4d8a606ea9f4ea8cdbf1f734a58ebe0835e54c2f8bd417e74b8aae0004d43e53d84434e0c09fd96ab0f8a91e59073148891
+DIST dynamic_reconfigure-1.7.0.tar.gz 40420 BLAKE2B 8a08a96817c62552a5045e3d9435fd06465660513eef55c85a6454334db462c21dd6ebc2c48b3e5e59d66344c5904f87f6a86b701726c0e23de65967367a104a SHA512 5eb05bde8e283f319220331cbd1572f6735aba27f86964cd78c295e9a5a59904632aed0651cbc9f358cf6012299763ebe57bc4daee4a7af7d8537089394db845
+EBUILD dynamic_reconfigure-1.7.0.ebuild 497 BLAKE2B bbf29a2c04d873d4310a433584d3073ea046a800695cc8a5fc745a730d528050e27fbabd67dfd636c0a10d46707fde5ffc8159e4f70ba347d2877ade0dfdc82e SHA512 8f053f00566d07f1849f7f06952633f8a75dce838800898a97666dc6ccae582d143554fc2acb445db597525be60ae0bdb4e24e6f836793ec28326ba8b5c8fc7b
+EBUILD dynamic_reconfigure-9999.ebuild 497 BLAKE2B bbf29a2c04d873d4310a433584d3073ea046a800695cc8a5fc745a730d528050e27fbabd67dfd636c0a10d46707fde5ffc8159e4f70ba347d2877ade0dfdc82e SHA512 8f053f00566d07f1849f7f06952633f8a75dce838800898a97666dc6ccae582d143554fc2acb445db597525be60ae0bdb4e24e6f836793ec28326ba8b5c8fc7b
 MISC metadata.xml 337 BLAKE2B c2b63166315cf868635f9abe7b49158c32f30d031cfd454ef9ebfb16fe7fc96c00cecc77c59bb3f91d4f07c77783bb2e1750d24f87da0507106355401ffe069b SHA512 19705df6cde1a0ae66f58cccc95a96e26302960f7e055a8c2b5fc15f0d995b2adaf0ac61c87470f7562e2ad03012845fd3abac6b4a081c1d6e01e9b91d53e561
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild
deleted file mode 100644
index 45442499ccd4..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild
deleted file mode 100644
index 45442499ccd4..000000000000
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
similarity index 75%
rename from dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
rename to dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
index 45442499ccd4..990a37706739 100644
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
+DESCRIPTION="Provides a means to change node parameters at runtime"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
index 45442499ccd4..990a37706739 100644
--- a/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
+++ b/dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros/dynamic_reconfigure"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a means to change node parameters at any time without having to restart the node"
+DESCRIPTION="Provides a means to change node parameters at runtime"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/eigen_stl_containers/Manifest b/dev-ros/eigen_stl_containers/Manifest
index 94fb7ab823fb..8c4564e83f9e 100644
--- a/dev-ros/eigen_stl_containers/Manifest
+++ b/dev-ros/eigen_stl_containers/Manifest
@@ -1,12 +1,4 @@
-DIST eigen_stl_containers-0.1.4.tar.gz 2128 BLAKE2B 1e9f1f39776f80f5843f7d2016f18df84c79cddec98a19c41457ff623e0eadd33d2157fa39c447757be09d3332a2349b0cddec227a76ff31602b8e5a2b650600 SHA512 57e67dd63536c7e35b4055d0072575f16e517b797c8383be6ed80eadd536bd044aa787c657bc5da125bf91a9be273515b35c0459a42cbbf02cd405dbf9f05f1f
-DIST eigen_stl_containers-0.1.5.tar.gz 2571 BLAKE2B b0d7dcc007d2b8039a4a480f0f126c761ca6c1c093e768508d52ae9d12db6505f8124f06fa5a993dd4b5ac71143500722e076888d111b248933f2486c96b569b SHA512 57b9825860e959523187a8d4221f9b59805e2934aa1e842bd87cffae308458e89171fc99f0996ee52e7b475e4ac0de13d3a330c86adc9e3e6925dbff234a8337
-DIST eigen_stl_containers-0.1.6.tar.gz 2763 BLAKE2B 0533d8c89e74652f64859012e22130594e6085751d06ec2eb8dfc08018de4576435fafa3d3590447deadcac59d1c264d9993209e4ee1bb09aa12e293440db1a0 SHA512 60adc1859837972af7b620de3b163d40020eede421c89977c0669ccd1714c136637e5cde99868d96d5f9f24d7fb48eb3f5f34591f134b5b84ce3eb25a843a7d5
-DIST eigen_stl_containers-0.1.7.tar.gz 2951 BLAKE2B 95202e6076a6ca6ec5d90f77b7849b1bc239e713f5a9c541e472bca84b72ccaac6680b49275ce7cca57757f4f37f371b766bbfe0c669b336f78c9bfed048813a SHA512 e97f3157287fa084a4e59fd2d97a7190c63e48550d8bf7ea124ced1f1a91e60833d27abbe1db0f53767a21c38aca0d53b5dc82d417d3a4eba29b5fe7372ba82e
 DIST eigen_stl_containers-0.1.8.tar.gz 3242 BLAKE2B 8ca2544eb541a6641c20e417ca5574de85181e3c5f0428d862e7fb9b60ee2f70c2851cc8b01e29a6010358014769add42a5d251eb0b5cf2efb6a935463ed47b9 SHA512 1a964aaca26fda9aefe393f6bd6a875633e3b2824d073b7bab035b4199be3513402ed90034192caa9c3e6a5f8a5640ef5aa924e2cc7cef5dc30e4bfdd93526b9
-EBUILD eigen_stl_containers-0.1.4.ebuild 390 BLAKE2B 5c75b7996dd7fc3872deb9cbcc4a76c6a8c034203dc9441dcb18ee6322425fd0d7d29c062a8e3897192823808a7c39b2bb081aaa2ce72523c2b2145c740931a6 SHA512 b09ff48a38d449c2c0f45de49c69ab251b4c862779cf8e364b68f1b9cc99b02d2f06fc92c448cecd7629084dfb8a637502c3dec8c6a703989bb540819c2bda14
-EBUILD eigen_stl_containers-0.1.5.ebuild 390 BLAKE2B 5c75b7996dd7fc3872deb9cbcc4a76c6a8c034203dc9441dcb18ee6322425fd0d7d29c062a8e3897192823808a7c39b2bb081aaa2ce72523c2b2145c740931a6 SHA512 b09ff48a38d449c2c0f45de49c69ab251b4c862779cf8e364b68f1b9cc99b02d2f06fc92c448cecd7629084dfb8a637502c3dec8c6a703989bb540819c2bda14
-EBUILD eigen_stl_containers-0.1.6.ebuild 390 BLAKE2B e20f5970612f0dca5082c8055657b6634545e1aa10d2e080e61a355d4e918d1de59f304f3c781aa2f697bdbb518c8a10f3ff2d72d7503c99a4fbe173bea5c0c0 SHA512 141a0681122137e6692572a449963d4578ae0fe8972a145800260be1276cc54112e1f89b91ba36f543fdf21ced765ddd93df0e1e5d2cd89fa563768cd7c4124c
-EBUILD eigen_stl_containers-0.1.7.ebuild 390 BLAKE2B 4f015c2c54e5b6e8742a180f01397ae973124bc002935f91749deb760841164826de7f26398fc23e4c43406dd369e2b3b8a13ed0e893ae992a607de0b7ae41c1 SHA512 0bdb83503e4d4efe502a078cc48d26d1bf3e20f119eb71ec7d9b44234ea9c8e38036d1fc2fb9b748761284652f67d33cbc4632139147b38b89c75b0f0c5e125f
-EBUILD eigen_stl_containers-0.1.8.ebuild 390 BLAKE2B 4f015c2c54e5b6e8742a180f01397ae973124bc002935f91749deb760841164826de7f26398fc23e4c43406dd369e2b3b8a13ed0e893ae992a607de0b7ae41c1 SHA512 0bdb83503e4d4efe502a078cc48d26d1bf3e20f119eb71ec7d9b44234ea9c8e38036d1fc2fb9b748761284652f67d33cbc4632139147b38b89c75b0f0c5e125f
-EBUILD eigen_stl_containers-9999.ebuild 390 BLAKE2B 5c75b7996dd7fc3872deb9cbcc4a76c6a8c034203dc9441dcb18ee6322425fd0d7d29c062a8e3897192823808a7c39b2bb081aaa2ce72523c2b2145c740931a6 SHA512 b09ff48a38d449c2c0f45de49c69ab251b4c862779cf8e364b68f1b9cc99b02d2f06fc92c448cecd7629084dfb8a637502c3dec8c6a703989bb540819c2bda14
+EBUILD eigen_stl_containers-0.1.8.ebuild 387 BLAKE2B b6790f310cecfeb1ff07f01c14a88bfd81ad927ecd85cfe3621d38e935b0ec13789a8866ca6021aa3bef473916ca71edf671035e732b051dbd4ccc5e33911ed1 SHA512 82bd1c0e45d0086e947a067041d4250f6d481c6840204779aadd3bc4ba2d33ce73486939145afe15740d0bd1a64fcbb9b6c13f2a2da53cf796fd77d6c808ea79
+EBUILD eigen_stl_containers-9999.ebuild 387 BLAKE2B b6790f310cecfeb1ff07f01c14a88bfd81ad927ecd85cfe3621d38e935b0ec13789a8866ca6021aa3bef473916ca71edf671035e732b051dbd4ccc5e33911ed1 SHA512 82bd1c0e45d0086e947a067041d4250f6d481c6840204779aadd3bc4ba2d33ce73486939145afe15740d0bd1a64fcbb9b6c13f2a2da53cf796fd77d6c808ea79
 MISC metadata.xml 338 BLAKE2B 60ed2878337f7236e0da2888249ac635dcac5062cd37348da21c03c1696f13b252c4c54b1f960c15ebe7fe29e4f2b91d8fa952cb014a378d75941cafc1eacb94 SHA512 ccba1e4bcebbb8a9eb820121d330340e335ef2560c3052e3c4558cf7e3764a7909714cdd40aae74b26c0c32f42ead2ddfa1c9b6a64e8386582b93d4aeb024c08
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild
deleted file mode 100644
index c4c7806c3932..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a set of typedef's that allow using Eigen datatypes in STL containers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.5.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.5.ebuild
deleted file mode 100644
index c4c7806c3932..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.5.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a set of typedef's that allow using Eigen datatypes in STL containers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.6.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.6.ebuild
deleted file mode 100644
index 57a2a251503b..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.6.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a set of typedef's that allow using Eigen datatypes in STL containers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.7.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.7.ebuild
deleted file mode 100644
index e36187ab0a96..000000000000
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.7.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a set of typedef's that allow using Eigen datatypes in STL containers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-cpp/eigen:3"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
index e36187ab0a96..d64a546a919d 100644
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
+++ b/dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild b/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
index c4c7806c3932..d64a546a919d 100644
--- a/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
+++ b/dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/eigen_stl_containers"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/filters/Manifest b/dev-ros/filters/Manifest
index 773b73eba041..2ed43b98d499 100644
--- a/dev-ros/filters/Manifest
+++ b/dev-ros/filters/Manifest
@@ -1,4 +1,4 @@
-DIST filters-1.8.1.tar.gz 18815 BLAKE2B a34bf445e7626d1af74bf76267784b30d13acfdb35ba20eed7ebd77ca55271fab646f2670378b54cb75edec1b210683bcaee0c8f5e7b70b081fc0d70a3c5dc73 SHA512 3fd6fc649d64a982b5cf4841c9556413508c0648952c008af623970ab44cd4147c3d7e0ecee9963ebc097b8e2db48b5a40810519d838b862d30f07a88ba06194
-EBUILD filters-1.8.1-r1.ebuild 479 BLAKE2B e7dadc2e9082d6e4bee674a94154a1008bb5130710673a5cb247f8f2fc22dd22f4167742f64cf819e9314e600f344c8b261ddc3587b2fec2814febd929e2347b SHA512 da31ff9af780a41e370688501d5ab59d81f7a021226d43f4a5e438ee15861b5367ceef902dd028b51fede63ba859dc423d04cc1aaae03477209461ab84ffcee0
-EBUILD filters-9999.ebuild 479 BLAKE2B e7dadc2e9082d6e4bee674a94154a1008bb5130710673a5cb247f8f2fc22dd22f4167742f64cf819e9314e600f344c8b261ddc3587b2fec2814febd929e2347b SHA512 da31ff9af780a41e370688501d5ab59d81f7a021226d43f4a5e438ee15861b5367ceef902dd028b51fede63ba859dc423d04cc1aaae03477209461ab84ffcee0
+DIST filters-1.9.0.tar.gz 18865 BLAKE2B 0ef5508cbd32d2af42c38655aef0075b0d16339c4264bac6b3356b96a08b1344a4002c60c9c57af61846615ed28bfbfcd8cff74677e0f70e78778b3cc643c7bc SHA512 df1823a2a2a3e49bdc6c22c7bacfe696bed4eb9fa1f1339854e47e6b2757c8d7a8256c3bbf83154d22f47ae6d79af4a2fc4b878b83ad6eb9445072481326b3d3
+EBUILD filters-1.9.0.ebuild 476 BLAKE2B a7708b09d6850d8cfa3a29ae2ee6549c8c6ea757491d4cbb98e1a3589dc17dbd81e2c8b19c73bcd49f60e6b1d9be60f98bca10e320ebc505a4254d4e2f9ee6c8 SHA512 1e7ad61402814b63e4e7670bc4d89bc8933a6073763cf913ef56bc0f499093e097c9e5587a006b5fb08b2a68f6f00d9c422cb108e97baf1adc107f74702eabb7
+EBUILD filters-9999.ebuild 476 BLAKE2B a7708b09d6850d8cfa3a29ae2ee6549c8c6ea757491d4cbb98e1a3589dc17dbd81e2c8b19c73bcd49f60e6b1d9be60f98bca10e320ebc505a4254d4e2f9ee6c8 SHA512 1e7ad61402814b63e4e7670bc4d89bc8933a6073763cf913ef56bc0f499093e097c9e5587a006b5fb08b2a68f6f00d9c422cb108e97baf1adc107f74702eabb7
 MISC metadata.xml 325 BLAKE2B 30488d99f978ac45d5d92e7aba99a4b2feb88e39702cf4ed5db2e762c45be68fe99fd18a08604da15f72116b509e5a0be4f8d74a2574f88b726db31610b20d7a SHA512 2601fa313386b132cf09dd5c27b9894b1520e1cc6af09f438cc0294a27ebc7e3d2f53f2020d477bef3b0cbd85f244a0651048f9dc1a081f509f19e82f54cee97
diff --git a/dev-ros/filters/filters-1.8.1-r1.ebuild b/dev-ros/filters/filters-1.9.0.ebuild
similarity index 90%
rename from dev-ros/filters/filters-1.8.1-r1.ebuild
rename to dev-ros/filters/filters-1.9.0.ebuild
index 4de9b7a86c06..0047a31e5c1d 100644
--- a/dev-ros/filters/filters-1.8.1-r1.ebuild
+++ b/dev-ros/filters/filters-1.9.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/filters"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/filters/filters-9999.ebuild b/dev-ros/filters/filters-9999.ebuild
index 4de9b7a86c06..0047a31e5c1d 100644
--- a/dev-ros/filters/filters-9999.ebuild
+++ b/dev-ros/filters/filters-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/filters"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
index fc929d12ea36..22bbe74df00d 100644
--- a/dev-ros/gazebo_dev/Manifest
+++ b/dev-ros/gazebo_dev/Manifest
@@ -1,12 +1,4 @@
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
-EBUILD gazebo_dev-2.7.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
-EBUILD gazebo_dev-2.8.4.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
-EBUILD gazebo_dev-2.8.5.ebuild 426 BLAKE2B f3a1c0411f63f023e771d8196cc2bdeade104317a27fa785a70f47909b6a0cb23df920f20452047a7c34fb2f265b2b20065ff09dfe9766d3c320f25e8b523055 SHA512 cc17d8c023011dcfe5a7af0876eea0164611220cac10c26ddd7ff8fcfc5fdbe06b068b9d178072293ca6eed7c4644a12f70c6cd749ef8f3727a2b86774e6769b
-EBUILD gazebo_dev-2.8.7.ebuild 426 BLAKE2B 8fdc674a5cb07104c7b90def41f6f9a7f97341012646d4a6fb933136585f134698fc84e940ff5ed50f181bfc073f9cefbaffbf391f204d4cf4c17dfbb85a4093 SHA512 0fb06d1d8b2a5817eb5ecfb7653975b16ccb4fbd39ac8917eb1de586d68d6988c044442ede6806fd2937d0d7964a073784b6fe073f1507fc478e78707e85a672
-EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_dev-2.9.1.ebuild 414 BLAKE2B c5293e395a3351ed6241633d009f1ca3dae36fb1210788d6de62f296cac9b2b31f3bafd60417caf1360445414104b68c1a388eae2757fac594ee78970634e58b SHA512 ea3e7dfc7259d74da1f464cbe3695af5458ccd2f47a3b977769a92d75b903ae84328504f6fd70c14b1bbcb9b2308fcb300918e3063b6b6f754912d2e6f177bc7
+EBUILD gazebo_dev-9999.ebuild 414 BLAKE2B c5293e395a3351ed6241633d009f1ca3dae36fb1210788d6de62f296cac9b2b31f3bafd60417caf1360445414104b68c1a388eae2757fac594ee78970634e58b SHA512 ea3e7dfc7259d74da1f464cbe3695af5458ccd2f47a3b977769a92d75b903ae84328504f6fd70c14b1bbcb9b2308fcb300918e3063b6b6f754912d2e6f177bc7
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
deleted file mode 100644
index b7ed4eb9139f..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
deleted file mode 100644
index b7ed4eb9139f..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
deleted file mode 100644
index 02ff0da21fb6..000000000000
--- a/dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.8.7.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
similarity index 75%
rename from dev-ros/gazebo_dev/gazebo_dev-2.8.7.ebuild
rename to dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
index 20ebd7592009..07c8fa9a0db0 100644
--- a/dev-ros/gazebo_dev/gazebo_dev-2.8.7.ebuild
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+DESCRIPTION="Cmake config for the default version of Gazebo for the ROS distribution"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
index b7ed4eb9139f..07c8fa9a0db0 100644
--- a/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
+++ b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+DESCRIPTION="Cmake config for the default version of Gazebo for the ROS distribution"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index 2c5eb5300d4b..ed9f2171ce93 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -1,14 +1,4 @@
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_msgs-2.6.2.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.7.3.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.7.4.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.8.4.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.8.5.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-2.8.7.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
-EBUILD gazebo_msgs-9999.ebuild 569 BLAKE2B 4c4470d4e6d924ab245632427f226de4c7923dfa89119d950cd816ac3674754a7efa2b273c8964c34fc6df51ee3efd4bc424845c4bbea6cdfaeb0f520f8b45f7 SHA512 13c1129fbe075af3e061bd0e47351664fd69dad5f1d4ff5cb66d9788d80e6254314f53300e0441761c35d53a7b93bfec81d02737cc8c13b1ba12b4e636611fb0
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_msgs-2.9.1.ebuild 541 BLAKE2B 8640653d846d95b7b2c50820f4528cde68a76b5ff80fad6eeaa9e7f0d921efd13c53db863652af58042612707e62ba7775be916a35f048862221c601169f6c2c SHA512 49bcb8f3dd29b78374ba122f5c89091cafa11d94e190c3bfbae5e027633ee78282deba3d5e699fa1b6b7574c125d8cc26f2f42749b38d87b254065023775b1b8
+EBUILD gazebo_msgs-9999.ebuild 541 BLAKE2B 8640653d846d95b7b2c50820f4528cde68a76b5ff80fad6eeaa9e7f0d921efd13c53db863652af58042612707e62ba7775be916a35f048862221c601169f6c2c SHA512 49bcb8f3dd29b78374ba122f5c89091cafa11d94e190c3bfbae5e027633ee78282deba3d5e699fa1b6b7574c125d8cc26f2f42749b38d87b254065023775b1b8
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.6.2.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.6.2.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.6.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.7.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.8.7.ebuild
deleted file mode 100644
index b8da68f271a3..000000000000
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
-
-inherit ros-catkin
-
-DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.4.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
similarity index 93%
rename from dev-ros/gazebo_msgs/gazebo_msgs-2.8.4.ebuild
rename to dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
index b8da68f271a3..8e7fc5d60e03 100644
--- a/dev-ros/gazebo_msgs/gazebo_msgs-2.8.4.ebuild
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
index b8da68f271a3..8e7fc5d60e03 100644
--- a/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index dd17276b0c7e..2a91935fd4ca 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,5 +1,4 @@
-AUX ocv4.patch 557 BLAKE2B 65adfeae5045dc21b29193a7bcbbf22cb4649425d551b8710bc557cbcf13f04f00fb319a2ea8962cd4cd4dd08976ad0257897f37a746410c59af12cd2cd4857d SHA512 335f85ee02cc1b54504d33fb8c06b49fb80f1d1e7bbb427870718a0adc92227bff9ba4ecfc7e6e7dc8f4bf95a404ef2d7894305504b4fe9f97ceeda84f4f2a5d
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_plugins-2.8.7.ebuild 1415 BLAKE2B a6dbfc7f5c2f6bc6c6b97faf626458a4a4e439be31bd91dc5fcf603b999bc13e5ad46bb5f01f4533329e05f6c29e50eb4a14f2699e53905fc48b481d22d53e8b SHA512 e893574f0285188529395c524dbe67bda5b1b95b3c32cfc0466d49a33f76173fdacdcbc1f9cd0893b5f338bfda582856613760b2faef535e6e456be0602db341
-EBUILD gazebo_plugins-9999.ebuild 1415 BLAKE2B a6dbfc7f5c2f6bc6c6b97faf626458a4a4e439be31bd91dc5fcf603b999bc13e5ad46bb5f01f4533329e05f6c29e50eb4a14f2699e53905fc48b481d22d53e8b SHA512 e893574f0285188529395c524dbe67bda5b1b95b3c32cfc0466d49a33f76173fdacdcbc1f9cd0893b5f338bfda582856613760b2faef535e6e456be0602db341
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_plugins-2.9.1.ebuild 1378 BLAKE2B f9997fdb9ba0b9b2c622a96fd851bc610ff2bcb3a219df1e0a32573ddb8d58c8b56479846c6d691c34abffbbfc01ad7c91c5f9155193b1a787de39a963ff38d0 SHA512 16d60a639e6e09de51afc57375b74a16cfba1487564791a1a4b865c315aa2384cfd2911ba43b3990cb119fb73207fbb447c0680fc9079c0f4115533571762338
+EBUILD gazebo_plugins-9999.ebuild 1378 BLAKE2B f9997fdb9ba0b9b2c622a96fd851bc610ff2bcb3a219df1e0a32573ddb8d58c8b56479846c6d691c34abffbbfc01ad7c91c5f9155193b1a787de39a963ff38d0 SHA512 16d60a639e6e09de51afc57375b74a16cfba1487564791a1a4b865c315aa2384cfd2911ba43b3990cb119fb73207fbb447c0680fc9079c0f4115533571762338
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/files/ocv4.patch b/dev-ros/gazebo_plugins/files/ocv4.patch
deleted file mode 100644
index 6d93feac4be9..000000000000
--- a/dev-ros/gazebo_plugins/files/ocv4.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: gazebo_plugins/src/gazebo_ros_prosilica.cpp
-===================================================================
---- gazebo_plugins.orig/src/gazebo_ros_prosilica.cpp
-+++ gazebo_plugins/src/gazebo_ros_prosilica.cpp
-@@ -44,10 +44,8 @@
- #include <diagnostic_updater/diagnostic_updater.h>
- #include <sensor_msgs/RegionOfInterest.h>
- 
--#include <opencv/cv.h>
--#include <opencv/highgui.h>
--
--#include <opencv/cvwimage.h>
-+#include <opencv2/core/core_c.h>
-+#include <opencv2/highgui/highgui_c.h>
- 
- #include <boost/scoped_ptr.hpp>
- #include <boost/bind.hpp>
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
similarity index 97%
rename from dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
rename to dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
index cb8474d4c001..d73dd8387e93 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
@@ -52,4 +52,3 @@ DEPEND="${RDEPEND}
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
index cb8474d4c001..d73dd8387e93 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
@@ -52,4 +52,3 @@ DEPEND="${RDEPEND}
 	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index c9e87f7065cd..df171650eb97 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -1,15 +1,4 @@
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
-EBUILD gazebo_ros-2.7.3.ebuild 1282 BLAKE2B 2ad6a1a6e9a192a34ac8140b20ebc4787a31971d176e4ddd7f929746b1d694955e50b166f732908906ee1b5385dd51cbca746ee1ff4727e48948fca8c3ce0f37 SHA512 5d25298b56befcd572bd1939b075ed34a772410e10ebe73975a6e1f756e10bd090a2cd4776fa4bda21bd994ed1cce20155a1dae02bf8918e46259228ec3c43f8
-EBUILD gazebo_ros-2.7.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
-EBUILD gazebo_ros-2.8.4.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
-EBUILD gazebo_ros-2.8.5.ebuild 1026 BLAKE2B befc99333d36e2366eb794f9d2a820a310759ec9aa3e573d382f7fa7aac1e1499d8c1d7844e9343843ef66012a38e9a22781471e8c496758dce10360144f5961 SHA512 373e347c174d56497d381d3e0c6a76795caaeea32c083e878fd245b012b661c9385da8f51e19282f06ff7595fddf40ac0f573c491cc21ee1abf0611dfe1da35b
-EBUILD gazebo_ros-2.8.7.ebuild 1026 BLAKE2B df4eeb0fce0223ce1fcc82edd1f86803dc8976ee18817aba06785284df4de4fa058fa8006d83d6150b5148c149bdda6d2c5d161d55879f0363e1a082b287aceb SHA512 92d9f63c5fe95142d6dbc89c83392f93ead16c9f0895cfae48c34c6b892e573f8e118ef7426f5c12d9f0122c577ca2c5f73877feed58272bb6a8fd4e795d73e2
-EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_ros-2.9.1.ebuild 1064 BLAKE2B fb57a2fe1a878314935f2e200ae6e7cee335c5398780ccb8d88e853dd94d705c9dc9ee8091cd54f7e98248329451412de6c569a6dd9e099c9c6655a794aefa13 SHA512 b4e0e0388217e21e3a927391b898c70b2e1bb01f8cd0151a3364462dd6bc6df4601039dda66a16b78b2085c079c85123e582dbf26ff629d84ffb201a0fccc54a
+EBUILD gazebo_ros-9999.ebuild 1064 BLAKE2B fb57a2fe1a878314935f2e200ae6e7cee335c5398780ccb8d88e853dd94d705c9dc9ee8091cd54f7e98248329451412de6c569a6dd9e099c9c6655a794aefa13 SHA512 b4e0e0388217e21e3a927391b898c70b2e1bb01f8cd0151a3364462dd6bc6df4601039dda66a16b78b2085c079c85123e582dbf26ff629d84ffb201a0fccc54a
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
deleted file mode 100644
index 168e26eb91b1..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
deleted file mode 100644
index 191679505052..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
-	pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
-	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	popd || die
-	ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
deleted file mode 100644
index ca217b085352..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
deleted file mode 100644
index ca217b085352..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
deleted file mode 100644
index 107dee905b18..000000000000
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_HAS_MESSAGES=yes
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/gazebo_dev
-	dev-libs/tinyxml
-	sci-electronics/gazebo:=
-	dev-libs/protobuf:=
-	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/dynamic_reconfigure
-	dev-libs/libxml2
-	dev-libs/boost:=[threads]
-	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
similarity index 64%
rename from dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild
rename to dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
index 254d5552bb46..fcbce5b78daf 100644
--- a/dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
@@ -1,16 +1,15 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
@@ -27,10 +26,13 @@ RDEPEND="
 	dev-ros/dynamic_reconfigure
 	dev-libs/libxml2
 	dev-libs/boost:=[threads]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
 	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
index ca217b085352..fcbce5b78daf 100644
--- a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
+++ b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+DESCRIPTION="ROS plugins that offer messages and services for interfacing with gazebo"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
@@ -27,10 +26,13 @@ RDEPEND="
 	dev-ros/dynamic_reconfigure
 	dev-libs/libxml2
 	dev-libs/boost:=[threads]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
 	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 32c5f14d59d4..06e066a76788 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -1,16 +1,4 @@
-AUX urdfdom1.patch 590 BLAKE2B bd90ab431b09a009e19d664e1161cfe07d5f4783827dbb364c9ef9816fe7ba208ef3ca0dc7b3fd4a6c9c7127ec964e5de6c66045865c4a6742cd93d1e8cb7677 SHA512 8476e9ba0a1f1977de88f299c5222f72361be8c334a37d1f4c7834c311f6a4cad2a49553d5fcee67ef5e9f2d164855dc89671958c2d069a7f6a301c3a43891dc
-DIST gazebo-ros-2.7.3-patches-1.tar.bz2 19057 BLAKE2B ee8040e7f25d734d31c32963d47601b908b153a55294e736e49d1a10ea14a9ed74133e547eb1abf5d50ee70814f6b3476433e835cc604798057cb9d5a698a3aa SHA512 12ec281277f83c7a267fc111ec029b732435f50f320c74255eeb8e8ea7b38aa8771d08c9815d6525b22b7f2fe706aae087a33591082cddbcf7a46742a35ae0fb
-DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
-DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42451479434839a10ecebc1993ad57ffecf78b1f67013fe54919477a252ef547ab5ed768b4f0303de7395e6a693e1aafced1 SHA512 43c1fed13a653a93df85110d49fcd5d324b80e080cdef08ad15cd293d25b0eca59ec9610e420074f2bf406567a79a8c0b8ae88a289981626f2f5be1dc8b06c22
-DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
-DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
-DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
-EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
-EBUILD gazebo_ros_control-2.7.3.ebuild 975 BLAKE2B 6c89cd3e49119edcd893a7f764d359035a08774b429f3b458178614f60dd0db9488f2c68f35f85c24cc100cd4705403e8b99df0a8fab1ce49a9b31c8c98c23d4 SHA512 94554d46030657d71e14614c0f297ad9e7541ef08bb601a2e8578d7187e31186c997f8298626a07b28d8110c8017e0cc129b4c07ab8831cf14c1c8df774a4e60
-EBUILD gazebo_ros_control-2.7.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
-EBUILD gazebo_ros_control-2.8.4.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
-EBUILD gazebo_ros_control-2.8.5.ebuild 719 BLAKE2B 5ff337b05ffaf84f0ba0e11b1b681e7e31e86af8c3829916404b85c4516e2ac080f42ff38f6bc9e2e432bc19930059ea627a4d3fa6b2432f1553eb2b8093d10d SHA512 4598b1d44a404b4ece5d67379c85798bf8db7c9d2e0580a7afb73d35ccad375bb68b95a566fba1a2e7c721a449a62b84f2d51552c3eb76619ee8acdccf5caadc
-EBUILD gazebo_ros_control-2.8.7.ebuild 719 BLAKE2B 483855692f3b863287a79e05125f097dd0bb4708c00658019140c3c56f20fb036c7803b88905875a0044da48f052eed1cd78580c988f3139573c7b8e6bdb7e3a SHA512 aece3d186009bcef502fc6d1296fd2aead0808d1a652783181cf53abd4b626f3f77e6eec29d6c4f5b5312e01c28dd4027b34f53edbef97be24cc6a9af322832a
-EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
+EBUILD gazebo_ros_control-2.9.1.ebuild 719 BLAKE2B 5b9b62e64ed6cda669bd10cd66aae557a64ccdee6a253adcfcc9a0f583b91525176cc99cc92db51a38c0805bda246ed86b8991c4ba0b2ca552262a17647f1af9 SHA512 8fe67b9f2ec26bfb0afe7b23eef6506b9407e704f62c1fb0b39d37e21c79812b599994879e6b3a0ada2e6acb0496ef711b3429277bb1fc7f7f2670a994b37a47
+EBUILD gazebo_ros_control-9999.ebuild 719 BLAKE2B 5b9b62e64ed6cda669bd10cd66aae557a64ccdee6a253adcfcc9a0f583b91525176cc99cc92db51a38c0805bda246ed86b8991c4ba0b2ca552262a17647f1af9 SHA512 8fe67b9f2ec26bfb0afe7b23eef6506b9407e704f62c1fb0b39d37e21c79812b599994879e6b3a0ada2e6acb0496ef711b3429277bb1fc7f7f2670a994b37a47
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/files/urdfdom1.patch b/dev-ros/gazebo_ros_control/files/urdfdom1.patch
deleted file mode 100644
index 0da763186ca9..000000000000
--- a/dev-ros/gazebo_ros_control/files/urdfdom1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gazebo_ros_control/src/default_robot_hw_sim.cpp
-===================================================================
---- gazebo_ros_control.orig/src/default_robot_hw_sim.cpp
-+++ gazebo_ros_control/src/default_robot_hw_sim.cpp
-@@ -381,7 +381,7 @@ void DefaultRobotHWSim::registerJointLim
- 
-   if (urdf_model != NULL)
-   {
--    const boost::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name);
-+    const std::shared_ptr<const urdf::Joint> urdf_joint = urdf_model->getJoint(joint_name);
-     if (urdf_joint != NULL)
-     {
-       *joint_type = urdf_joint->type;
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild
deleted file mode 100644
index 778913a057cc..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
deleted file mode 100644
index 0a2bc106d8c0..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin eutils
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-SRC_URI="${SRC_URI}
-	mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2"
-
-src_prepare() {
-	pushd "${WORKDIR}/gazebo_ros_pkgs-${PV}" || die
-	EPATCH_FORCE=yes EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
-	popd || die
-	ros-catkin_src_prepare
-}
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
deleted file mode 100644
index e824028e5285..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild
deleted file mode 100644
index e824028e5285..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
deleted file mode 100644
index c98bd84a588a..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_dev
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo:=
-	dev-libs/boost:=[threads]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild
similarity index 99%
rename from dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild
rename to dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild
index 886fb0efaaf6..69cdfcc93cd1 100644
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
index e824028e5285..69cdfcc93cd1 100644
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/gennodejs/Manifest b/dev-ros/gennodejs/Manifest
index 23a0e65e2242..16b0e322953a 100644
--- a/dev-ros/gennodejs/Manifest
+++ b/dev-ros/gennodejs/Manifest
@@ -1,4 +1,4 @@
 DIST gennodejs-2.0.1.tar.gz 14902 BLAKE2B 36e2531addf02cf16c75e8186aaa3722c973b5ae9a70377d1e8b59cc4f5f5e33214198736c432fbbca14cd44c065d637009764a16ae4c4ada0bf1288a68f76cd SHA512 53a518e494235b5858497385a31407fee06337ab01fd0733201af2cf916a76a3b81098f12a12e38ac0945b04a5ddabb1a155d14f4fd3023591d3e478e31d3648
-EBUILD gennodejs-2.0.1.ebuild 477 BLAKE2B 72138ac25876db6583a875307889e880f21613510ba66c0255f2b377eea5c765d9d6db5ea7254dc8610f0f0b0db6f034f27716caf71558f2b6f556f68cffddca SHA512 261a2d88e8e6b099565588efa6a68fc4cf8502ed8d784e572badd9b255c0b54142a23bd9f8062deee5bd1d8678dd98479110501302da7fa5466ee3dc560a2e28
-EBUILD gennodejs-9999.ebuild 477 BLAKE2B 72138ac25876db6583a875307889e880f21613510ba66c0255f2b377eea5c765d9d6db5ea7254dc8610f0f0b0db6f034f27716caf71558f2b6f556f68cffddca SHA512 261a2d88e8e6b099565588efa6a68fc4cf8502ed8d784e572badd9b255c0b54142a23bd9f8062deee5bd1d8678dd98479110501302da7fa5466ee3dc560a2e28
+EBUILD gennodejs-2.0.1.ebuild 437 BLAKE2B b99d390ce243bdf1d7f4af7120191683b483a64be11a124e7c03067ea04b5cbb4d80e71e32651fc87475353fa887ea328bd7986e1eed126b0afc92209e1a4312 SHA512 77145f04da2b8605d8ea3ee4a9ff90fc824fe4d6ee12df039d55fe5e457993205dc697a5ca562590b605422f9eb1d74e86b42631f2cbf035f3250700bec902e4
+EBUILD gennodejs-9999.ebuild 437 BLAKE2B b99d390ce243bdf1d7f4af7120191683b483a64be11a124e7c03067ea04b5cbb4d80e71e32651fc87475353fa887ea328bd7986e1eed126b0afc92209e1a4312 SHA512 77145f04da2b8605d8ea3ee4a9ff90fc824fe4d6ee12df039d55fe5e457993205dc697a5ca562590b605422f9eb1d74e86b42631f2cbf035f3250700bec902e4
 MISC metadata.xml 350 BLAKE2B 1ebaa467c6cdc15850439e260685172ef9c00f5b004f628b8c600b077a96b920567f404f943810640d6e383f21c249b8f4179dbe68549dd148a7bb7e3f806b77 SHA512 42fac74570a816402422ae5dc0923ca8a39e41229c895fcba7c7bdc261326b3b540fafb926c238ddebf99152a54e89376fa2f11112c3849e69225391af3daed7
diff --git a/dev-ros/gennodejs/gennodejs-2.0.1.ebuild b/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
index e9830ab0e418..fe14d28c76ed 100644
--- a/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
+++ b/dev-ros/gennodejs/gennodejs-2.0.1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/RethinkRobotics-opensource/gennodejs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/gennodejs/gennodejs-9999.ebuild b/dev-ros/gennodejs/gennodejs-9999.ebuild
index e9830ab0e418..fe14d28c76ed 100644
--- a/dev-ros/gennodejs/gennodejs-9999.ebuild
+++ b/dev-ros/gennodejs/gennodejs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/RethinkRobotics-opensource/gennodejs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/geodesy/Manifest b/dev-ros/geodesy/Manifest
index cae190019742..45d859133907 100644
--- a/dev-ros/geodesy/Manifest
+++ b/dev-ros/geodesy/Manifest
@@ -1,6 +1,8 @@
 DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
 DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
+DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
 EBUILD geodesy-0.5.2.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
 EBUILD geodesy-0.5.3.ebuild 922 BLAKE2B 64d71fb96af8e464eef79ace35a2dbde3e872f700722564954749db2340915e52ee2fd2024e748e32e73deb2582645d0b23ee16fff098e7b2d22bf7d0afd34c4 SHA512 c700061f025f946a9ff4d53172c55a3df92c4f32cfaff97454c471293f978b39e46c05ebbeea7ce0d92cb1ba891e6d5d43c24157cf197159886a9d1a59a19f00
-EBUILD geodesy-9999.ebuild 922 BLAKE2B 170b34114ed6956bfdc5ef882506f98fc204eba06c7d8170a856a4755227f04e89fddabfa136b440bf41b392535a6380cbb62f7fa460158560af70d8f684b331 SHA512 f6bfc50f7a3a6ee2adc0d289b8c228d6ef6a5b81cbb871aa2bc5eb199dc3279ac31dcb53ee21024e98eab14f6a9192c8d3043dfee53ce3a686955770361105a6
+EBUILD geodesy-0.5.5.ebuild 913 BLAKE2B 32b192175834166e9cf5712fe137b6f4f8ee7f698e3704ff90cb82a735f64b945a35dbe71fa7b80f54b5fdad8a5b20c3130a65937f69c5c469ce71bf5569078c SHA512 b1af9232799256f82d0bd4bc1d6bfc398c6e94acb20b00cd2118411e3752f32587ceef3934220da76e78766a100c0f3dd3e50fd28a2525812e5aa2c3f2ff4d3b
+EBUILD geodesy-9999.ebuild 913 BLAKE2B 32b192175834166e9cf5712fe137b6f4f8ee7f698e3704ff90cb82a735f64b945a35dbe71fa7b80f54b5fdad8a5b20c3130a65937f69c5c469ce71bf5569078c SHA512 b1af9232799256f82d0bd4bc1d6bfc398c6e94acb20b00cd2118411e3752f32587ceef3934220da76e78766a100c0f3dd3e50fd28a2525812e5aa2c3f2ff4d3b
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/geodesy/geodesy-0.5.5.ebuild b/dev-ros/geodesy/geodesy-0.5.5.ebuild
new file mode 100644
index 000000000000..359c415f7f2f
--- /dev/null
+++ b/dev-ros/geodesy/geodesy-0.5.5.ebuild
@@ -0,0 +1,34 @@
+# 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-geographic-info/geographic_info"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ interfaces for manipulating geodetic coordinates"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/angles
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/unique_id
+	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	test? (
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/geodesy/geodesy-9999.ebuild b/dev-ros/geodesy/geodesy-9999.ebuild
index ea8aaeb6424f..359c415f7f2f 100644
--- a/dev-ros/geodesy/geodesy-9999.ebuild
+++ b/dev-ros/geodesy/geodesy-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -17,9 +15,8 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/angles
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/tf
 	dev-ros/unique_id
 	dev-ros/uuid_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
@@ -27,6 +24,9 @@ RDEPEND="
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? (
 		dev-ros/rosunit[${PYTHON_USEDEP}]
 		dev-cpp/gtest
diff --git a/dev-ros/geographic_msgs/Manifest b/dev-ros/geographic_msgs/Manifest
index a22c2730cea1..1a158875425d 100644
--- a/dev-ros/geographic_msgs/Manifest
+++ b/dev-ros/geographic_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST geographic_info-0.5.0.tar.gz 27102 BLAKE2B 40d635f8fdd0fbb034649e03f8917f9f7be207a5e30ba3afb25bbbf3b24a83a23ec3d4a94ff9f91ececda46e8ea167c989552b414c87b3c448513f2ea72e4d40 SHA512 c6c4937a7c9873c071be9e3fc4fcdb99f831028dce93793e537f8819e2fb8633b995e7d46d7192ddc3457a3b79d27c54c3e0b6656af30e2daabf1f0e7dff9f05
 DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
 DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
+DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
 EBUILD geographic_msgs-0.5.0.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
 EBUILD geographic_msgs-0.5.2.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
 EBUILD geographic_msgs-0.5.3.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
-EBUILD geographic_msgs-9999.ebuild 551 BLAKE2B a646000efd2f3d9e9f6e2c04ada587a49a00f751d6cd0ecf342af9a30eabb74303b59c104704fa70049c212a7a54f2756019c37e9596d64c5878e286c558e0ab SHA512 de80886482513b1b6d14927e880a9c6326dd591c7a944327f675519a7c09c4e4859910dd0d78a308b00720d8c62aa0d20cbc838631c7d3801ce165a67473a365
+EBUILD geographic_msgs-0.5.5.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
+EBUILD geographic_msgs-9999.ebuild 483 BLAKE2B b407d4afa03e79e4116527cea8b7b52e7999ec8593158a955b7c1b244475c3316c45fc14b5bb5f5cf108e2ba8491e950fabfea0ec1f39adc79ec5b394792622d SHA512 fc850fd7150f3ee12b02be14bff6cd5a43c65a69485cc2a5584a9b86e75f216b0b1ed03172beb258361e02c44108b642f849a5518bbebfd3367f96d5c78e7747
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.3.ebuild b/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
similarity index 52%
rename from dev-ros/audio_common_msgs/audio_common_msgs-0.3.3.ebuild
rename to dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
index 55090b9ba792..f04fb523fac4 100644
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.3.ebuild
+++ b/dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
@@ -1,16 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
+EAPI=7
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for transmitting audio via ROS"
+DESCRIPTION="ROS messages for Geographic Information Systems"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild b/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
index e0c349885f80..f04fb523fac4 100644
--- a/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
+++ b/dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=geographic_info-
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs dev-ros/uuid_msgs"
 
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index ce46ec89f028..b30b678c46f2 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,4 +1,4 @@
-DIST geometric_shapes-0.6.1.tar.gz 62249 BLAKE2B 3c28bbe1fb987364f1e7c5b780f22b5927169b49b8d48c2dbe9def262e8f0c7e95799772cd07e6247501e62841c04590b92a58ef2d6b409b974bf259acdadd4e SHA512 bdfd9f0a710bdee0b80e1dbddd545a3e311c992853d9ccff5672c5815ed64f8c7c69cae355e8b91bb89085301e8e9cf0eb27310f3e0a4bd252fb622fc494ef19
-EBUILD geometric_shapes-0.6.1.ebuild 700 BLAKE2B 565287501a45b3c42bf12d7a5b0ac8177dc34dc41562ca5b3acb7bb21fe675ada2c6cb4a37e97da4c9a653118f73759a38696e31dd2f04b1aaeb0091e5c8d79e SHA512 bc4f6bf9d90570a23b8303d94dce35bf77beaafa5e7de7b66d273f25f26e39cc11d4dbb26d07e5e47c57eb9431ead1eb25856f0c7d2b583056764ff9ca267eb8
-EBUILD geometric_shapes-9999.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
+DIST geometric_shapes-0.7.0.tar.gz 84518 BLAKE2B 948f84959c526f6155bc9769a264cc631e04171ee22bedb435667668c621c3ca2d983d7b2b964690735b3b48b8ed71058c32aefc67d6370da3cc0528ed448f3e SHA512 9f5886841dfc23db40e68d69a386879ec0b93c03faea6f2e6e33d92b303c314fbba6cfdf548e6236424d5d0131209824e0a8bc116bd64015688c2fd477eb44f0
+EBUILD geometric_shapes-0.7.0.ebuild 700 BLAKE2B 71f54ffd7c7d53e5770f7c081d027ac4b26af8364e8673bb1cda6f0c8e72926cfa979eaa161b12ea2a5d60b5ee96f7ff7fba3e2058dcc12d64893d11a1a5075f SHA512 cd89cc3efec9ffd1e8c0833c4fc92b5065c6994eea17adf534a7f0ac4746f0929628ff921b74cb8d0ec7064100e284fd893ba07b43262bfcc26e02a70461087f
+EBUILD geometric_shapes-9999.ebuild 700 BLAKE2B 71f54ffd7c7d53e5770f7c081d027ac4b26af8364e8673bb1cda6f0c8e72926cfa979eaa161b12ea2a5d60b5ee96f7ff7fba3e2058dcc12d64893d11a1a5075f SHA512 cd89cc3efec9ffd1e8c0833c4fc92b5065c6994eea17adf534a7f0ac4746f0929628ff921b74cb8d0ec7064100e284fd893ba07b43262bfcc26e02a70461087f
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
similarity index 93%
rename from dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild
rename to dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
index 6a90d81c7883..043a80b16c99 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
 KEYWORDS="~amd64 ~arm"
 
@@ -21,10 +21,10 @@ RDEPEND="
 	dev-ros/random_numbers
 	dev-ros/resource_retriever
 	dev-ros/eigen_stl_containers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-cpp/gtest dev-ros/rosunit )
 "
diff --git a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
index 80708cfa63ea..043a80b16c99 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
 KEYWORDS="~amd64 ~arm"
 
@@ -21,10 +21,10 @@ RDEPEND="
 	dev-ros/random_numbers
 	dev-ros/resource_retriever
 	dev-ros/eigen_stl_containers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-cpp/gtest dev-ros/rosunit )
 "
diff --git a/dev-ros/gmapping/Manifest b/dev-ros/gmapping/Manifest
index da87d350f1d1..52237b02c614 100644
--- a/dev-ros/gmapping/Manifest
+++ b/dev-ros/gmapping/Manifest
@@ -1,7 +1,4 @@
-AUX boost170.patch 428 BLAKE2B 047a099ab5a36f3f603ecc10b5cf1e0edb25c880bf1ade298dfcfef7864bb9c445f2f0902299857003d8e32dcf7612ad149a70364fb6fa64fa86b84b620b346b SHA512 e9a2bb68993387b4ac6268d15151a4feedf1c6f73c84ee927590220edc1b826e18355fa3553d3605ca1afabd5b7b74b7e8c242797965b17fa9aa7449b406c493
-DIST slam_gmapping-1.3.10.tar.gz 21032 BLAKE2B cca0779e64d45622dad4ec29cb3c1d0162176038288c0aa7b117f1a76a7655f3af3024dba7ff1025948e400e0176794a553e357a235187d9196161a635ab6d01 SHA512 fa4485ddc9fcfaac63a63d209a5a994e33e78546a39edcf47eb3c3f1775f0d87a1f562319058868838990bbf85a9515ff0228779dce7531148f208b3522e7e7a
-DIST slam_gmapping-1.4.0.tar.gz 21123 BLAKE2B 088d1bfaa69bf98eb2b2176afbfadf843f5f478f9c54dc7eb32fa91116da31bab66f9a1ac09d0535629cc5a7f604d153c90c5a25f173fb867369aa9e33d4d7b2 SHA512 ae7984716113e24e1bced88523729481829303a2b88d247b8fc8bdd23c0f38b4ce6260d7086d79a6653ecfdbe8ba60ae011af20180ffcb5025cd9d347d3e76b1
-EBUILD gmapping-1.3.10.ebuild 546 BLAKE2B 9a6c5e78a43ba77c86dd2a1640ef56bcd2f481a830c3333ab4b87f84f4c761c8728e811e5e314b5eed9809e987fd2b8a0a72aaf58b62f6c4dea561d2101682ad SHA512 41823e5fad9201ca764d2a22af8de2c88b19e449f8d2fec8682a5d21381e35f29a17b729d3b5cc5faacd50057fe5e69b110f7756b414b859528656bea3a963b8
-EBUILD gmapping-1.4.0.ebuild 572 BLAKE2B d57a0f72d1343457fef74a3da8cd76103526209a99a2ab4ebcf815672ed387aa4d6504068f3da6d3441e6e51147565a0c200ab9ba109e54d6b77a3bd0d86f260 SHA512 b64efeb32bc2b14c13a3e898358a8ed7094e1d7bbc201333ac850794583a4c309ddaa61229fc2d99f67a4b8e55879ab0ec256e82b4223f9fcf8fc2dd389abe8a
-EBUILD gmapping-9999.ebuild 531 BLAKE2B 3674f6396da0e8f9dc6b0bbb16e5d627678b02a03807775f54fc7f26910cfe918b00445b780918b74ade87a304543b632c08580cc205aba1e5ab5bceb0b3f260 SHA512 019a01e8efeb054beaa804025619988c5b42ea220621c27b57deb0da4069aa3a964f10f897aa255bf09ffb7be07a3177d305bd7e747c0ec769769ddabc7d475c
+DIST slam_gmapping-1.4.1.tar.gz 21258 BLAKE2B 61b6ee8064be43a3f6e1cafba4efb24b9cf9faa471f749539dcf5aaba9a027885f32549f9df465b88cf02a38f7ebca8fdea469880512298ab0ebf221a3e18bfb SHA512 adc458a033ed0c573a1099ff8c8164d5157b5fd94efafa92fc3a45bcde86a0754f582e87743289637c2f6f7632557ac924ed2cf62d89b15f1a47b822773dbdba
+EBUILD gmapping-1.4.1.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
+EBUILD gmapping-9999.ebuild 531 BLAKE2B d595c9abb5a92e4e48dbdcd8409fdb2e7f9603082c74396c65e880f39e82da0b7c91f04c790162162eea9db6ce36637d62d150a3c7c9bba20e9714000ed0df20 SHA512 5262716319562be75fd623bf4a3b6fb199cb2692ff8b92614c49c56f8f0a04591d88d153b4972f184eecc9cde1be15c36cd7d73c07ff59c809d0d27ab37a8265
 MISC metadata.xml 342 BLAKE2B 72a1fe4f1e7971418dbb3f5b1e78de71a77819b9fa7200feb2ce0abec5b50a5435c5e5541d290bfd23c7acee5a6920280934067c84e4716bd9f6bb0cc634544d SHA512 2a5beef664e8c79b9e4d858d0dc093068c6e462456ae6066ea637f4b725e5c7184dd65769906c34e55eb6b03949e957edba34b84a587e1daec784e1f74ea287c
diff --git a/dev-ros/gmapping/files/boost170.patch b/dev-ros/gmapping/files/boost170.patch
deleted file mode 100644
index e3a599471991..000000000000
--- a/dev-ros/gmapping/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gmapping/CMakeLists.txt
-===================================================================
---- gmapping.orig/CMakeLists.txt
-+++ gmapping/CMakeLists.txt
-@@ -3,7 +3,7 @@ project(gmapping)
- 
- find_package(catkin REQUIRED nav_msgs nodelet openslam_gmapping roscpp tf rosbag_storage)
- 
--find_package(Boost REQUIRED signals)
-+find_package(Boost REQUIRED)
- 
- include_directories(${Boost_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
- 
diff --git a/dev-ros/gmapping/gmapping-1.4.0.ebuild b/dev-ros/gmapping/gmapping-1.4.0.ebuild
deleted file mode 100644
index aaad570edc05..000000000000
--- a/dev-ros/gmapping/gmapping-1.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/openslam_gmapping
-	dev-ros/rosbag_storage
-	dev-ros/gmapping
-"
-DEPEND="${RDEPEND}
-	dev-ros/rostest"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/gmapping/gmapping-1.3.10.ebuild b/dev-ros/gmapping/gmapping-1.4.1.ebuild
similarity index 86%
rename from dev-ros/gmapping/gmapping-1.3.10.ebuild
rename to dev-ros/gmapping/gmapping-1.4.1.ebuild
index ca6f43afe50c..c3d87b4563b2 100644
--- a/dev-ros/gmapping/gmapping-1.3.10.ebuild
+++ b/dev-ros/gmapping/gmapping-1.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -9,13 +9,12 @@ ROS_SUBDIR=${PN}
 inherit ros-catkin
 
 DESCRIPTION="ROS wrapper for OpenSlam's Gmapping"
-LICENSE="CC-BY-NC-SA-2.5"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-ros/tf
 	dev-ros/openslam_gmapping
@@ -23,4 +22,5 @@ RDEPEND="
 	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rostest"
diff --git a/dev-ros/gmapping/gmapping-9999.ebuild b/dev-ros/gmapping/gmapping-9999.ebuild
index 307f03f929b1..c3d87b4563b2 100644
--- a/dev-ros/gmapping/gmapping-9999.ebuild
+++ b/dev-ros/gmapping/gmapping-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/slam_gmapping"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,7 +15,6 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-ros/tf
 	dev-ros/openslam_gmapping
@@ -23,4 +22,5 @@ RDEPEND="
 	dev-ros/gmapping
 "
 DEPEND="${RDEPEND}
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rostest"
diff --git a/dev-ros/hector_compressed_map_transport/Manifest b/dev-ros/hector_compressed_map_transport/Manifest
index 8ecc656ebc3e..e13e3f628a04 100644
--- a/dev-ros/hector_compressed_map_transport/Manifest
+++ b/dev-ros/hector_compressed_map_transport/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_compressed_map_transport-0.3.5.ebuild 681 BLAKE2B 9cf4298c6f7ea184628c57b73fc0f75503dffb7045e73baf16b7b1961ee9c1dbf0f4d96e57c6b7c12e408a90f069f63d4e9626106a1756dbd30e7afa8ab25843 SHA512 16ab28ea3883791d0083f78f6b883001f3de49eb381762ab15e56fc64105a5956d7cdb2e4f584dca8a714728f1a2a59d46dd2f36c8cf00c399de10fa97c7476b
-EBUILD hector_compressed_map_transport-0.4.0.ebuild 678 BLAKE2B 2c8bbe5a4fa8a0b325d9c794d27d1aa08b7e3b0f8503f4ac6a9a0ecda294179f87802232f737fe85dc46a133bcb14883acb0d55ed65c50ed0035137b6350bd4c SHA512 5f1692fe97dd8cb1276cd50954bfd18d29f7bfc09a4e72194ffde1fdef60511d3d7281f205dba2a859307845df5722fd41c5ed46069f9b3b5d64aa01c2d66ef7
-EBUILD hector_compressed_map_transport-9999.ebuild 681 BLAKE2B 9cf4298c6f7ea184628c57b73fc0f75503dffb7045e73baf16b7b1961ee9c1dbf0f4d96e57c6b7c12e408a90f069f63d4e9626106a1756dbd30e7afa8ab25843 SHA512 16ab28ea3883791d0083f78f6b883001f3de49eb381762ab15e56fc64105a5956d7cdb2e4f584dca8a714728f1a2a59d46dd2f36c8cf00c399de10fa97c7476b
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_compressed_map_transport-0.4.1.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
+EBUILD hector_compressed_map_transport-9999.ebuild 678 BLAKE2B 347105c139dad0aefe18fb25051b778e61e332e15e9a47c6bd5241f2e074d51ec40b4c78f2d5212e78e11390def6ac4a251bf4e3f7e3c3e274d17cc8d4c83e73 SHA512 9f60acb8ecb6fa9dfed30e7bdd986c37941b9c4e8b2bc8dc16503bc68a43ffbaf60a1bad6679e6d67b4698b67ae08661c57b5ebc96a51ab762dd47c955d52c2b
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild
deleted file mode 100644
index 18ab3858d785..000000000000
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Means for transporting compressed map data through the use of image_transport"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	media-libs/opencv:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/hector_map_tools
-	dev-ros/image_transport
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
similarity index 93%
rename from dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
rename to dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
index 023fcb3fe456..74e246177533 100644
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,12 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/cv_bridge
 	media-libs/opencv:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/hector_map_tools
 	dev-ros/image_transport
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	media-libs/opencv
 "
 DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
index 18ab3858d785..74e246177533 100644
--- a/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
+++ b/dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,12 +16,12 @@ IUSE=""
 RDEPEND="
 	dev-ros/cv_bridge
 	media-libs/opencv:=
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/hector_map_tools
 	dev-ros/image_transport
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	media-libs/opencv
 "
 DEPEND="${RDEPEND}
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_geotiff/Manifest b/dev-ros/hector_geotiff/Manifest
index ac2a5ca1f5a8..4198670cfb2c 100644
--- a/dev-ros/hector_geotiff/Manifest
+++ b/dev-ros/hector_geotiff/Manifest
@@ -1,7 +1,5 @@
 AUX qt5.patch 3068 BLAKE2B 0ff205aab12c65b94ee200f770a30c3c34252237d536374f6684606f3cad170fd3045c80b8de021fea538d06f33c4495b5ecc10ebbac2d3a0d470be11cbf148f SHA512 26f6bbcd939f3119cbb6de237c1ba76703cb02ac6af22fa5c7ed1a9022b5c33c785d4891c12e14ddaee949b09283c0500984fd0455b3c69a4cae51192b8b98c1
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_geotiff-0.3.5-r2.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
-EBUILD hector_geotiff-0.4.0.ebuild 803 BLAKE2B 90d17009fb76b1c51c2f4e7374c34cca46687e97d48c244c9c960a57fec38dcb039e289832f27476322e9dfd37eaa9ff8a5ef198fa83ff71b8fa04d0486483dc SHA512 06835a42b6df6e00ae588e3212c7cd83a26f83a8cade64959bf02b75dac9b7f02dbd286498d7f69ccb3d1541e77c3c4501c58dc3f1b54bf613d24030d2d3e8bc
-EBUILD hector_geotiff-9999.ebuild 806 BLAKE2B bc7c9512e331563c0fa96c6fab8691e4a58dced6e79cb73dbfe2a869b4dd894dd3346626f9d901512cbcd5519ec3f21230203fb5e020a681d80887a673d5934d SHA512 68ae0ad97a56b1a6b31a42c2e5d8eee6e03b288c59fb09dd96d5590429bb08ab3c905ffef8a5d84fb8e5f1059a5967185ea941145df3eb18ba9777d595ef5461
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_geotiff-0.4.1.ebuild 784 BLAKE2B a4fe9bfa41c28739d950c5409d588b5efa8615f9dc96741f720c6b5d950766449870560e2a3ad023d56aa5bba03da69370c6d471a1929904a80965174e2b61b0 SHA512 21b6dcf48b6f0b00a884c649ab4f4ebc0c4db6d50142d96cb283f9ec346b27326f6f22f9aff4686100ee720467a9f5626e25b5534de60ef73be72a9e80c2bb78
+EBUILD hector_geotiff-9999.ebuild 784 BLAKE2B a4fe9bfa41c28739d950c5409d588b5efa8615f9dc96741f720c6b5d950766449870560e2a3ad023d56aa5bba03da69370c6d471a1929904a80965174e2b61b0 SHA512 21b6dcf48b6f0b00a884c649ab4f4ebc0c4db6d50142d96cb283f9ec346b27326f6f22f9aff4686100ee720467a9f5626e25b5534de60ef73be72a9e80c2bb78
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
deleted file mode 100644
index 1bc71fd4e8be..000000000000
--- a/dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
-
-PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild b/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
similarity index 80%
rename from dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
rename to dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
index 7a60491232d1..0fd828ef8d7d 100644
--- a/dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
+++ b/dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
@@ -1,33 +1,33 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
+DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
 
 PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
index 1bc71fd4e8be..0fd828ef8d7d 100644
--- a/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
+++ b/dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
@@ -1,33 +1,33 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images"
+DESCRIPTION="Saves occupancy grid map, robot trajectory and object data to GeoTiff images"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/hector_map_tools
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
 		dev-libs/tinyxml2:=
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
 
 PATCHES=( "${FILESDIR}/qt5.patch" )
diff --git a/dev-ros/hector_geotiff_plugins/Manifest b/dev-ros/hector_geotiff_plugins/Manifest
index 305c5170fcc7..78c121bd60d9 100644
--- a/dev-ros/hector_geotiff_plugins/Manifest
+++ b/dev-ros/hector_geotiff_plugins/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_geotiff_plugins-0.3.5-r1.ebuild 507 BLAKE2B 2dc90c53ca514069ab636629aa4cc3ca96ed9aaab664390a74efbea09f6f46c43a3434b2e5261ebca899defebd0f05fc3b85ef1c22314ccea1e24539eef9872f SHA512 b1d95ad79cab89a60d68015e8e292b08a792cda394536cef26a35ae8579632e310247084a8cb70ee39003c5f8333cd519e004680b0b2ff640c383047f1b62684
-EBUILD hector_geotiff_plugins-0.4.0.ebuild 504 BLAKE2B 23181f51d227e6eeeb26f5edce792c3d15fcb719c1268709880b895ab165393b8d3980cdc7d7036a5d6cc3b788e5ee44312ca0d05a8e0fd85f4a7dabb1b78c6d SHA512 6ead56c30dc1d48ce29612f441d71580924ce00f32d2b6cca137623a09ded41a3990b25c078de8114cf57696b1082fdb1e76563045ab404b0530a25e623669a5
-EBUILD hector_geotiff_plugins-9999.ebuild 507 BLAKE2B 2dc90c53ca514069ab636629aa4cc3ca96ed9aaab664390a74efbea09f6f46c43a3434b2e5261ebca899defebd0f05fc3b85ef1c22314ccea1e24539eef9872f SHA512 b1d95ad79cab89a60d68015e8e292b08a792cda394536cef26a35ae8579632e310247084a8cb70ee39003c5f8333cd519e004680b0b2ff640c383047f1b62684
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_geotiff_plugins-0.4.1.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
+EBUILD hector_geotiff_plugins-9999.ebuild 505 BLAKE2B 3d11eb0af1355ae3eeaabd26044ad17faf40497d1e31e72d39efb345bec37d07bb3c67debde2201c447a98f22ca53c4814fffabbfa77918a4ea78b13405a95fe SHA512 5e67812d9ad85f206bf058c79b184210348499493f463a64b996e6a85e0a1f5aea9a0a3dab8e396814860b86880a2b3e55515ff208550bed70b2d38bc7d364e4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild
deleted file mode 100644
index 1afec5c73a1b..000000000000
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Plugins that extend geotiff maps generated by hector_geotiff"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/hector_geotiff
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
similarity index 87%
rename from dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
rename to dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
index 6aa8740176ca..0ca7feb396de 100644
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,8 +15,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/hector_geotiff
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
index 1afec5c73a1b..0ca7feb396de 100644
--- a/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
+++ b/dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,8 +15,9 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/hector_geotiff
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_attitude_to_tf/Manifest b/dev-ros/hector_imu_attitude_to_tf/Manifest
index 8232956bb62c..5241b9ca5ac4 100644
--- a/dev-ros/hector_imu_attitude_to_tf/Manifest
+++ b/dev-ros/hector_imu_attitude_to_tf/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_imu_attitude_to_tf-0.3.5.ebuild 491 BLAKE2B d6b54087550587bb06a1d4c60f9b36baac278a5b1c0b6fe1f0d486d5bec63b65edd25b4981c08a426e5c79e6ced4c1beb19ae05e3dc4850d12f96d6013e26ac2 SHA512 02d588f4559b130a0189affd882850b11e88af9a3f736545003d869f0f190855e96ae9841cac89d60ca23256cb51cc75d10da1ca39f7ea26c433059212b6119d
-EBUILD hector_imu_attitude_to_tf-0.4.0.ebuild 488 BLAKE2B 8caef14bf71b85987c5a9547bc954e206ef7b1c6bf2f3f2051fb1a54824f1252392b8ce5f88e49d8204be02411fa7a372444db1e9f63f71643d76ac731b8c380 SHA512 d54ba1635d51a11c5c677e69d92acbc5023120f35d4970df360f159f9e64e63e553c5099354d2d2c2eeee2cb2a06bcb1ec18658a81332fd53bf2a42efd413b56
-EBUILD hector_imu_attitude_to_tf-9999.ebuild 491 BLAKE2B d6b54087550587bb06a1d4c60f9b36baac278a5b1c0b6fe1f0d486d5bec63b65edd25b4981c08a426e5c79e6ced4c1beb19ae05e3dc4850d12f96d6013e26ac2 SHA512 02d588f4559b130a0189affd882850b11e88af9a3f736545003d869f0f190855e96ae9841cac89d60ca23256cb51cc75d10da1ca39f7ea26c433059212b6119d
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_imu_attitude_to_tf-0.4.1.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
+EBUILD hector_imu_attitude_to_tf-9999.ebuild 489 BLAKE2B a24246dc0be0680b78059fd194246a0ba24b92ab2b83b087345f2263e5abe7bf319fca117b5af771604a745bc7ef4066cc38af154a25b81fdabc8c089485dd06 SHA512 a448d96cbdc03f40c676489151ef8fdc4197f50f063fe1c3b2b9a07788465155a561502cacd2a17eaef167664aa73b62cca98c1a12fe99cd8a78b627633bbaa1
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild
deleted file mode 100644
index a5f53aebbfba..000000000000
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Publish the roll/pitch attitude angles reported via a imu message to tf"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
similarity index 86%
rename from dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
rename to dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
index ff3bcfe62c69..ae76fd8031f7 100644
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,7 +16,8 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
index a5f53aebbfba..ae76fd8031f7 100644
--- a/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
+++ b/dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,7 +16,8 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_imu_tools/Manifest b/dev-ros/hector_imu_tools/Manifest
index ac80d7808b1a..64f41110d999 100644
--- a/dev-ros/hector_imu_tools/Manifest
+++ b/dev-ros/hector_imu_tools/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_imu_tools-0.3.5.ebuild 556 BLAKE2B 8e2177d9ad2f93555f6efca1c4c1755b2f757fe87e7d3e0d13a8727a08f2398d227e50392c339eb3f33874d69251a774f42f63edda162e4dbbb34c64e4a6a93b SHA512 867afdb59941f7c2486c32c330015690818b798286f4f9c2a3e08b65b8d6f7b0e2594d6a4f9657713f8316b4916c11a499b48b07c37742d2a72a7901a12beae5
-EBUILD hector_imu_tools-0.4.0.ebuild 553 BLAKE2B 3724f0fa25ffd770002e76f7c4909f437e7621a4a1798b12d4d3d4ef92b51faf24c07142d37b548d640bd51e08be9fb7f03c479bfb635140a74af76b69ca2e69 SHA512 2c68baa546f2120ca631b1700c13dc39ac1d14b65bf7105ac353279f1f6a7313a5a4697ddee84bf881f826456680852c97c565bf996954c0ef50d6424a19c178
-EBUILD hector_imu_tools-9999.ebuild 556 BLAKE2B 8e2177d9ad2f93555f6efca1c4c1755b2f757fe87e7d3e0d13a8727a08f2398d227e50392c339eb3f33874d69251a774f42f63edda162e4dbbb34c64e4a6a93b SHA512 867afdb59941f7c2486c32c330015690818b798286f4f9c2a3e08b65b8d6f7b0e2594d6a4f9657713f8316b4916c11a499b48b07c37742d2a72a7901a12beae5
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_imu_tools-0.4.1.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
+EBUILD hector_imu_tools-9999.ebuild 554 BLAKE2B 0dfd89a98f03a0e9d388af31d9e0ada1f2e5cd40102df57ad5b5e1ef9abf5b9ddfe02feab1be018ae801780493f40def54e1c7a74787d05e05384aa16d5e3b35 SHA512 74b673fc4d1ccb486020d20c2bca9cf62402df7a8f164c20206746b27bc829c2d5bf165cbc36aab130469fe225ddc6813c3d7f4fb6f7fdb77e5f8ca3b3fcc224
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild
deleted file mode 100644
index 2ed4b21ceb5f..000000000000
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing IMU messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
similarity index 88%
rename from dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
rename to dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
index 4b1a7e4f1d0b..2bdbee5df273 100644
--- a/dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,9 +16,10 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild b/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
index 2ed4b21ceb5f..2bdbee5df273 100644
--- a/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
+++ b/dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,9 +16,10 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/Manifest b/dev-ros/hector_map_server/Manifest
index b23134c3b2d8..6ed2e0f1f055 100644
--- a/dev-ros/hector_map_server/Manifest
+++ b/dev-ros/hector_map_server/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_map_server-0.3.5.ebuild 610 BLAKE2B 71437b223d9d430ad2f94398f850feb8e0547a5cadbc1f0fb92c839d867d957168ea2801170b5da8b035a172b63d05a83b5d2cec197c290c1c6854ee91a567d6 SHA512 7c2687184ca357989bead7b3ac30319c14c7768645a1b7f764f7a5953215184fda3c6cd0d689fdf068f4614b061a5dcd3258e9a771b14b94d60de8c2bd7997de
-EBUILD hector_map_server-0.4.0.ebuild 607 BLAKE2B ec9f540ddcb10bd0f34eeeb6deca5e15e8bce6955301385777d369f257cd926480f14950a278c0d958bdfb170afc60f2d016918b85e9a3ff974d0eb46da5fce6 SHA512 ba69e386b6010b74867e84a86c41fb9066e7e73cb6247465584721882ded4f19c6e6b8cf7c61ee3b5b3625b9b330892b1b521f316272dea3a1597ec1966a126d
-EBUILD hector_map_server-9999.ebuild 610 BLAKE2B 71437b223d9d430ad2f94398f850feb8e0547a5cadbc1f0fb92c839d867d957168ea2801170b5da8b035a172b63d05a83b5d2cec197c290c1c6854ee91a567d6 SHA512 7c2687184ca357989bead7b3ac30319c14c7768645a1b7f764f7a5953215184fda3c6cd0d689fdf068f4614b061a5dcd3258e9a771b14b94d60de8c2bd7997de
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_map_server-0.4.1.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
+EBUILD hector_map_server-9999.ebuild 608 BLAKE2B 4dfaecce739d51f09f664ea6aab55d4e5b7c5af6f10ca5b715f430ac5de47427ce354808ff4632d660051450069680ffdf1bbbd02e8108ec1f6c12f4f2593d96 SHA512 38b0ccc36ba5eb4720a75fc580872221c13c786fed08a76ec234549b5369aee94ab44221b22084656bd30c7474b037f5c4770b50c25b28e1a6d5857ea8f9b2b4
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild b/dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild
deleted file mode 100644
index 5b5d6a35bb53..000000000000
--- a/dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Service for retrieving the map, as well as for raycasting based obstacle queries"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_map_tools
-	dev-ros/hector_marker_drawing
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild b/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
similarity index 89%
rename from dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
rename to dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
index 906092c6f673..d315b87686ab 100644
--- a/dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
+++ b/dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,9 +17,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hector_map_tools
 	dev-ros/hector_marker_drawing
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_map_server/hector_map_server-9999.ebuild b/dev-ros/hector_map_server/hector_map_server-9999.ebuild
index 5b5d6a35bb53..d315b87686ab 100644
--- a/dev-ros/hector_map_server/hector_map_server-9999.ebuild
+++ b/dev-ros/hector_map_server/hector_map_server-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,9 +17,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hector_map_tools
 	dev-ros/hector_marker_drawing
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_map_tools/Manifest b/dev-ros/hector_map_tools/Manifest
index 5e63c0e99b9e..52df4ec5fbf0 100644
--- a/dev-ros/hector_map_tools/Manifest
+++ b/dev-ros/hector_map_tools/Manifest
@@ -1,4 +1,4 @@
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_map_tools-0.4.0-r1.ebuild 454 BLAKE2B 4ab43a0c435e47ccbee0f4131b34b876cfcdcc8fc0ec735e61253ffdb86f3545401ca03c0deccccdcfb3f0adab6c0089779700ac97558a585b115416c8cb230e SHA512 4234a1daf49bde6fa625c6755893c52321f5cd84219d3f98fa180c40b0f014151d0da03a77004c20a2763caebe48e934453421ac5cb371fab9deaab723ff6a57
-EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B 4ab43a0c435e47ccbee0f4131b34b876cfcdcc8fc0ec735e61253ffdb86f3545401ca03c0deccccdcfb3f0adab6c0089779700ac97558a585b115416c8cb230e SHA512 4234a1daf49bde6fa625c6755893c52321f5cd84219d3f98fa180c40b0f014151d0da03a77004c20a2763caebe48e934453421ac5cb371fab9deaab723ff6a57
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_map_tools-0.4.1.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
+EBUILD hector_map_tools-9999.ebuild 454 BLAKE2B f988377cebb5870bda67ee924fce553976f1d8ed9e387e563e3d2d80b6860eacf176a08134cccf6c64af70db905e38b7941abf2ede5be5a5920f1fe366fce6d1 SHA512 96821180f2533ca08da654b7c371c53f69222fff9fdf35414e45d6070b105594d3fbedf6c1063ec24dafbb14065a5ce39bd3e0c0ec56d267adf8a3d3161b9f44
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild b/dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
similarity index 91%
rename from dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild
rename to dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
index 298849dc5dfa..a1602d9cd84b 100644
--- a/dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild
+++ b/dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -13,8 +13,8 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="
+RDEPEND=""
+DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild b/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
index 298849dc5dfa..a1602d9cd84b 100644
--- a/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
+++ b/dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -13,8 +13,8 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="
+RDEPEND=""
+DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_mapping/Manifest b/dev-ros/hector_mapping/Manifest
index 97d2b1ba89f4..0b050e211443 100644
--- a/dev-ros/hector_mapping/Manifest
+++ b/dev-ros/hector_mapping/Manifest
@@ -1,7 +1,4 @@
-AUX boost170.patch 631 BLAKE2B 9b1d25a62617b44e6a6f81b4f281ff9331051b242698cc9ae4864237b5a7d18e77298a7f00927a1215982dbec91bb9279878cd5805233d16b9f94caab1db4ab5 SHA512 f61c0def48c65577eace4e2c4bf49b5540f74beb1f54e34f4f75df82325cf0446928e664ce3256205591bac877ae65b371348948e6eea4013a3627b83e97bcdd
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_mapping-0.3.5.ebuild 742 BLAKE2B b283653e4e6a778cf83357bfedf2dc4cdb76a907dd79b31c113160236f572db1e252ad80ecb63f1c99b17287bb97260e5de9f5c94ec910278c5142f7fba78d82 SHA512 e6c599d491ac9aa97af06c9c75b0adaace4e813860a0f208fc6e9c680568179c9f744f08142bf96e4d52b953d799ff7a62553acaa19a197afe13621f6a2f95dd
-EBUILD hector_mapping-0.4.0.ebuild 742 BLAKE2B b283653e4e6a778cf83357bfedf2dc4cdb76a907dd79b31c113160236f572db1e252ad80ecb63f1c99b17287bb97260e5de9f5c94ec910278c5142f7fba78d82 SHA512 e6c599d491ac9aa97af06c9c75b0adaace4e813860a0f208fc6e9c680568179c9f744f08142bf96e4d52b953d799ff7a62553acaa19a197afe13621f6a2f95dd
-EBUILD hector_mapping-9999.ebuild 701 BLAKE2B 84c04288035add5acba5a319d0d0d642bec8931a10e1291257fb46328d334d4da51863aa1149f0cd65f5e23cc6a9b54a4d7bac9f60722320c54ba36157840a85 SHA512 d9624076f101a717ca2fcf087a59afde14d673810fc491d147388b0a71a1908ad9878f64aa261966829a0526370a981fee52c793c093224d63041031d38d9612
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_mapping-0.4.1.ebuild 645 BLAKE2B 670ed45b91746b41b9181cd2558245a75355a4e5b22960765e7c03e27bd42b29cfc73947734e230f509faaf8d431e148f8bffdd6f144a584134a41f014dfb821 SHA512 4bd801bba800bcce0f8ad74a10038cf48db014ef2246e52ca72285c1d9be023229f0afabccc97317b1630c5f52c6f06b6b5c1832c58f829e2a7728575bda9bb1
+EBUILD hector_mapping-9999.ebuild 645 BLAKE2B 670ed45b91746b41b9181cd2558245a75355a4e5b22960765e7c03e27bd42b29cfc73947734e230f509faaf8d431e148f8bffdd6f144a584134a41f014dfb821 SHA512 4bd801bba800bcce0f8ad74a10038cf48db014ef2246e52ca72285c1d9be023229f0afabccc97317b1630c5f52c6f06b6b5c1832c58f829e2a7728575bda9bb1
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_mapping/files/boost170.patch b/dev-ros/hector_mapping/files/boost170.patch
deleted file mode 100644
index 89bc05d2f7da..000000000000
--- a/dev-ros/hector_mapping/files/boost170.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: hector_mapping/CMakeLists.txt
-===================================================================
---- hector_mapping.orig/CMakeLists.txt
-+++ hector_mapping/CMakeLists.txt
-@@ -7,7 +7,7 @@ project(hector_mapping)
- find_package(catkin REQUIRED COMPONENTS roscpp nav_msgs visualization_msgs tf message_filters laser_geometry tf_conversions message_generation)
- 
- ## System dependencies are found with CMake's conventions
--find_package(Boost REQUIRED COMPONENTS thread signals)
-+find_package(Boost REQUIRED COMPONENTS thread)
- include_directories(${Boost_INCLUDE_DIRS})
- 
- # Find Eigen3 (from http://wiki.ros.org/jade/Migration)
diff --git a/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild b/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild
deleted file mode 100644
index 3705df75d030..000000000000
--- a/dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/message_filters
-	dev-ros/laser_geometry
-	dev-ros/tf_conversions
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild b/dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild
similarity index 73%
rename from dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
rename to dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild
index 3705df75d030..071ffb576190 100644
--- a/dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
+++ b/dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
+DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -26,4 +25,3 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:3"
-PATCHES=( "${FILESDIR}/boost170.patch" )
diff --git a/dev-ros/hector_mapping/hector_mapping-9999.ebuild b/dev-ros/hector_mapping/hector_mapping-9999.ebuild
index 21a4b93138fd..071ffb576190 100644
--- a/dev-ros/hector_mapping/hector_mapping-9999.ebuild
+++ b/dev-ros/hector_mapping/hector_mapping-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/visualization_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion"
+DESCRIPTION="SLAM that can be used without odometry and on platforms that exhibit roll/pitch"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/hector_marker_drawing/Manifest b/dev-ros/hector_marker_drawing/Manifest
index 7e7ce473d120..3465a33738e3 100644
--- a/dev-ros/hector_marker_drawing/Manifest
+++ b/dev-ros/hector_marker_drawing/Manifest
@@ -1,10 +1,4 @@
-DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
-DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_marker_drawing-0.3.3.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
-EBUILD hector_marker_drawing-0.3.4.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
-EBUILD hector_marker_drawing-0.3.5.ebuild 482 BLAKE2B 23cb3ff973180b728f90575508b36a76fb806cab36a9abd78806a98b0da0733fa72a55ac23fbb476395ee8fea7efc0f57e954f52c299237ebf96cc2aa73da590 SHA512 5bb1601ced5aec7c25ce1c6dec2750d4c704d020b0b1455a513eb771f2927860e6eb209b7084129b3a6c4af3f03fc584972979be32f877e534f7ba6e219891d2
-EBUILD hector_marker_drawing-0.4.0.ebuild 479 BLAKE2B 471de32a229ede3d85b8fda14dcd02e70ff9502d3541cc6ebfb185d7889a6ca4a423674adc822c1a876831c84ed560f5f24384a6a5ac1e5f67a3ef23f54ea89e SHA512 f9d8a0bb5ce921ab11ed3a41d911b5882bd7e04c7548d1ac0a5bf10e4b60897131002cc9a2f9a7a5132e87e007072692dd033969a5941c172013d04710c2016b
-EBUILD hector_marker_drawing-9999.ebuild 482 BLAKE2B 55ba00d612866ab762e88132a1d270ca403f890f454650b057e678c51ae2f3c6d38138d086d0eb4ca39950342fb95c6bc80fcdea72dffa85b8120a54a8562031 SHA512 1ed0c217e83d524fae33c2097c05a43d9bb3411f24bc4cb3a9e95b2937c30c8334d70ebbb9c9e76d61ece77119a35a507bb3e19590d3831e1de37eea3b15eb16
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_marker_drawing-0.4.1.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
+EBUILD hector_marker_drawing-9999.ebuild 479 BLAKE2B 3641cecc731f6febb3d0ca4bc5ae00a766f3f81b409aba8071cf0c3efb75e950cea35a92993e553eebc928570866fbd6a4c7857369ec3380020519e939bd002b SHA512 e5cfe9dc3e4ee8a2014f297558da44aa894dfd3bef625dde73177093402bee90d83750f80216ca758aebdce0adebaf726d9cbafb98d3eeee0b049e9a7732efa9
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild
deleted file mode 100644
index 74d3a3965850..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
deleted file mode 100644
index 74d3a3965850..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild
deleted file mode 100644
index b3455d3e37ba..000000000000
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Convenience functions for easier publishing of visualization markers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
similarity index 90%
rename from dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
rename to dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
index 4c95bac38c6d..1e9c4c56ec4f 100644
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild b/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
index 74d3a3965850..1e9c4c56ec4f 100644
--- a/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
+++ b/dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -15,7 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_nav_msgs/Manifest b/dev-ros/hector_nav_msgs/Manifest
index 9d7d6ef16f0a..7ced756327e1 100644
--- a/dev-ros/hector_nav_msgs/Manifest
+++ b/dev-ros/hector_nav_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_nav_msgs-0.3.5.ebuild 506 BLAKE2B d1cfb04c4505ae386f20b6684d6b656d1ed607d961e149282ce9af5461dcddcc03cc05fbcb9547f9aa6df893717e9a16724ab4e371fe9e7424818d6c23293c71 SHA512 46be9c83ee2851921a45997a5e3e9871939708233f83df1602bc31e6b479a5b149e14f1ca6fc674d7d15175dcb95dc6d1a3f6b0a385a487adc86b34024193fca
-EBUILD hector_nav_msgs-0.4.0.ebuild 506 BLAKE2B d1cfb04c4505ae386f20b6684d6b656d1ed607d961e149282ce9af5461dcddcc03cc05fbcb9547f9aa6df893717e9a16724ab4e371fe9e7424818d6c23293c71 SHA512 46be9c83ee2851921a45997a5e3e9871939708233f83df1602bc31e6b479a5b149e14f1ca6fc674d7d15175dcb95dc6d1a3f6b0a385a487adc86b34024193fca
-EBUILD hector_nav_msgs-9999.ebuild 506 BLAKE2B d1cfb04c4505ae386f20b6684d6b656d1ed607d961e149282ce9af5461dcddcc03cc05fbcb9547f9aa6df893717e9a16724ab4e371fe9e7424818d6c23293c71 SHA512 46be9c83ee2851921a45997a5e3e9871939708233f83df1602bc31e6b479a5b149e14f1ca6fc674d7d15175dcb95dc6d1a3f6b0a385a487adc86b34024193fca
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_nav_msgs-0.4.1.ebuild 466 BLAKE2B 4e31ebcbb188491fd7da8ad525a64f38e25ee66d5a98dd7e7d5f3d4c3390bcaf3f9fce060218cc304b608bac9997b1bd5da5bdec09d5576d788c65b0596f9dc6 SHA512 1dfb4b3d6d948a8ddc30ec7b2a1ce03baa8ce27d4bb750dbf15857b7ddba7f6522cc178dfc854fae6675c69033107de0e5097ed6188e67cae14b2c1e725839e8
+EBUILD hector_nav_msgs-9999.ebuild 466 BLAKE2B 4e31ebcbb188491fd7da8ad525a64f38e25ee66d5a98dd7e7d5f3d4c3390bcaf3f9fce060218cc304b608bac9997b1bd5da5bdec09d5576d788c65b0596f9dc6 SHA512 1dfb4b3d6d948a8ddc30ec7b2a1ce03baa8ce27d4bb750dbf15857b7ddba7f6522cc178dfc854fae6675c69033107de0e5097ed6188e67cae14b2c1e725839e8
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild
deleted file mode 100644
index 8a17560e0722..000000000000
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages and services used in the hector_slam stack"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.5.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
similarity index 90%
rename from dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.5.ebuild
rename to dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
index 8a17560e0722..0177e578893d 100644
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.5.ebuild
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild b/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
index 8a17560e0722..0177e578893d 100644
--- a/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
+++ b/dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/nav_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/hector_pose_estimation/Manifest b/dev-ros/hector_pose_estimation/Manifest
index 2e61a693f644..dcea85c3a0b5 100644
--- a/dev-ros/hector_pose_estimation/Manifest
+++ b/dev-ros/hector_pose_estimation/Manifest
@@ -1,5 +1,5 @@
-AUX hector_pose_estimation-0.3.0-pluginlib.patch 1014 BLAKE2B b98d2357c13d61919f32d45f19d267832d855a9a8490519c838540b2b7217227e854b53cced737dda7551bc61c99eff78fa61f6b7a3557271bd81e4cb6e9bb03 SHA512 a3e4f2e63aa1d639f8acb178032bb6e9d95640d478cf75715ceb0136bd150d704ada3ceac279932083126c79201bd1b530937f1d7182188bde9710c30f8fc6f7
+AUX hector_pose_estimation-0.3.0-pluginlib.patch 1010 BLAKE2B 965ccd5e1c74b30d2e5ceae57c10be15762ad8c2a9cc1a542eb8d1d54183feee71aab9f30392e459e9b20edcaa1c07da900d88a06d419f53e94ce5bf4c78976d SHA512 2e5bee3ab8d3a27dc6d68e005d358badbf99a5fb17ff60fd9592ad94a89cdc218cfce5719c7710d9a8cd0725c9df7845334dad55eecea456e886a94d382a4d7f
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-EBUILD hector_pose_estimation-0.3.0-r1.ebuild 763 BLAKE2B e0725468681b66e5717d69e3dc3f987b5e7b837f3a07d3da2738dce90392dea03f1656f4096dac90094e076f47e86522122c9767f31541d29cfd93d35f02ea9f SHA512 dc3cb0874189d1f82628c7393bf229ee1556895cefb6cc7e1f7579438c7b594f5232bfcd54ef6f3819bedab5219721f53fdee2ab5288f5d368b2965f8069428b
-EBUILD hector_pose_estimation-9999.ebuild 711 BLAKE2B 67d3ab3da4f47e0b7784bc578f31983b5dca9c09b344d88c0c1f42355de74a126a5339b6179b8e43dc73693c8fe89e5384df3080bc742a05090f5ab250511834 SHA512 abeb93640c11c0d1359ce0e84adc9ce43b42461b259225f39c2189688a164ebc7d4f76195ca89c9e77a545f21b4dfd1e83ac13b07c657c063f86f95ca0a4da9b
+EBUILD hector_pose_estimation-0.3.0-r1.ebuild 763 BLAKE2B 64a0eec66ca9a4de09f2e63630c32e19f1000d54266316dcd638fe91a9b7b0c68e6636af6bf534728d3e6efcd01e131bc1a5ae1a6cb707a09d39cf6780f55c88 SHA512 fcc228e912fdf46b58489cc455d14cf3ef1734c7a770511add1efe19b0c745d275c8e7b0122cd03c85a1bcae874ab762178c9a0075f472a4ed2e8a0e2b07cf6b
+EBUILD hector_pose_estimation-9999.ebuild 709 BLAKE2B 47c1f5e8aaa989553422e72b3f0e416dc125b9e1dd09e7d93314d94090153cd18df953287829bb62185870252774266c810d2d5eb518ef1dc09d57f0282fab34 SHA512 c058f013576bc391ae21444177d03ec8c63a3719aab9ec0957ac9f9865eaa9b39515c28a796d2dca045c9ea0d1fa30680a5d8a7a6910fd5f8bdfe9921251c47b
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch b/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch
index a226c40e9fce..59349bbfe02f 100644
--- a/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch
+++ b/dev-ros/hector_pose_estimation/files/hector_pose_estimation-0.3.0-pluginlib.patch
@@ -9,8 +9,8 @@ Subject: [PATCH] update to use non deprecated pluginlib macro
 
 diff --git a/hector_pose_estimation/src/pose_estimation_nodelet.cpp b/hector_pose_estimation/src/pose_estimation_nodelet.cpp
 index 7da3ca6..97ba5b0 100644
---- a/hector_pose_estimation/src/pose_estimation_nodelet.cpp
-+++ b/hector_pose_estimation/src/pose_estimation_nodelet.cpp
+--- hector_pose_estimation/src/pose_estimation_nodelet.cpp
++++ hector_pose_estimation/src/pose_estimation_nodelet.cpp
 @@ -55,4 +55,4 @@ class PoseEstimationNodelet : public PoseEstimationNode, public nodelet::Nodelet
  } // namespace hector_pose_estimation
  
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
index 284a8883bbab..783aaeb2225c 100644
--- a/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
+++ b/dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,15 +16,15 @@ IUSE=""
 RDEPEND="
 	dev-ros/hector_pose_estimation_core
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-ros/message_filters
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 # dev-ros/hector_timing
-DEPEND="${RDEPEND}"
-
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 PATCHES=( "${FILESDIR}"/${PN}-0.3.0-pluginlib.patch )
diff --git a/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild b/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
index 7cc3dd4e6490..8bfff8077200 100644
--- a/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
+++ b/dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,13 +16,14 @@ IUSE=""
 RDEPEND="
 	dev-ros/hector_pose_estimation_core
 	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-ros/message_filters
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
 # dev-ros/hector_timing
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_pose_estimation_core/Manifest b/dev-ros/hector_pose_estimation_core/Manifest
index dcb8906000fc..8abee9434c54 100644
--- a/dev-ros/hector_pose_estimation_core/Manifest
+++ b/dev-ros/hector_pose_estimation_core/Manifest
@@ -1,7 +1,7 @@
 AUX eigen.patch 892 BLAKE2B 68b8df118a6d2a644ee1bd8407144f50fc270bc767984093e146cf537799e9dee11db670006c5cf467bd98c3ffd3f6c2cb1db6c9e8ab81618bb6a29489cf6bf1 SHA512 302e4fecdfb674b66d737d93d427b61e5fb00932469190c3b631c6e2fc4647c2622591ec83975b42d9e1bb71b70f8d942c3fe4101d9927ce2c909c1baef38d35
 AUX gcc6.patch 1597 BLAKE2B 9df1a297741dbcb957ef9bc910332e237a84ffcef87547f0d29573c4a3aa4255a0d65fb0f2eb7b404a8c9ecf4441b2a9dee60dd1d832b7690baceb2b1ae39951 SHA512 7ef60982584cf5021d9a8c084492de84d54dc0150ad0cd5acfc9c709641935c5a9ee649e5546cae6d2da061a0e3a887e5f1ea97e1fa3848ad9dd4de7ff3ee817
-AUX includes.patch 562 BLAKE2B 2a6bf54f37cf5275014d2f69428568eb4e5b5c967c88129c3fde9ff89f0bcf3ab26abd2c538d5ea5977182393e189ab156bb9a24446df822106de72cf7a2bd1f SHA512 a689645403095ef37be5a259d593ee8e6f412a77a0997b5025c85c5c9f09ef9bce622d4afccc58e9baed89576db9280d615f4a0df2eee22a18ee832f12e786a8
+AUX includes.patch 506 BLAKE2B 40b3b640324f8ae1b36f3ee3f760384e4365500f8e29a1111376a0bcb8206e77429565ba9ed9dacb4420543378963d5c6b3798151a3eb4672f28bff6fb5d620c SHA512 2d02b76c2ee1032527582ae32685014b815fcc5cb6fd2e02de84299d2c634a2e54c2d3b7d7307442f972259db44f84d4ae35ca6a38369207e29639fd15cda08f
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-EBUILD hector_pose_estimation_core-0.3.0-r1.ebuild 803 BLAKE2B 55419c38502f1264a29b5932f2aa00e467730d6b92ab66ea1cc3067aa2cb70851d88ef0439b77e5e9374887da338c151d5bcf615536c4e980fdc321008ce5124 SHA512 59a73b76930f02107c3308545ebce88ce5b1198b46803858066244e493997bfdfe2ede29ee6bb3603b31b793e694f56491cc792d4bae9eb5295e301aeba83d58
-EBUILD hector_pose_estimation_core-9999.ebuild 711 BLAKE2B e1455cf2d4af72fe418a0bbfb386de51c867af6bdb4dba92efaf12a8204f9fa239c2bccf7a9b40a2f63432f469040c073d18907b409f2d7b085693d32e7c4384 SHA512 8b67fb9ce6030102d7cc9b82db7f0921bae58770e272b1a8527e60f3e9576f71f53523ffa0fb563bf348fda33eadcd0c56353e7c5f99467357d132a334f45e6c
+EBUILD hector_pose_estimation_core-0.3.0-r1.ebuild 800 BLAKE2B 8767f45674f3455c9722432d93f70d364a815f9f74cbee89b6391e79d94ea470576a94f9da228c969e71c9daa47385e087785a78f9cc97ba6d5e92d88637b039 SHA512 5a3906fef2e106c51b06e54e3202e74e58204c1eabdd690a4297acfa66797a587fc7fc5b62c086332cf0044a1b7df754205f7e097e281736f701c65fdba0bf34
+EBUILD hector_pose_estimation_core-9999.ebuild 708 BLAKE2B 4c7dcfb1673f5a3e1c016441ca85ba0000874ee6a9c63296069187841a3b60398787340f793d46103e01462786571484d91b461a344ba37efb73c924477af8a4 SHA512 637c5cdb5da52e3634356e15c70dbc9fe089e8111ac8511bb54af2cf9b9cf4ed3592ad1f104be12b610720ee2b81f19d202e03881f5a05dfc083673646a7ae58
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/hector_pose_estimation_core/files/includes.patch b/dev-ros/hector_pose_estimation_core/files/includes.patch
index 0188d027ed9d..2b530f18633c 100644
--- a/dev-ros/hector_pose_estimation_core/files/includes.patch
+++ b/dev-ros/hector_pose_estimation_core/files/includes.patch
@@ -1,7 +1,7 @@
 Index: hector_localization-0.3.0/hector_pose_estimation_core/include/hector_pose_estimation/state.h
 ===================================================================
---- hector_localization-0.3.0.orig/hector_pose_estimation_core/include/hector_pose_estimation/state.h
-+++ hector_localization-0.3.0/hector_pose_estimation_core/include/hector_pose_estimation/state.h
+--- hector_localization-0.3.0.orig/include/hector_pose_estimation/state.h
++++ hector_localization-0.3.0/include/hector_pose_estimation/state.h
 @@ -29,6 +29,7 @@
  #ifndef HECTOR_POSE_ESTIMATION_STATE_H
  #define HECTOR_POSE_ESTIMATION_STATE_H
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
index 8c95893cad5a..19defd1cae45 100644
--- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
+++ b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,13 +17,13 @@ RDEPEND="
 	dev-ros/rostime
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
 PATCHES=( "${FILESDIR}/includes.patch" "${FILESDIR}/gcc6.patch" "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
index 8c1ce15dafe8..3464c3898757 100644
--- a/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
+++ b/dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -17,12 +17,12 @@ RDEPEND="
 	dev-ros/rostime
 	dev-ros/rosconsole
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3"
diff --git a/dev-ros/hector_slam_launch/Manifest b/dev-ros/hector_slam_launch/Manifest
index d8f1a86a0601..359d79a13401 100644
--- a/dev-ros/hector_slam_launch/Manifest
+++ b/dev-ros/hector_slam_launch/Manifest
@@ -1,10 +1,4 @@
-DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba61198b4f55074c63fccc1f47df773533190e9bad7e0cf661490b38602e1e4aba00d82c7fe23f8fc4a1092ea50be333ca SHA512 755a639b865d897281f01e28ca8dcdf943d953422f38ba73ed7e982c22c178cb5becbb9d2962420136cad0927f5c412ce896fc9b1995b58d7163fb35a82c62c0
-DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_slam_launch-0.3.3.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
-EBUILD hector_slam_launch-0.3.4.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
-EBUILD hector_slam_launch-0.3.5.ebuild 552 BLAKE2B 7832e18da52086b053d473ffe615f4e1359bf9911f8356112adeb3b802ebeba137547d27c159728ebf080a8c8a4a15ded3553ea132c052c9cd9eaa6ede2cbaa3 SHA512 92c8ba3f878de452948aa4692c5ff8f60d9cf3cc77d17283c3a1fd7a25a232a245c5d8efea2cb2240e17389c7a67cd043b9527cd3f9df64a225a1671cca65d4e
-EBUILD hector_slam_launch-0.4.0.ebuild 549 BLAKE2B aac6563ad3f53b9568e09afad601b6ae092f70339f45036dcfc450e0ada145b56e0a132df0767b9c2ee26d166583e565155156c611c61bef73d19794adf63c4c SHA512 ecc9bca9ed1f757159898123896444591b2c1196fc36412216b03516bf25f85c477e15fb5b9ae7d0bdf02a31d96ba0e7368937f833369f7ad3094140ef18fea4
-EBUILD hector_slam_launch-9999.ebuild 552 BLAKE2B 3aff9110e1fbe6f1205e29c20a29cf1ef68b848a91adda5f39beca8c6b50eb00eeef270e79cbc547e633de236981b288abd3ccc980df3717c97364cd039f4f94 SHA512 685fc3fdf3b42f8600dc2d9a289e45bbb4ba028ba75b7d905e4805b2c976f853704fc6c8ad3f055513dfff09863d8e0f5110f24406f1ac9dbd3f3e57d3cc2bd9
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_slam_launch-0.4.1.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
+EBUILD hector_slam_launch-9999.ebuild 519 BLAKE2B 53190caf679c2f36115cb1c74a21ec8d8c967797d708071d14442f60e86fc9ef74d1e091da8f532a79b9f0b6f2763ec2caf7e77b359f4b5ffd1b7400ff3c17b5 SHA512 c718a7784284dc5de1b80f9c3f5ff7813f13fb473beb4defb739a31bd88ebf82b7dd4a095cb78cc2f6186ee8eaae61f0739034579ddef903a38dfb6b96f94720
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild
deleted file mode 100644
index 9993f129fe07..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
deleted file mode 100644
index 9993f129fe07..000000000000
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-ros/hector_mapping
-	dev-ros/hector_map_server
-	dev-ros/hector_trajectory_server
-	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
-"
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
similarity index 82%
rename from dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
rename to dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
index 04c3c251fa9c..a3654d956875 100644
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
+DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild b/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
index 9993f129fe07..a3654d956875 100644
--- a/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
+++ b/dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
+DESCRIPTION="Launch files for launching hector_slam with different robot scenarios"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/hector_trajectory_server/Manifest b/dev-ros/hector_trajectory_server/Manifest
index 8221ac8704b5..35491a5a5a02 100644
--- a/dev-ros/hector_trajectory_server/Manifest
+++ b/dev-ros/hector_trajectory_server/Manifest
@@ -1,6 +1,4 @@
-DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
-DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
-EBUILD hector_trajectory_server-0.3.5.ebuild 584 BLAKE2B 2d23544a01e6ee3c24900240ba3312ed5d63a1cc04073141a2117b7fe72bf1257f936c9e1c04e28dd3e58c713d53ca19f29865eb8b11c0ca6386acd87f4f3ccc SHA512 573850704ea327f43f3c4ca322c136035fc56f9247e01f38038d60f0ae783fdcce4be273315ad7ab0e6685cd2e37f564052d9b750f590fff3f25a64922ac9b7a
-EBUILD hector_trajectory_server-0.4.0.ebuild 581 BLAKE2B eec09877cb696376880842ca0458308cfa47fa0f406012bcbb3c5dca821a23bcb31f2f3f88bd2805a6cde0b3ea07ed2f62b5a53c2e5d99364e52038c0df9f117 SHA512 f92a42a6779ac4859fe212b48fc1c9b4c416bdb0be37aee3c0674fd9a6d51f065cb794807758790a0867b8d1602375f67dc52cfab10bee46d698f81385b388cd
-EBUILD hector_trajectory_server-9999.ebuild 584 BLAKE2B 2d23544a01e6ee3c24900240ba3312ed5d63a1cc04073141a2117b7fe72bf1257f936c9e1c04e28dd3e58c713d53ca19f29865eb8b11c0ca6386acd87f4f3ccc SHA512 573850704ea327f43f3c4ca322c136035fc56f9247e01f38038d60f0ae783fdcce4be273315ad7ab0e6685cd2e37f564052d9b750f590fff3f25a64922ac9b7a
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
+EBUILD hector_trajectory_server-0.4.1.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
+EBUILD hector_trajectory_server-9999.ebuild 558 BLAKE2B 55da0649badf7ecc0a20d71ae38aedea7e75ea85d89058e637afa9321f121f8375e96c40a6dae2a7602163c4feec91b95228c20e97270463946214f81bd037b5 SHA512 ded21b655ef93b8793c48e9d36fdc4a07499a4e47105c49e65e2b8df07568ef0145d1e2623b54f49152aa37f5be20ff2529ae47bc84f7ba3d91fc14437a490c8
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild
deleted file mode 100644
index 72edb675f780..000000000000
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/hector_map_tools
-	dev-ros/tf
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
similarity index 82%
rename from dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
rename to dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
index 61596f0891a0..37fc87495b5d 100644
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/hector_map_tools
 	dev-ros/tf
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild b/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
index 72edb675f780..37fc87495b5d 100644
--- a/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
+++ b/dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_slam"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Keeps track of tf trajectories and makes this data accessible via a service and topic"
+DESCRIPTION="Keeps track of tf trajectories and makes this data accessible"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
-	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/hector_map_tools
 	dev-ros/tf
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/hector_nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index 51023c19185e..36c7abe6c505 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -1,14 +1,4 @@
-DIST vision_opencv-1.12.3.tar.gz 80497 BLAKE2B 97e9c6d623108307216ae88dd5a4c6231b61d64826907c130233bab7c1590a50adf4e6bfdca3f6130365848a98ff1d2f58228c7f2dbc256aff6bbe04f164161b SHA512 2f732c7f9d9b5aa68b775fa08c8836bfb01cd3fe0fee9bd9bf862fecb26a23a58d754a96e723b420663b48b590f24e454e5a1871b6f4dcd4219d3c3e413ade3c
-DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79eaf4637e5f5775151e066cc92a92f8993a6bc047ddc35adbb77745e6070797111d78add690ee7bb54cc8179cf2f7cfa5 SHA512 9ed426ddae7af343eed01d6ebf2769d654476bb28b095d67394e75feeec8440859aca34f62c9faff81018cf98fe58b731b96f3f7ffeaa459d14e6a3c59ad02e5
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
-DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD image_geometry-1.12.3.ebuild 573 BLAKE2B 57d843b24727e237d1a934271762c2ffce2b90f0de3564d6098ae3ed91225b279ecb114ba7eae2ca5cb25e34d23eac07dbfae565e36ec8d1a17027b665210dae SHA512 b5032a90e9d488251c830082437aafb9cf4d751fdd1c15d7d245ba26d6d282622b30bde351ae8427841646dc7ce30ab303881b6e8a3ff117b0117c36a2650973
-EBUILD image_geometry-1.12.4.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
-EBUILD image_geometry-1.12.5.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
-EBUILD image_geometry-1.12.7.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
-EBUILD image_geometry-1.12.8.ebuild 573 BLAKE2B b5475075d7374dc72731c9420a6c60f4ae6407f09644a7bc781c56554af3ee4db3a7f82a6a97ed130cf2286c924101c7698705153601ec5bd7eeb3bc8ef2c7f6 SHA512 d50375d31c899e44567a7167a3229aacaef924f5bc2b3903d16a168aee3aa3fba43d6f19e727efacfc43a97c072be214c6de047f22af20d2ff16fb1823ffee63
-EBUILD image_geometry-1.13.0.ebuild 573 BLAKE2B b5475075d7374dc72731c9420a6c60f4ae6407f09644a7bc781c56554af3ee4db3a7f82a6a97ed130cf2286c924101c7698705153601ec5bd7eeb3bc8ef2c7f6 SHA512 d50375d31c899e44567a7167a3229aacaef924f5bc2b3903d16a168aee3aa3fba43d6f19e727efacfc43a97c072be214c6de047f22af20d2ff16fb1823ffee63
-EBUILD image_geometry-9999.ebuild 573 BLAKE2B 5d941d4bdac14a1792893e7de1e8fe5ba96114c454e54675577cd64966c89105b0501f7d7fdd5e63905d3e6642be8537d4523859ee65bef3051a15a5e3a16bf5 SHA512 62ff031953231cc9d983aae2e77c01f0b8a15f0d80b95ee6289994e76a02f8ca38b224ed2ab6700ed82531a84f8058121d11bac28d424f49282c60bc25ee3ada
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+EBUILD image_geometry-1.15.0.ebuild 564 BLAKE2B 0790f6884d13004a090fedf7635732fcb78c8f07add8fee6a3632b72447edf9bf99adbf2a0c578082f057858b4a2d49606e9f135c9268a6716045e80487fcd5b SHA512 7e71ff2146cbe05c13b8995269187b68b13acacc4e8284db23fa8117bf2a596a42724552bf00f1be93dabc8a8808c1cb76e445d2152e388ccf6ac91fb2cd73b0
+EBUILD image_geometry-9999.ebuild 564 BLAKE2B 0790f6884d13004a090fedf7635732fcb78c8f07add8fee6a3632b72447edf9bf99adbf2a0c578082f057858b4a2d49606e9f135c9268a6716045e80487fcd5b SHA512 7e71ff2146cbe05c13b8995269187b68b13acacc4e8284db23fa8117bf2a596a42724552bf00f1be93dabc8a8808c1cb76e445d2152e388ccf6ac91fb2cd73b0
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/image_geometry/image_geometry-1.12.4.ebuild b/dev-ros/image_geometry/image_geometry-1.12.4.ebuild
deleted file mode 100644
index 8206600adc38..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.5.ebuild b/dev-ros/image_geometry/image_geometry-1.12.5.ebuild
deleted file mode 100644
index 8206600adc38..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.7.ebuild b/dev-ros/image_geometry/image_geometry-1.12.7.ebuild
deleted file mode 100644
index 8206600adc38..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.8.ebuild b/dev-ros/image_geometry/image_geometry-1.12.8.ebuild
deleted file mode 100644
index 25d882f4b84d..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.12.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.13.0.ebuild b/dev-ros/image_geometry/image_geometry-1.13.0.ebuild
deleted file mode 100644
index 25d882f4b84d..000000000000
--- a/dev-ros/image_geometry/image_geometry-1.13.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-1.12.3.ebuild b/dev-ros/image_geometry/image_geometry-1.15.0.ebuild
similarity index 72%
rename from dev-ros/image_geometry/image_geometry-1.12.3.ebuild
rename to dev-ros/image_geometry/image_geometry-1.15.0.ebuild
index 267350820dff..2cfbe286ffa0 100644
--- a/dev-ros/image_geometry/image_geometry-1.12.3.ebuild
+++ b/dev-ros/image_geometry/image_geometry-1.15.0.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,8 @@ IUSE=""
 
 RDEPEND="
 	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_geometry/image_geometry-9999.ebuild b/dev-ros/image_geometry/image_geometry-9999.ebuild
index 4b65c37fb167..2cfbe286ffa0 100644
--- a/dev-ros/image_geometry/image_geometry-9999.ebuild
+++ b/dev-ros/image_geometry/image_geometry-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,8 @@ IUSE=""
 
 RDEPEND="
 	media-libs/opencv:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/image_transport/Manifest b/dev-ros/image_transport/Manifest
index 0fe3655b1a55..41e43debb2e4 100644
--- a/dev-ros/image_transport/Manifest
+++ b/dev-ros/image_transport/Manifest
@@ -1,4 +1,4 @@
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD image_transport-1.11.13-r2.ebuild 635 BLAKE2B 68729bc28c9036f5e3268fc31589f751a8a70d660f8b29bbeb1c2febd18f3b9fb287fb29858c840887bb84b1c3585400c004dd4ababc08b8e276dc9c9dabbb61 SHA512 19ed960a0334557ee9c3cd7b9e79e29d7559ebcad99d3967fb3db9511f23ad24f8d903774f2493e62186d3c659cac0dd5f4356d43ab2283ce38c30785ab1ff45
-EBUILD image_transport-9999.ebuild 635 BLAKE2B 68729bc28c9036f5e3268fc31589f751a8a70d660f8b29bbeb1c2febd18f3b9fb287fb29858c840887bb84b1c3585400c004dd4ababc08b8e276dc9c9dabbb61 SHA512 19ed960a0334557ee9c3cd7b9e79e29d7559ebcad99d3967fb3db9511f23ad24f8d903774f2493e62186d3c659cac0dd5f4356d43ab2283ce38c30785ab1ff45
+DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
+EBUILD image_transport-1.12.0.ebuild 633 BLAKE2B 6e92221fd8af62c31dc495531439c3c3250d07399ee57b0795af1ff31fc10bc988c2ec8c9b530e7a7c7bd95c02cbfc2fe161d2bb39adbdc601a834fb47cbce68 SHA512 d1468b18424da63d7c2581d6371e95e38b40debaafd28fb7ff3fbf06afec5ccdbb13631087509fa6b61f73121f2e4b41609c02e591447be2871cdf90bb55105c
+EBUILD image_transport-9999.ebuild 633 BLAKE2B 6e92221fd8af62c31dc495531439c3c3250d07399ee57b0795af1ff31fc10bc988c2ec8c9b530e7a7c7bd95c02cbfc2fe161d2bb39adbdc601a834fb47cbce68 SHA512 d1468b18424da63d7c2581d6371e95e38b40debaafd28fb7ff3fbf06afec5ccdbb13631087509fa6b61f73121f2e4b41609c02e591447be2871cdf90bb55105c
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild b/dev-ros/image_transport/image_transport-1.12.0.ebuild
similarity index 89%
rename from dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
rename to dev-ros/image_transport/image_transport-1.12.0.ebuild
index 2be6354ffbb1..4f3b8e6e7e86 100644
--- a/dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
+++ b/dev-ros/image_transport/image_transport-1.12.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -20,9 +20,10 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
 	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 	dev-ros/class_loader:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/image_transport/image_transport-9999.ebuild b/dev-ros/image_transport/image_transport-9999.ebuild
index 2be6354ffbb1..4f3b8e6e7e86 100644
--- a/dev-ros/image_transport/image_transport-9999.ebuild
+++ b/dev-ros/image_transport/image_transport-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -20,9 +20,10 @@ RDEPEND="
 	dev-ros/rosconsole
 	dev-ros/roscpp
 	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 	dev-ros/class_loader:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/imu_processors/Manifest b/dev-ros/imu_processors/Manifest
index eb77ede01841..6ed259d7d27b 100644
--- a/dev-ros/imu_processors/Manifest
+++ b/dev-ros/imu_processors/Manifest
@@ -1,8 +1,4 @@
-DIST imu_pipeline-0.2.1.tar.gz 7962 BLAKE2B 4af64db84fe96d70d2c61f8c16375bb28faac9c5630f3cad8c94ef9f87c5b17e302313a2511442b8c810e2ac589a733d6b333b2111b579c06559befaa5e9e1c6 SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4
-DIST imu_pipeline-0.2.2.tar.gz 8080 BLAKE2B cdeeb7b95cca23aa7c30902b3be3daa34af222ff660058c1e57cf02b75008d4840b82cb52dbf7fa9a2968b2e41244fe7f1833429bd04280fdf68fb7fff2d240d SHA512 95913f3edec9af4d981d6034beb8932bba2e8a4d05a72c70c1bf2bcd5b85a9afa490e2916b6e4178e35b6a1967208999bfb697f5925ce12cae7e57fad2721f3f
-DIST imu_pipeline-0.2.3.tar.gz 8143 BLAKE2B 0ec49f17dc3058b5cb70c293d3c36c7f7de4866b8e0b9fe421f90da86f9645fcdf9736f88aef32a982228e1dddce1f968af297beb7386b89e02e134ca3ff1c82 SHA512 db58c71bac9d85b7e3ec5268545dd0281307f012cc9e8a6383d187f4e378395c6f4290e392d97b6fc61464c29e4c4e2d00dc8cbfb659461a1a771fe8f59de575
-EBUILD imu_processors-0.2.1.ebuild 536 BLAKE2B e3fa445ab95374d77e9f11d0b1e1e690bc29698c30ea6431e7d2e3b5242b7a1e023149e3aef2c306ba54472f608e926f0f8ffff78aa0124948c947fb9ccf4949 SHA512 f3b9e557c9f8bfdffa68277b5a809bee86dbbd34420abe9fe70447c54fa3ce385e101904497437dfdf0d14bdca275783cb892b1a069eefe9f396b34b3e569331
-EBUILD imu_processors-0.2.2.ebuild 536 BLAKE2B 52d7f27a6f397075744915a445030425a12e46b284d083b32e934260eee129fa473673d2628d284343bbf78f1a356451f02165603cb238cd2a0074107dd80597 SHA512 619583a316723f8f0f90e5a3191ae221ac21103ff07a8380078a0b256c825d9d3437f5b6481c1a529b3d8410df6fc13eb9d88cb374210d6bb68178cee4909faa
-EBUILD imu_processors-0.2.3.ebuild 533 BLAKE2B 3fbe84ce919506bdce14ff433c573c0599d418001df2dba76a2cc49655234a59a13e8afe259fa95c4612fadd3d7b55c39cf188f1f220b48a200fdbb3b026d03a SHA512 cfb7443161ef3c076d7852061a6a04aaf31cae689034d4f736bb41575554e9f9249c1d1436166f0ec85402548b9ebd63ca27149d014c5faea34c34841980ba9c
-EBUILD imu_processors-9999.ebuild 536 BLAKE2B e3fa445ab95374d77e9f11d0b1e1e690bc29698c30ea6431e7d2e3b5242b7a1e023149e3aef2c306ba54472f608e926f0f8ffff78aa0124948c947fb9ccf4949 SHA512 f3b9e557c9f8bfdffa68277b5a809bee86dbbd34420abe9fe70447c54fa3ce385e101904497437dfdf0d14bdca275783cb892b1a069eefe9f396b34b3e569331
+DIST imu_pipeline-0.3.0.tar.gz 8162 BLAKE2B 09bfcb10bc49691418e23fbde26203769857b9c6b0631beaa51c09b5abc599c7988a0c582908a392b12cffaf3a488c0863450922aea18c68906fc0c3da46119c SHA512 b6b18c559fa859b5c1534bef96d1d4cd15c34c9866045dc2e32f82981189515c003ac90e197a1ba85c785870e34865318481bb7941a82f643a08266213026b4b
+EBUILD imu_processors-0.3.0.ebuild 534 BLAKE2B 7e053ed7dc5e0fa3e68512bee5e0e96fe271aceedaab636b0f974000edda20789b6c1ef199b65eaa121d85fa68aeb50671e6c54d223e82d0d88851cb2f06dc60 SHA512 7af763fe68eaf4626501e9a80d9994aa20e619124e39822be234a28f0a830bd66e8af24909c317420abbca81786a13e8bf59213af2e82a8763204a9f6c619d41
+EBUILD imu_processors-9999.ebuild 534 BLAKE2B 7e053ed7dc5e0fa3e68512bee5e0e96fe271aceedaab636b0f974000edda20789b6c1ef199b65eaa121d85fa68aeb50671e6c54d223e82d0d88851cb2f06dc60 SHA512 7af763fe68eaf4626501e9a80d9994aa20e619124e39822be234a28f0a830bd66e8af24909c317420abbca81786a13e8bf59213af2e82a8763204a9f6c619d41
 MISC metadata.xml 341 BLAKE2B 25a24a32562bee0499af4b1e1a59341a7087ae303f179dc1f83b7b67c16f6fb6d9c835eafeaf6cd006e5ff9bae9d6ccc661ea2319656532436e4b6b093231f20 SHA512 37ef287b9a99e47b966f647c2ec1690bc6339f2f82047a1cefecd138ffe388ac2900c744999385c86dd9819c2664ac89b36ab64dcded0d2358aa703b16115761
diff --git a/dev-ros/imu_processors/imu_processors-0.2.1.ebuild b/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
deleted file mode 100644
index 4848998eaf36..000000000000
--- a/dev-ros/imu_processors/imu_processors-0.2.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Processors for sensor_msgs::Imu data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-0.2.2.ebuild b/dev-ros/imu_processors/imu_processors-0.2.2.ebuild
deleted file mode 100644
index 2aa7070db8b7..000000000000
--- a/dev-ros/imu_processors/imu_processors-0.2.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Processors for sensor_msgs::Imu data"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-0.2.3.ebuild b/dev-ros/imu_processors/imu_processors-0.3.0.ebuild
similarity index 87%
rename from dev-ros/imu_processors/imu_processors-0.2.3.ebuild
rename to dev-ros/imu_processors/imu_processors-0.3.0.ebuild
index b0d8ecc9d6ba..d6a179c9745f 100644
--- a/dev-ros/imu_processors/imu_processors-0.2.3.ebuild
+++ b/dev-ros/imu_processors/imu_processors-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,8 +16,9 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
+"
+DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_processors/imu_processors-9999.ebuild b/dev-ros/imu_processors/imu_processors-9999.ebuild
index 4848998eaf36..d6a179c9745f 100644
--- a/dev-ros/imu_processors/imu_processors-9999.ebuild
+++ b/dev-ros/imu_processors/imu_processors-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -16,8 +16,9 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/tf
+"
+DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/Manifest b/dev-ros/imu_transformer/Manifest
index 060e59fd4d49..95028093d41f 100644
--- a/dev-ros/imu_transformer/Manifest
+++ b/dev-ros/imu_transformer/Manifest
@@ -1,7 +1,4 @@
-AUX pluginlib.patch 725 BLAKE2B 618e82a15e171459997bf508acad38d577e04fc77188f13dfba7dd3b109c845e96eaf6e7a236944097c822e03261981f571d5cb7ee6399e7df7737e42cbb7ed8 SHA512 5d03d7042fc4cc22a30dd9b39b6e024d0a157dc8370d0d39b19103f7c73d42d75db839f55faca1e2b8bf01caf8cfe3c02ca46a78f87bc9a66e44b2394e87ece8
-DIST imu_pipeline-0.2.2.tar.gz 8080 BLAKE2B cdeeb7b95cca23aa7c30902b3be3daa34af222ff660058c1e57cf02b75008d4840b82cb52dbf7fa9a2968b2e41244fe7f1833429bd04280fdf68fb7fff2d240d SHA512 95913f3edec9af4d981d6034beb8932bba2e8a4d05a72c70c1bf2bcd5b85a9afa490e2916b6e4178e35b6a1967208999bfb697f5925ce12cae7e57fad2721f3f
-DIST imu_pipeline-0.2.3.tar.gz 8143 BLAKE2B 0ec49f17dc3058b5cb70c293d3c36c7f7de4866b8e0b9fe421f90da86f9645fcdf9736f88aef32a982228e1dddce1f968af297beb7386b89e02e134ca3ff1c82 SHA512 db58c71bac9d85b7e3ec5268545dd0281307f012cc9e8a6383d187f4e378395c6f4290e392d97b6fc61464c29e4c4e2d00dc8cbfb659461a1a771fe8f59de575
-EBUILD imu_transformer-0.2.2-r1.ebuild 752 BLAKE2B f7cd1f813ebd7aff89edc3d4f4f2a5261ebf45bd4863b01ea2e1cddfb1c7ca7ed37824b8688942a3082daf412b3c87d13581c307f2ff8af0cb44173c53754450 SHA512 4dde22eeced427c0699cc8f8f9f94367c0492a2b25e0f5b8dd16dbcf032f7539a00f63c8ecd4e25cc8f5ee6134b0c1ae135e4171054bf02a5b39aecfae7e51e9
-EBUILD imu_transformer-0.2.3.ebuild 707 BLAKE2B a9de63ed90980d8d52b5d5263d880e63e149b4a53e18a9f2f5569698d5ea610965518644dc4084d79a8a3a2793cf541b8d5d4e0146410cac31e31302e365201c SHA512 85242fc494d5ca62d8eab9dbedf83a83feadead77135e4e1c5add19e193fa4466622615afdfca59b9a16cbefdd4a9cb0700064b71b5b4bdd0f194e27be9fc4bd
-EBUILD imu_transformer-9999.ebuild 710 BLAKE2B 66bdc536e40b5096f04518ffdcbae045689ba9138c178223589f4c87681c9c98479583433340eca588c5e1aafe7c9b74fa55794cca0a8ad3869108fefd52c7c5 SHA512 29f56b06b288ba78d230172b0baf19f549c80d7c8356a31f7e5c4903d0e6f73766ace85ff8cdf99f045119b0f5f79aa0a77fc8f8819d495d8dcdc747a6fa1112
+DIST imu_pipeline-0.3.0.tar.gz 8162 BLAKE2B 09bfcb10bc49691418e23fbde26203769857b9c6b0631beaa51c09b5abc599c7988a0c582908a392b12cffaf3a488c0863450922aea18c68906fc0c3da46119c SHA512 b6b18c559fa859b5c1534bef96d1d4cd15c34c9866045dc2e32f82981189515c003ac90e197a1ba85c785870e34865318481bb7941a82f643a08266213026b4b
+EBUILD imu_transformer-0.3.0.ebuild 681 BLAKE2B 262d8aa99dc756ae6f247881f5085d036bc81cdad5b7b7ddf4e1cba36fbc44d8acea76af84c9832ce051fb20b8287bc70522200ded78b7b2fb2aba00a162f5c6 SHA512 d80206f12bb50c98d0bf5baea502b1a865d46667c3a2a8cece88b2f5a11fae7a70973bf900fcb93f761aa2b2516f417584213762a5f7f1bf89f9deede8ec6414
+EBUILD imu_transformer-9999.ebuild 681 BLAKE2B 262d8aa99dc756ae6f247881f5085d036bc81cdad5b7b7ddf4e1cba36fbc44d8acea76af84c9832ce051fb20b8287bc70522200ded78b7b2fb2aba00a162f5c6 SHA512 d80206f12bb50c98d0bf5baea502b1a865d46667c3a2a8cece88b2f5a11fae7a70973bf900fcb93f761aa2b2516f417584213762a5f7f1bf89f9deede8ec6414
 MISC metadata.xml 341 BLAKE2B 25a24a32562bee0499af4b1e1a59341a7087ae303f179dc1f83b7b67c16f6fb6d9c835eafeaf6cd006e5ff9bae9d6ccc661ea2319656532436e4b6b093231f20 SHA512 37ef287b9a99e47b966f647c2ec1690bc6339f2f82047a1cefecd138ffe388ac2900c744999385c86dd9819c2664ac89b36ab64dcded0d2358aa703b16115761
diff --git a/dev-ros/imu_transformer/files/pluginlib.patch b/dev-ros/imu_transformer/files/pluginlib.patch
deleted file mode 100644
index a7f519b1d26b..000000000000
--- a/dev-ros/imu_transformer/files/pluginlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit 2c98b4c99b90bf88eabcd1ce071c7194ae05bf2b
-Author: Mikael Arguedas <mikael@osrfoundation.org>
-Date:   Fri Oct 27 15:03:06 2017 -0700
-
-    update to use non deprecated pluginlib macro
-
-diff --git a/imu_transformer/src/imu_transformer_nodelet.cpp b/imu_transformer/src/imu_transformer_nodelet.cpp
-index 7c0a30f..9ad94ec 100644
---- a/imu_transformer/src/imu_transformer_nodelet.cpp
-+++ b/imu_transformer/src/imu_transformer_nodelet.cpp
-@@ -123,4 +123,4 @@ namespace imu_transformer
- 
- }
- 
--PLUGINLIB_DECLARE_CLASS(imu_transformer, ImuTransformerNodelet, imu_transformer::ImuTransformerNodelet, nodelet::Nodelet);
-\ No newline at end of file
-+PLUGINLIB_EXPORT_CLASS(imu_transformer::ImuTransformerNodelet, nodelet::Nodelet)
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild b/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
deleted file mode 100644
index 425e2e0e9797..000000000000
--- a/dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslaunch
-	dev-ros/tf2
-	dev-ros/tf2_ros
-	dev-ros/topic_tools
-	dev-ros/tf2_sensor_msgs
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/pluginlib.patch" )
diff --git a/dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild b/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
similarity index 76%
rename from dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild
rename to dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
index adf4a3b40001..6c857007d463 100644
--- a/dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild
+++ b/dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+DESCRIPTION="Transforms sensor_msgs::Imu data from one frame into another"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -23,8 +23,9 @@ RDEPEND="
 	dev-ros/tf2_ros
 	dev-ros/topic_tools
 	dev-ros/tf2_sensor_msgs
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/imu_transformer/imu_transformer-9999.ebuild b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
index b51a391ae5de..6c857007d463 100644
--- a/dev-ros/imu_transformer/imu_transformer-9999.ebuild
+++ b/dev-ros/imu_transformer/imu_transformer-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another"
+DESCRIPTION="Transforms sensor_msgs::Imu data from one frame into another"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
@@ -23,8 +23,9 @@ RDEPEND="
 	dev-ros/tf2_ros
 	dev-ros/topic_tools
 	dev-ros/tf2_sensor_msgs
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_markers/Manifest b/dev-ros/interactive_markers/Manifest
index 8648acd0904b..8482fd7de76a 100644
--- a/dev-ros/interactive_markers/Manifest
+++ b/dev-ros/interactive_markers/Manifest
@@ -1,6 +1,4 @@
-DIST interactive_markers-1.11.3.tar.gz 30201 BLAKE2B 5f0ce32737bf6f61fe26ebbbaddf0222123fee26106eb0726817e6d2112bfa4861b0a2571beb2a94ed8d3fdeab6e8e4e0cf9820721349fddb82a68fe9e4adb5f SHA512 9d4c44b67474aefae33498e03f7dfaafd2b28bef42a780900f3c9b3c7b119e0f899bc9220d449e44f071257dff093f7af745f97cb2e75fc949ed54f53c60d46c
-DIST interactive_markers-1.11.4.tar.gz 29971 BLAKE2B cd260fe0f03fb10322f8c717f3532657123a8298f140db33ae927f054fa373b219fdcba1c4423bb38ed9b3cd5c5f10b4459e3b18e711b6acab5393b3019e4795 SHA512 e78d0ecd8c702aebcdbb28f4f227f1d0baeb71d4af952a2a2d385e2ced0bf5e6afd8e810ef99015bdf3c2284b583b0eb7776705caf30ba5ff3b4a77d16e12e94
-EBUILD interactive_markers-1.11.3.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
-EBUILD interactive_markers-1.11.4.ebuild 737 BLAKE2B 93d435caa72c476bf26f9ca60dc34026ac66aa72de997125220a83d85724025017b1a41193fe9c8adf143e0216f9fa53b4db78c21f8965e42c6a660a9bf04a6a SHA512 1278189984374a320e82effca2039c96876a547afd8c8c52ecbafc3a4f47956a328de34bd53d738c6825f09d1520853dd31c5ddd236bef2caa21c17af83b6551
-EBUILD interactive_markers-9999.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
+DIST interactive_markers-1.12.0.tar.gz 31698 BLAKE2B f71c9452688ae302f8053f7a75b471c833698bfd9eb99e95de2c42af4af3de7ea9d4f2327129e63f2b9327b92d560a9a8379c43ca02a3a3077eee8cda542f54b SHA512 9af0d27fa25ad9f56135948bc3aef523a5d2ac1018831268f224f3809646c770b19114904ba79dfdcefff96c7455f927cba692fd010c12d7cab6bf760820659b
+EBUILD interactive_markers-1.12.0.ebuild 799 BLAKE2B f78a45925159ffac106baa27dbf67b88818112e2518f4dc1688e022a677222900b7f55ff8874d02014b1370112ec1539931201f2b31de2c8d30446b61c3daefd SHA512 3c62251a5d2897706352b6801f471f2b17b86505aada4c022a73897ed278fe92ab9b293c7bc24ba04fb72de319b04e706e550f57f34895d804da4fdf23d54850
+EBUILD interactive_markers-9999.ebuild 799 BLAKE2B f78a45925159ffac106baa27dbf67b88818112e2518f4dc1688e022a677222900b7f55ff8874d02014b1370112ec1539931201f2b31de2c8d30446b61c3daefd SHA512 3c62251a5d2897706352b6801f471f2b17b86505aada4c022a73897ed278fe92ab9b293c7bc24ba04fb72de319b04e706e550f57f34895d804da4fdf23d54850
 MISC metadata.xml 351 BLAKE2B b177ef1311b10a0939dc8778be7461072e9919a6318acca86e32a36d102698a50e6a77ec30ef99976d5d2b8660be7e658667f7f63ee80c30c8b8319fd618c655 SHA512 901123473444518fc3f02d2496a045d6154e35bce54f9e76d927cfa4cf268556f8479ec2a1f4f60655d7efaef3ee51b175301811012b171244c7667d6b8ecc49
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
deleted file mode 100644
index edbf6132aa08..000000000000
--- a/dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild b/dev-ros/interactive_markers/interactive_markers-1.12.0.ebuild
similarity index 57%
rename from dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
rename to dev-ros/interactive_markers/interactive_markers-1.12.0.ebuild
index c9e821947cd1..ceca48dda05a 100644
--- a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
+++ b/dev-ros/interactive_markers/interactive_markers-1.12.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
 	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_ros
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/interactive_markers/interactive_markers-9999.ebuild b/dev-ros/interactive_markers/interactive_markers-9999.ebuild
index edbf6132aa08..ceca48dda05a 100644
--- a/dev-ros/interactive_markers/interactive_markers-9999.ebuild
+++ b/dev-ros/interactive_markers/interactive_markers-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/interactive_markers"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/roscpp
 	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf2_ros
 "
 DEPEND="${RDEPEND}
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/ivcon/Manifest b/dev-ros/ivcon/Manifest
index ef8589f78f43..75cdddf95211 100644
--- a/dev-ros/ivcon/Manifest
+++ b/dev-ros/ivcon/Manifest
@@ -1,8 +1,4 @@
-DIST ivcon-0.1.5.tar.gz 137970 BLAKE2B b99fcb17cbc6ba4bb4d076156dbb3dc5e2869b92dd919ec8ae1eec83bf55e58ec8d460c9cd2833f9648d57c9e4476b53658c0cd224d34d3cf794b241e1054c9d SHA512 943f1eecf06e90300ecc0c33f91b076a22adc04ec04414d8deb213fee69b2cf13f41844d4ded7a0befabac15bf51352b61c667fb3fad8478784d0825c7e1a268
-DIST ivcon-0.1.6.tar.gz 137996 BLAKE2B 36d0d785d833263642bf307467cddb7ba224b9ea3e118c345c5d77ced6f2e3af86111203f87cfce7d8f0d767cc47dbdc88fbecd4b1d6dd8646cee576c209e2f6 SHA512 ecfae9eb69f62a70131281e8b1b485a5e95e166b5b24d3c313c220f10e746db15a644a6747debcde5b983f2c743ca8d5b3f8bcd2ef963290f8122bbb66e23aea
 DIST ivcon-0.1.7.tar.gz 139018 BLAKE2B 780a0438bf9d9c14714e91639e8c24624d4a3d7dfc0f4ea8ebfea0d42a4e75cce9559642afdc1cabc9b2fcddfac57fecdcbf350d1947d3ab9bbe93c19736d9d1 SHA512 d533c4ab3a708411283b7bd03e6aefb3337edbf50b15b6be56f1aa5df803a0406b52663eee154007eb8980dcff60794206865f62e1910e0239afbd0d328a7c18
-EBUILD ivcon-0.1.5.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
-EBUILD ivcon-0.1.6.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
-EBUILD ivcon-0.1.7.ebuild 298 BLAKE2B 8e30b7c03c139699c26f81b9a33da0307d5a38316b278be9bec2c61bc091ef928a09afecc0c9a6dbf0b3e4493573d9041e663a5df7761522f77eb621f7f6b204 SHA512 368f36dc19f8b6dc67ae13e3732b7b5b098c5174ac8f2854215395c90b5e9e1795031db71985931b9346fda9a18216f5cb7dc0155c6589a2a20816c691827763
-EBUILD ivcon-9999.ebuild 301 BLAKE2B 49ac6a2b542854877de9fb16082de9a33deab177b77c65ff31ffbbe93670b2ba0e1f729c68fa27b0d8e3e2e57d66a429d02accc417c0a3095b709caff979d12f SHA512 9332a4bd11afe3d07bf666eab27e6d49a54c722c68c6874459efa45133a3df0786f849b6256a040f25b24cd77a6145534157e8f642166d20811508c320b06ad1
+EBUILD ivcon-0.1.7.ebuild 298 BLAKE2B 4790c1d51cd58801e494d40bd049e823b3dfde3da4ef83f44256f6be2d20fb4d9e4b50083949ae078c8e6180464bec99f14853ddf3d3acec454a906ef86eb69a SHA512 da31039d263dc20efb02ee0a176bea3798b0992c61b6dbe0b95f6c623e2dfed71f3adc63dfec9e3b42b91640d1fd7189a4b8ce24a53691ac6333ae85ef903ce0
+EBUILD ivcon-9999.ebuild 298 BLAKE2B 4790c1d51cd58801e494d40bd049e823b3dfde3da4ef83f44256f6be2d20fb4d9e4b50083949ae078c8e6180464bec99f14853ddf3d3acec454a906ef86eb69a SHA512 da31039d263dc20efb02ee0a176bea3798b0992c61b6dbe0b95f6c623e2dfed71f3adc63dfec9e3b42b91640d1fd7189a4b8ce24a53691ac6333ae85ef903ce0
 MISC metadata.xml 323 BLAKE2B faf34557869bd07626814c86cfbc6508b774aea2ef8cc89c70462c4bf7071159528a95778ec18131f001168f035fe2c20948612b6a0562573eeba4077aa81b0a SHA512 ace865326c08cdc06844cb56696bb5b3332a196816c9a29329b39adb3d4e864e527fda5729ee1386f44b24eed39f3e131e979dac3dd1370792fb4b6839154d64
diff --git a/dev-ros/ivcon/ivcon-0.1.5.ebuild b/dev-ros/ivcon/ivcon-0.1.5.ebuild
deleted file mode 100644
index 4dedf9a94d13..000000000000
--- a/dev-ros/ivcon/ivcon-0.1.5.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ivcon"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Mesh Conversion Utility"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/ivcon/ivcon-0.1.6.ebuild b/dev-ros/ivcon/ivcon-0.1.6.ebuild
deleted file mode 100644
index 4dedf9a94d13..000000000000
--- a/dev-ros/ivcon/ivcon-0.1.6.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/ivcon"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="Mesh Conversion Utility"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/ivcon/ivcon-0.1.7.ebuild b/dev-ros/ivcon/ivcon-0.1.7.ebuild
index 2ae89be1b536..3576890e1fa1 100644
--- a/dev-ros/ivcon/ivcon-0.1.7.ebuild
+++ b/dev-ros/ivcon/ivcon-0.1.7.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/ivcon"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/ivcon/ivcon-9999.ebuild b/dev-ros/ivcon/ivcon-9999.ebuild
index 4dedf9a94d13..3576890e1fa1 100644
--- a/dev-ros/ivcon/ivcon-9999.ebuild
+++ b/dev-ros/ivcon/ivcon-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/ivcon"
 KEYWORDS="~amd64"
 
diff --git a/dev-ros/kdl_parser/Manifest b/dev-ros/kdl_parser/Manifest
index 253eaab82ebb..99ec11c9e509 100644
--- a/dev-ros/kdl_parser/Manifest
+++ b/dev-ros/kdl_parser/Manifest
@@ -1,8 +1,4 @@
-DIST kdl_parser-1.12.10.tar.gz 950156 BLAKE2B 5e125c236888459e7ea4cdb6a556961e4f9008a99b9f76ec9cd243bdcc85994d07dc8d2a004b101bdab99f4b62e5a004793956d44edd5f8a2cd2fdfbbd56dc4a SHA512 a0d8046c65cc575cbf6ca5ab926997a4faae2f5fc0ecb7c8ab16c8145b655a1d2b516bfb6b834740fff758f76e2afc0d2aa1b3f612f7345d84a8e87cd5693ddb
-DIST kdl_parser-1.13.0.tar.gz 950647 BLAKE2B 7a87cc5f4b2c1bd870bee1b19a7be55e52c4d7c7ca44d1e3f3ef68419f7f775fef0fbec0a19651d37c479af6f8b41b085e86a9666211a7e030442854adbec7fd SHA512 f9b962ecc6e0f3c408619bc9c57f278a2e95228e735f452b9a45ce970752f6df37cbb5f331914412f04ebf31cf2862a056893d302fc2dad8af31cf538d717a9a
-DIST kdl_parser-1.13.1.tar.gz 29933 BLAKE2B 3668b95df9d7bd06dc4d95098828d1d84f740f8e16e69f09bc09fb245ccd03c4ccf0e73e23860f19fc8949ced94415f7fb9effa3bc7215c7146c3ebcccbfcb4a SHA512 007d46978fd21608ced51d0261069d496e6ea64bf11960e46abf5da5b9a968d5ccbbafd6620044f98e441ff44c2b943f9ba5b9ee060243d80a975c140e6e36fb
-EBUILD kdl_parser-1.12.10.ebuild 546 BLAKE2B 35355c01ebb0532857ffc40bf69784f5053783acab720fb229f5ee9efd9616a14893d31f00b360901a72cf67768ed4567d89288ed7ddccca7a47e08c5ac6ab2a SHA512 b00bbdeffda23138d4ee226e8da7e9899c92836e4bc3aebd9bc7a11b25fe12b50bf718e62bd63ed8c34ea2a04dd0f497e4556cf5a3cfb8f3841fddbafc1896ff
-EBUILD kdl_parser-1.13.0.ebuild 558 BLAKE2B fae314c5f15145311de27b8acde5eb489a116358f4a640364d6c1a3a6b0b9a013742e10ea3c4c5045f83ecd95ff5a95c26f863d03d5f428a6a9bbc2f5790f09b SHA512 bd94febc969bc2f005d5848ceb03e4277bb450f585cd90fabb2d5fe6e4d88e06fdf451f849829cf46e5f0a153b19b362e355b9a0fb3547cb2ae1e005d0b194c6
-EBUILD kdl_parser-1.13.1.ebuild 558 BLAKE2B fae314c5f15145311de27b8acde5eb489a116358f4a640364d6c1a3a6b0b9a013742e10ea3c4c5045f83ecd95ff5a95c26f863d03d5f428a6a9bbc2f5790f09b SHA512 bd94febc969bc2f005d5848ceb03e4277bb450f585cd90fabb2d5fe6e4d88e06fdf451f849829cf46e5f0a153b19b362e355b9a0fb3547cb2ae1e005d0b194c6
-EBUILD kdl_parser-9999.ebuild 558 BLAKE2B fae314c5f15145311de27b8acde5eb489a116358f4a640364d6c1a3a6b0b9a013742e10ea3c4c5045f83ecd95ff5a95c26f863d03d5f428a6a9bbc2f5790f09b SHA512 bd94febc969bc2f005d5848ceb03e4277bb450f585cd90fabb2d5fe6e4d88e06fdf451f849829cf46e5f0a153b19b362e355b9a0fb3547cb2ae1e005d0b194c6
+DIST kdl_parser-1.14.0.tar.gz 31861 BLAKE2B dc4ad1ebafd4435156e39f38cec0b8b0dc4368195ff0b17009577511645ea6f1eae01edaeaba49bf50da3ca498a992b7e5d5f804ad9ccc020f398fe85bd26da8 SHA512 9661c4b4d1d3839d64c7b5579a751f6d02bbfe07c562f2b63919563470b255a6934ef57ed240105238bd8034388d910c2933f359d68b988d3106fc182b7c2600
+EBUILD kdl_parser-1.14.0.ebuild 527 BLAKE2B 09c9991ed068568dfdf555c9579ccb494bd6a02aca0e54d2fc93f7b74bd6cd6416edec5b3b856ea3382ef53b5d6bb2052fb7432c1aaa2c1733a47eea52776521 SHA512 6274cba5afdb23f63a9466e5937fbb678e3dae97b451d4581e7823f157f1908145435b075af2d76020c6cf950e8ab99fa422002de4c517f9f4706a4d85f6c8ed
+EBUILD kdl_parser-9999.ebuild 527 BLAKE2B 09c9991ed068568dfdf555c9579ccb494bd6a02aca0e54d2fc93f7b74bd6cd6416edec5b3b856ea3382ef53b5d6bb2052fb7432c1aaa2c1733a47eea52776521 SHA512 6274cba5afdb23f63a9466e5937fbb678e3dae97b451d4581e7823f157f1908145435b075af2d76020c6cf950e8ab99fa422002de4c517f9f4706a4d85f6c8ed
 MISC metadata.xml 328 BLAKE2B a679a99d8839aa27a1cf8d33b125750c3ad1ccc76886d5b95b0a4dff0303e424c3b032f32c308ea5df9c10ca3f8686b2236d773b1a21d91eed45bbda8f71498b SHA512 c42cdb9f390f16b0e8cb2f0bad63d9b256ec01bf8cb1a49476bf7383678140debb1f5cca9682458205a4756e1917ce46feb93a99420444a52fed7faba6ccdcc8
diff --git a/dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild b/dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild
deleted file mode 100644
index 5944ea9f2179..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	dev-ros/urdf
-	sci-libs/orocos_kdl
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild b/dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild
deleted file mode 100644
index c135325db1b6..000000000000
--- a/dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Constructs a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=
-	dev-ros/roscpp
-	dev-ros/rosconsole
-	>=dev-ros/urdf-1.13
-	sci-libs/orocos_kdl:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild b/dev-ros/kdl_parser/kdl_parser-1.14.0.ebuild
similarity index 86%
rename from dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild
rename to dev-ros/kdl_parser/kdl_parser-1.14.0.ebuild
index c135325db1b6..c086e5303179 100644
--- a/dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-1.14.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/kdl_parser"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/kdl_parser/kdl_parser-9999.ebuild b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
index c135325db1b6..c086e5303179 100644
--- a/dev-ros/kdl_parser/kdl_parser-9999.ebuild
+++ b/dev-ros/kdl_parser/kdl_parser-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/kdl_parser"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/kdl_parser_py/Manifest b/dev-ros/kdl_parser_py/Manifest
index f81beee4f464..3013618f6e4d 100644
--- a/dev-ros/kdl_parser_py/Manifest
+++ b/dev-ros/kdl_parser_py/Manifest
@@ -1,8 +1,4 @@
-DIST kdl_parser-1.12.10.tar.gz 950156 BLAKE2B 5e125c236888459e7ea4cdb6a556961e4f9008a99b9f76ec9cd243bdcc85994d07dc8d2a004b101bdab99f4b62e5a004793956d44edd5f8a2cd2fdfbbd56dc4a SHA512 a0d8046c65cc575cbf6ca5ab926997a4faae2f5fc0ecb7c8ab16c8145b655a1d2b516bfb6b834740fff758f76e2afc0d2aa1b3f612f7345d84a8e87cd5693ddb
-DIST kdl_parser-1.13.0.tar.gz 950647 BLAKE2B 7a87cc5f4b2c1bd870bee1b19a7be55e52c4d7c7ca44d1e3f3ef68419f7f775fef0fbec0a19651d37c479af6f8b41b085e86a9666211a7e030442854adbec7fd SHA512 f9b962ecc6e0f3c408619bc9c57f278a2e95228e735f452b9a45ce970752f6df37cbb5f331914412f04ebf31cf2862a056893d302fc2dad8af31cf538d717a9a
-DIST kdl_parser-1.13.1.tar.gz 29933 BLAKE2B 3668b95df9d7bd06dc4d95098828d1d84f740f8e16e69f09bc09fb245ccd03c4ccf0e73e23860f19fc8949ced94415f7fb9effa3bc7215c7146c3ebcccbfcb4a SHA512 007d46978fd21608ced51d0261069d496e6ea64bf11960e46abf5da5b9a968d5ccbbafd6620044f98e441ff44c2b943f9ba5b9ee060243d80a975c140e6e36fb
-EBUILD kdl_parser_py-1.12.10.ebuild 486 BLAKE2B 760fdde881f695a6527a0abe22906e019c249314b82bffd739f6950fdcb9b5ef82a82a87307ed8eb32764c5f8097686540b4ab1b49745ce2a6575646d071cff0 SHA512 01e944dfe2cd014dc46713226d9b0a26616a71524249a20899c02b5819c3311821d8b238eb3be50f5a214b465c9b68df208f0fbc70d00ab83aefbd49127235bf
-EBUILD kdl_parser_py-1.13.0.ebuild 493 BLAKE2B d3f26a858bdd822cfbaa0e66d3b8ca3566317dabbbc8f9e804ff3e91106196072830aa95f906aeb6827de40698b01a232952117d38f9c13810d666c9ec156738 SHA512 3a3aa3d1d18b39e88f27635f6a4522c0500bbbbcd3236ab036714eed826a44fd26a23db3b55c83d8f32aa1bdd529aec85951b8c20e181084bee1f2c4aecf95b6
-EBUILD kdl_parser_py-1.13.1.ebuild 493 BLAKE2B d3f26a858bdd822cfbaa0e66d3b8ca3566317dabbbc8f9e804ff3e91106196072830aa95f906aeb6827de40698b01a232952117d38f9c13810d666c9ec156738 SHA512 3a3aa3d1d18b39e88f27635f6a4522c0500bbbbcd3236ab036714eed826a44fd26a23db3b55c83d8f32aa1bdd529aec85951b8c20e181084bee1f2c4aecf95b6
-EBUILD kdl_parser_py-9999.ebuild 493 BLAKE2B d3f26a858bdd822cfbaa0e66d3b8ca3566317dabbbc8f9e804ff3e91106196072830aa95f906aeb6827de40698b01a232952117d38f9c13810d666c9ec156738 SHA512 3a3aa3d1d18b39e88f27635f6a4522c0500bbbbcd3236ab036714eed826a44fd26a23db3b55c83d8f32aa1bdd529aec85951b8c20e181084bee1f2c4aecf95b6
+DIST kdl_parser-1.14.0.tar.gz 31861 BLAKE2B dc4ad1ebafd4435156e39f38cec0b8b0dc4368195ff0b17009577511645ea6f1eae01edaeaba49bf50da3ca498a992b7e5d5f804ad9ccc020f398fe85bd26da8 SHA512 9661c4b4d1d3839d64c7b5579a751f6d02bbfe07c562f2b63919563470b255a6934ef57ed240105238bd8034388d910c2933f359d68b988d3106fc182b7c2600
+EBUILD kdl_parser_py-1.14.0.ebuild 462 BLAKE2B a0ec916b9c5a16597aabd244e760877ae9de3f5975eff0e46d29981adea79ab4dedd0e4895124760bea869562abc297847c1f94fbfa45fd466e2ae10e877cf55 SHA512 9a6e60876607c79768d5aabd49529c3ecbee4e098179ca03a38a946b3822230d3e0f2a25f6968be870c6143c8d504d2a06f73ee40b0d45d06ef40ea197607749
+EBUILD kdl_parser_py-9999.ebuild 462 BLAKE2B a0ec916b9c5a16597aabd244e760877ae9de3f5975eff0e46d29981adea79ab4dedd0e4895124760bea869562abc297847c1f94fbfa45fd466e2ae10e877cf55 SHA512 9a6e60876607c79768d5aabd49529c3ecbee4e098179ca03a38a946b3822230d3e0f2a25f6968be870c6143c8d504d2a06f73ee40b0d45d06ef40ea197607749
 MISC metadata.xml 328 BLAKE2B a679a99d8839aa27a1cf8d33b125750c3ad1ccc76886d5b95b0a4dff0303e424c3b032f32c308ea5df9c10ca3f8686b2236d773b1a21d91eed45bbda8f71498b SHA512 c42cdb9f390f16b0e8cb2f0bad63d9b256ec01bf8cb1a49476bf7383678140debb1f5cca9682458205a4756e1917ce46feb93a99420444a52fed7faba6ccdcc8
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild
deleted file mode 100644
index 94dd3f304a65..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urdf[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild
deleted file mode 100644
index def1545942d3..000000000000
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/kdl_parser"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python tools to construct a KDL tree from an XML robot representation in URDF"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/urdf-1.13[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
similarity index 84%
rename from dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild
rename to dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
index def1545942d3..4382cc917f2c 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/kdl_parser"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
index def1545942d3..4382cc917f2c 100644
--- a/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+++ b/dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/kdl_parser"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/laser_assembler/Manifest b/dev-ros/laser_assembler/Manifest
index b4ffa268ad19..3c22f7643a73 100644
--- a/dev-ros/laser_assembler/Manifest
+++ b/dev-ros/laser_assembler/Manifest
@@ -1,6 +1,5 @@
-DIST laser_assembler-1.7.6.tar.gz 22185 BLAKE2B 068c4d64e6de313a1609738880d1fa95b9d6e710e55c7c8d669d7d809955f7cd33a7b50d94abd05a18f5783d8a8b3287df21c7bc9310a6219c42a8c2db0d0561 SHA512 b3df050473a598569a9df796f3e23437604fd24b9bd1500d632c8f2a7fc0c2604063bdf28e5f5bfa5c79efa4f35abf5fb85602769d95935ef262b357e0af2dbb
-DIST laser_assembler-1.7.7.tar.gz 22199 BLAKE2B 5ae26ef567149e6f3015cd3188bcc1adb72c09a33f6594658a20f954a500a76ca44f0f87e47dd9ae9a195df120752c4b35564264a1530b75808d8544f9b9162b SHA512 b7eb6f875209f4a692d1a16934196548a607730dd861806cda8a2f4c6a46722a56590148267b635e2bd5ee31e5490d6c533868bed7328a22a365cb1b8c63ddef
-EBUILD laser_assembler-1.7.6.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
-EBUILD laser_assembler-1.7.7.ebuild 773 BLAKE2B 8c902f0232857fa1663031a67513c0c937d6686e1b0d858e74a33168d4874cc31d8b826ffefe6ab4724b914e75738a37244f81e3cc0d8be7d8db2bf02155e771 SHA512 50df22bb4bd666e928c79064ec3a7185ac38969b50da0d238e739de322b4ff632f20a687c0e895494b6cbaf1382e9e3c2e670b0227d32b38f0646340a9e44f49
-EBUILD laser_assembler-9999.ebuild 776 BLAKE2B 923601e1c227a5009744a7abf130d201074aafa9ff6002851a7eef5fe8d083b596ce40197adbee265b840aaa913866839cfebe637ea4fe2703aab3ace6b87b70 SHA512 e652eb8c33fbfe88c9f7417fb1d25488a0bb1faa39f6b126aaf35590caafd00839dfa10ae1d8953d7112a8250068d488a33379568c9a0e0c24ec59a932e6b20e
+AUX eigen.patch 710 BLAKE2B 8738ab211cd7bb105174fc4eccff6f9a4146addb0b3b814368b15fa81a13d1015889630ff6040e4376ea1440e61570c7a17cf1d65c7ad98076a10691ce6ca5f8 SHA512 8e5c7360ba01aa751b108fe0536d780cfe10ff7a4417b2aab8840dac445e227cf00b2a59e336e4f0a473a12150df719b94c12128ed47870fb5b9ab55aff40a65
+DIST laser_assembler-1.7.8.tar.gz 22255 BLAKE2B dd01153a6fecf649793f180f651f84c790218a34755e367c51994699e928e6ce39486ea6a93ae47136dcd0c66499946570064af8062bef0345f66c7659b4a0ef SHA512 bd13512bc7cacef7e7bb2107390e57538cb701c9593f5cdb3501729b7c38b922470038e6e85c44803051deb04b74e9f677b5707b0441ab21824485fcf1e60942
+EBUILD laser_assembler-1.7.8.ebuild 800 BLAKE2B f4866c4704ab035941083d923a641e66524d10f193e3401b6028303c3f8afa1cba197204ac49618380ed82fca84637be3087e5a05c344e86b3e99778ef80969e SHA512 afe5b6e79115495e58c567a46a66cbde1b83ba8ede2074c71242bc613e98fa5435d76ee5ab47e6d3fb137a9e28ff50f57996dcae4c57bc551955d4989be0de26
+EBUILD laser_assembler-9999.ebuild 800 BLAKE2B f4866c4704ab035941083d923a641e66524d10f193e3401b6028303c3f8afa1cba197204ac49618380ed82fca84637be3087e5a05c344e86b3e99778ef80969e SHA512 afe5b6e79115495e58c567a46a66cbde1b83ba8ede2074c71242bc613e98fa5435d76ee5ab47e6d3fb137a9e28ff50f57996dcae4c57bc551955d4989be0de26
 MISC metadata.xml 344 BLAKE2B 9f0a0af9b8ec8ea7a0e261981de8219df856a612762a2dc6986240610e76d0c1578b071cea0a25aa56e3462d0d871a9f8a117a0902971b6e5640e2511dfc9a8a SHA512 c9746c67ccaf314fa717cdde076e8094d48c7832e8d6e5402ffbaf7829c0205d8bfe281ffbafb4ee5933af5b49a2210d6b1645c07cf0dc2a78b9900230118d45
diff --git a/dev-ros/laser_assembler/files/eigen.patch b/dev-ros/laser_assembler/files/eigen.patch
new file mode 100644
index 000000000000..95c8c58bcdb3
--- /dev/null
+++ b/dev-ros/laser_assembler/files/eigen.patch
@@ -0,0 +1,15 @@
+Index: laser_assembler-1.7.8/CMakeLists.txt
+===================================================================
+--- laser_assembler-1.7.8.orig/CMakeLists.txt
++++ laser_assembler-1.7.8/CMakeLists.txt
+@@ -12,7 +12,9 @@ find_package(catkin REQUIRED COMPONENTS
+   ${THIS_PACKAGE_ROS_DEPS}
+   message_generation)
+ find_package(Boost REQUIRED COMPONENTS system)
+-include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
++find_package(Eigen3 REQUIRED)
++add_definitions(${EIGEN3_DEFINITIONS})
++include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
+ 
+ ##############################################################################
+ # Build service definitions
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
deleted file mode 100644
index 903bdb286b20..000000000000
--- a/dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Nodes to assemble point clouds from either LaserScan or PointCloud messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/tf
-	dev-ros/laser_geometry[${PYTHON_USEDEP}]
-	dev-ros/pluginlib
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-	dev-ros/message_filters[${PYTHON_USEDEP}]
-	dev-ros/filters
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
-"
diff --git a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
similarity index 87%
rename from dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
rename to dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
index 903bdb286b20..d6f39f3796a2 100644
--- a/dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
+++ b/dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -27,5 +26,7 @@ RDEPEND="
 	dev-ros/filters
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
 "
+PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_assembler/laser_assembler-9999.ebuild b/dev-ros/laser_assembler/laser_assembler-9999.ebuild
index b81ead0f3d81..d6f39f3796a2 100644
--- a/dev-ros/laser_assembler/laser_assembler-9999.ebuild
+++ b/dev-ros/laser_assembler/laser_assembler-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_assembler"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
@@ -27,5 +26,7 @@ RDEPEND="
 	dev-ros/filters
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )
 "
+PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_filters/Manifest b/dev-ros/laser_filters/Manifest
index d3ceaa8035e6..4ae9150a3580 100644
--- a/dev-ros/laser_filters/Manifest
+++ b/dev-ros/laser_filters/Manifest
@@ -1,6 +1,5 @@
-DIST laser_filters-1.8.6.tar.gz 29484 BLAKE2B b436a6715421940b55e15ab2393f06f988d1ab6d8756d3bbe90b4a189c7e5e669e2ddbd0926b8d6d149159cffe70a6c64aa600b47d6bf730ccbfc14b3e8e69ce SHA512 43662fb9a006730c34a37cd50425d54de2141294b5f271761d9e63416fa6633c3a505e637248dc4192606653d7d8083da1a42826e29495726b4744fc98ff9943
-DIST laser_filters-1.8.7.tar.gz 31072 BLAKE2B 296dd26e92e3d2e4ebe6e6c08d62224f684306bd4fdf198ca84a98801ddf884d85b7888a6d1d51e96b90403ae484c3d6d48a08c9218c1d7c118cf4518c70202a SHA512 8ea1af3af17c3d7870822230760dc8201ec7403db8246cb82f912ca6eb6bcd634df64ae757128dfa82d8fd2d297e3c2dfb066ca612d11933a4074379b35113bb
-EBUILD laser_filters-1.8.6.ebuild 641 BLAKE2B 9292584fd3190275f5ca6d2d2cbe28047f7e76d5135079f7b24945c063c95196356bb45c1b7b5ad92797509a2f17ca6169e242266c833d2ee87fd2bd1321313d SHA512 a333b0a64a0210fa160b68fce4851e2d7c5a2d75f61ae01aa8c5871bb3845f22801921644cc2ee9e48ce62bc98f3dc81bbfd16380ee439d8d78dc3766d6cd799
-EBUILD laser_filters-1.8.7.ebuild 638 BLAKE2B 19cd66c471e64e87e69614903d3fdd152d304adb797d2fe68e658b0a581a4aeeadf7c0d563526a19f7fa363545600b51a2aa08914d26f35234a92be517ef67cf SHA512 638ad97d98d29ae469075f3b52b3f06acf99f4e4325c428ba8e008e83778388a1bd91a8200fb923405cc85274524ec5ae0b569740f4230bbb646d71c9bfd98e5
-EBUILD laser_filters-9999.ebuild 641 BLAKE2B 72e5ce055e7dcfe13864e5d11c401d90e6c511ecc1ae9fc9001f1551278a4fcc48006edb1f9cc21035c079b150e9cfc192103da4745fae0a78cd92ad94b2cb1d SHA512 8dbfa82eaad2684ff480f4c966cb64e8ddac779f6ac5a2792bab38c2b7a43f1b15cc234e5dab991fe2f699cba72949225a33f3da8d81b8f690f26a76f301e314
+AUX eigen.patch 715 BLAKE2B dc12bfbb1eeba06624b70d0cab04a723288fd6740b66e8cba9d2e1108b050ab66efa361bc8a9f0455a338a228389d1b346401b77c94eec8b56dcfd51eabec2cc SHA512 f3cf4f9b2ddb8a6baff879e1eae5520c8db4da0b78b2d5af49b84cdde6b9a502cacb6eabfefb8ac36971ec1e86e673d8d0f7fca4e1c32d46001d2c693595dade
+DIST laser_filters-1.8.11.tar.gz 42303 BLAKE2B e5344b273ebe3f9ad75c32f15f15c69a241273def5b3a4b90e39b5a329f3d3a682f67e687c48da3d41c93db0fc94a39f31153ad23cbe1e4997139f57a4c34f75 SHA512 06833adfa96248e360f4bf1b267ddec6c9263296afe64eac3716014f53071ec8cedd8b73f93438d9072e3785843e2ba345f007036d680ba7f4fbd3b720f40b2e
+EBUILD laser_filters-1.8.11.ebuild 665 BLAKE2B 6c44bd800cabc46ebf4eaf504f71c2a65f5111153f512a7aaa46e0c2344fdc08f3f3a4284fb97f1ba2801ce0f4873602336cb9cabb19ef1d0874603bebab3e04 SHA512 de65242fdf273c438a3720fc91ce92e728cbb7ad1fc03871c5de20f26222b4be4c6b9660b5071ec18c16508aafe7eee5feef69219cc878ca0c040025ef24b716
+EBUILD laser_filters-9999.ebuild 665 BLAKE2B 6c44bd800cabc46ebf4eaf504f71c2a65f5111153f512a7aaa46e0c2344fdc08f3f3a4284fb97f1ba2801ce0f4873602336cb9cabb19ef1d0874603bebab3e04 SHA512 de65242fdf273c438a3720fc91ce92e728cbb7ad1fc03871c5de20f26222b4be4c6b9660b5071ec18c16508aafe7eee5feef69219cc878ca0c040025ef24b716
 MISC metadata.xml 342 BLAKE2B 92f4937b0999d701af2eb4810e3d0d9d713fd0238fa57500e7bfdbfc1d602afdd51252b796c3a27c2eb8ea398330b04c3d1f78ca8f5c307bf5adfb4570c3db6b SHA512 4ab282060abc14838675f8d99f245894bec67f8e824191e666671bfc6134383c23853137cff023f59b81141aae204f282d3b40e779627c375609fc4223af8ec5
diff --git a/dev-ros/laser_filters/files/eigen.patch b/dev-ros/laser_filters/files/eigen.patch
new file mode 100644
index 000000000000..1ad02504218b
--- /dev/null
+++ b/dev-ros/laser_filters/files/eigen.patch
@@ -0,0 +1,15 @@
+Index: laser_filters-1.8.11/CMakeLists.txt
+===================================================================
+--- laser_filters-1.8.11.orig/CMakeLists.txt
++++ laser_filters-1.8.11/CMakeLists.txt
+@@ -12,7 +12,9 @@ set(THIS_PACKAGE_ROS_DEPS sensor_msgs ro
+ 
+ find_package(catkin REQUIRED COMPONENTS ${THIS_PACKAGE_ROS_DEPS})
+ find_package(Boost REQUIRED COMPONENTS system)
+-include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS})
++find_package(Eigen3 REQUIRED)
++add_definitions(${EIGEN3_DEFINITIONS})
++include_directories(include ${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${EIGEN3_INCLUDE_DIR})
+ 
+ ##############################################################################
+ # Define package
diff --git a/dev-ros/laser_filters/laser_filters-1.8.7.ebuild b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
similarity index 85%
rename from dev-ros/laser_filters/laser_filters-1.8.7.ebuild
rename to dev-ros/laser_filters/laser_filters-1.8.11.ebuild
index 3f17816b445d..3dcc6e50c50e 100644
--- a/dev-ros/laser_filters/laser_filters-1.8.7.ebuild
+++ b/dev-ros/laser_filters/laser_filters-1.8.11.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,7 +15,6 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-ros/angles
 	dev-ros/filters
@@ -25,4 +23,7 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_filters/laser_filters-1.8.6.ebuild b/dev-ros/laser_filters/laser_filters-1.8.6.ebuild
deleted file mode 100644
index e85e0b8f46a1..000000000000
--- a/dev-ros/laser_filters/laser_filters-1.8.6.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Assorted filters designed to operate on 2D planar laser scanners"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf
-	dev-ros/angles
-	dev-ros/filters
-	dev-ros/laser_geometry
-	dev-libs/tinyxml2:=
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/laser_filters/laser_filters-9999.ebuild b/dev-ros/laser_filters/laser_filters-9999.ebuild
index 0dd0c51fad51..3dcc6e50c50e 100644
--- a/dev-ros/laser_filters/laser_filters-9999.ebuild
+++ b/dev-ros/laser_filters/laser_filters-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_filters"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,7 +15,6 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-libs/boost:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf
 	dev-ros/angles
 	dev-ros/filters
@@ -25,4 +23,7 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/eigen.patch" )
diff --git a/dev-ros/laser_geometry/Manifest b/dev-ros/laser_geometry/Manifest
index 97717f991e41..cb1789c31623 100644
--- a/dev-ros/laser_geometry/Manifest
+++ b/dev-ros/laser_geometry/Manifest
@@ -1,4 +1,4 @@
-DIST laser_geometry-1.6.4.tar.gz 16251 BLAKE2B ca19bde86a1669d6981651d81ff4c62ad0467e262065113612ee4dd30a05c40ddbddfb84800ea3411697e21a61d84daf7a2cd97c712833b44d7fe8183286c24b SHA512 5c490a30696c0b0a30b826a605b5f09849a971792d60b273491e1deb66b399dfb4c9a37c114c38294799064b2f4532bb6b0119664cd064a4ce9045f18ebd2736
-EBUILD laser_geometry-1.6.4.ebuild 735 BLAKE2B 0f25948dc9e8bad2cea0161794a9c46c14b3d5cad24d90756e9695e10edcc8ea2eec7f6c2c75cf722e4c3a4c114d84e0bb8e7d11993778871c107853a8ec2182 SHA512 1e57c2d28abee27463292c2ba4d61e49798eb061d7a1966d1a12a54319c07912de68cbac934d1abcab858785ca374355910a24e9ed8b20f53c4a5c694babf7bf
-EBUILD laser_geometry-9999.ebuild 735 BLAKE2B 0f25948dc9e8bad2cea0161794a9c46c14b3d5cad24d90756e9695e10edcc8ea2eec7f6c2c75cf722e4c3a4c114d84e0bb8e7d11993778871c107853a8ec2182 SHA512 1e57c2d28abee27463292c2ba4d61e49798eb061d7a1966d1a12a54319c07912de68cbac934d1abcab858785ca374355910a24e9ed8b20f53c4a5c694babf7bf
+DIST laser_geometry-1.6.5.tar.gz 17057 BLAKE2B 3894410f84d2aa76e57e894b6b601acf7d06d5603fbf8ccaaec8db28d9744b2435809ed1eb566b5e7e085be5c300b2cef3e718c1d551bd18e73e5310da232c4c SHA512 324391386d29a1599965e66b95cd48f5b1134df3d7a8589f528e3f476b897530f823bc32c02d4e02d89ce20aa0df76c0238b7522d9f7752f296662623de66041
+EBUILD laser_geometry-1.6.5.ebuild 738 BLAKE2B de67fd56b12a7042c8ddf6afe02622be9801011cdef170c4b307970a082938707dff1a527d2a0906336b7ef3953afcf0553be13a7a0cf1b5a6b6e21427584c37 SHA512 1f4c68a4edd477bbe78a6a162f010cb61f450b1d7f45cea44e97101536f9628536ad4f22640d2c02d5eb07d7abf3309ade97af2e723b90be742d3edda5938eec
+EBUILD laser_geometry-9999.ebuild 738 BLAKE2B de67fd56b12a7042c8ddf6afe02622be9801011cdef170c4b307970a082938707dff1a527d2a0906336b7ef3953afcf0553be13a7a0cf1b5a6b6e21427584c37 SHA512 1f4c68a4edd477bbe78a6a162f010cb61f450b1d7f45cea44e97101536f9628536ad4f22640d2c02d5eb07d7abf3309ade97af2e723b90be742d3edda5938eec
 MISC metadata.xml 343 BLAKE2B a797ebc84630a2db52e772c1d06a4df97d824941660a1e3a1709ba0498c20bbd300e794ee550e47727bb6bfb1d836b08ec63729be7ae439696bfd1035e5ae707 SHA512 7d4f2ddb636794d8d0b493ea1ef5a06b2cfac3bb5fb18f6daf174f16d719d9ceea5eca29762596dca085c94d3e1ab7a49047a8410933505521f0dbceb8c50b9f
diff --git a/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild b/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
similarity index 77%
rename from dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
rename to dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
index 4fdcc7652d02..5f424514dc10 100644
--- a/dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,7 +16,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-libs/boost:=[threads]
 	dev-ros/tf
 	dev-ros/tf2_ros[${PYTHON_USEDEP}]
@@ -25,5 +24,8 @@ RDEPEND="
 	dev-ros/angles
 "
 DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/laser_geometry/laser_geometry-9999.ebuild b/dev-ros/laser_geometry/laser_geometry-9999.ebuild
index 4fdcc7652d02..5f424514dc10 100644
--- a/dev-ros/laser_geometry/laser_geometry-9999.ebuild
+++ b/dev-ros/laser_geometry/laser_geometry-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_geometry"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -17,7 +16,7 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-libs/boost:=[threads]
 	dev-ros/tf
 	dev-ros/tf2_ros[${PYTHON_USEDEP}]
@@ -25,5 +24,8 @@ RDEPEND="
 	dev-ros/angles
 "
 DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+BDEPEND="
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/laser_proc/Manifest b/dev-ros/laser_proc/Manifest
index 5c498e07e2f6..8938692a9165 100644
--- a/dev-ros/laser_proc/Manifest
+++ b/dev-ros/laser_proc/Manifest
@@ -1,4 +1,4 @@
-DIST laser_proc-0.1.5.tar.gz 6924 BLAKE2B 75b06134a1d4a68ad54447355962959e0ae9ba5f2df889b3740cc3dfed48ea3ae22e3098a7f0973ac4e0c6ec089eddb9fc7784aee96cac3662bef8a873c60735 SHA512 96062485b2ca7467aa5c54b04463fe89eb91a726ad79055831c7dc1dfad19e42b0759703eec5b659475ad1d09f95f3703b30343655e590db29100ee8b0ebaa87
-EBUILD laser_proc-0.1.5.ebuild 551 BLAKE2B 41ddab0ac8a75a39137107962a0a93f75aa6b7dd7113bbc88ec2a4b2062a534a03f49001c05fe5b2a72287e3d87afecc39d23a7e6511c73998ac7de7ddd6d599 SHA512 953e4e22ef895406eb4a5ef9ea691c3adfd06b342fe7fdf4c7569af54b7d93e5e8939536db747eb75ead8341614d6f40c383c97b1565620f83b176b99404c03b
-EBUILD laser_proc-9999.ebuild 551 BLAKE2B b11840887b254f7212d6ddb80267c1ef51fc66c4f7f0817c09b2e00ac207592608285f23a442d5af57a948e0972cd5bc1baf182b47fb8e2191cb45f41027d0b7 SHA512 abfaf7d5f5544b829a93b00dffad30bbd6dd4e8e859ee8d29885f2a921b5c5b97f88c5b9ba12f52ccda0a70bcdb61e4cff82b15b31dfba5515c7455280f951e2
+DIST laser_proc-0.1.6.tar.gz 6945 BLAKE2B c19774c599e7d2da288e5daeada58b04c393801edc34d40cf173ca7d252a17e89b37facf58d4e22d4f9be372b9a0cf8ffb15d2f32c51125842b4efefb08d857b SHA512 a7bcb7ecff9bb884fa875ff59b1e728f408268dac90a13909e653367a2722e59eb435c3e0feba4fefe0e306a52adac69c98b66974ed610628a690d4e094a85f2
+EBUILD laser_proc-0.1.6.ebuild 525 BLAKE2B 8688db8dbe6c9c555d1f1c5849fdb167e5be54cb858e1cdf593abea0fa56b7311618a91f06ac44e900d2584e9fb85e312c3bf06d0db8e8655911624dbdc71e2a SHA512 30538127c35db69bb9ac2401c4cefc831cc39d8dd559d4fae30d1a43b2d21cb65d1eefd578ec21d58089f1934e33b5286eac60501c31fef0392451cc2a728ce8
+EBUILD laser_proc-9999.ebuild 525 BLAKE2B 8688db8dbe6c9c555d1f1c5849fdb167e5be54cb858e1cdf593abea0fa56b7311618a91f06ac44e900d2584e9fb85e312c3bf06d0db8e8655911624dbdc71e2a SHA512 30538127c35db69bb9ac2401c4cefc831cc39d8dd559d4fae30d1a43b2d21cb65d1eefd578ec21d58089f1934e33b5286eac60501c31fef0392451cc2a728ce8
 MISC metadata.xml 339 BLAKE2B 3cd1bb1057e014c06068a8bbe24e0186d454d11123a6658e1576b04d62283e30a6f9aae45f3d09beb81499f32c5f1af598d1a526e4da1b6ab5ec89f6eb55a1b6 SHA512 78c716d120dc9a894dee02b01757f746407c982097ba048522eae320ba8e5f83632bb81f693549d4440b3ff47f47739b67ad19df0e8f67c24ff414e79dac99eb
diff --git a/dev-ros/laser_proc/laser_proc-0.1.5.ebuild b/dev-ros/laser_proc/laser_proc-0.1.6.ebuild
similarity index 69%
rename from dev-ros/laser_proc/laser_proc-0.1.5.ebuild
rename to dev-ros/laser_proc/laser_proc-0.1.6.ebuild
index f21077e89fd5..2609d02c2feb 100644
--- a/dev-ros/laser_proc/laser_proc-0.1.5.ebuild
+++ b/dev-ros/laser_proc/laser_proc-0.1.6.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
 KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan"
+DESCRIPTION="Converts representations of LaserScan and MultiEchoLaserScan"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -16,9 +16,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
 	dev-ros/nodelet
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/laser_proc/laser_proc-9999.ebuild b/dev-ros/laser_proc/laser_proc-9999.ebuild
index daae664dcaa5..2609d02c2feb 100644
--- a/dev-ros/laser_proc/laser_proc-9999.ebuild
+++ b/dev-ros/laser_proc/laser_proc-9999.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/laser_proc"
 KEYWORDS="~amd64 ~arm"
 
 inherit ros-catkin
 
-DESCRIPTION="Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan"
+DESCRIPTION="Converts representations of LaserScan and MultiEchoLaserScan"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
@@ -16,9 +16,10 @@ RDEPEND="
 	dev-ros/roscpp
 	dev-ros/rosconsole
 	dev-libs/console_bridge:=
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/pluginlib
 	dev-ros/nodelet
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/libmavconn/Manifest b/dev-ros/libmavconn/Manifest
index c1431707e56c..4a9e20533f49 100644
--- a/dev-ros/libmavconn/Manifest
+++ b/dev-ros/libmavconn/Manifest
@@ -1,6 +1,4 @@
-AUX boost170.patch 3754 BLAKE2B 7e4d5be1898f70f7075cc51b36d143f3fd4feeceab6658926d6b0ba9030b0cc3d5ccbbfe624f914698eda0bcfdc748543e35f8de2cda59133b1d0cfe813bb119 SHA512 f3d0f1bdd19f08077e5650d02997028ad044594c185994e8df08903602199bb9b063d1623a807920b8d07c91b468c1b3ac34a806aec7b40ed15e9b70a0eb60c4
-AUX logging.patch 16008 BLAKE2B ac82381998cfc3b204f745b79cba6128751dd511b0d89d50f5317c82138cd06d51e627706ce533f205a731202e32838a8c7a7b3bb7c85011d6e9c698a4d1f792 SHA512 08e64047cbc613982be4bd34c07916df2e90a96f9f6873969be7dfd265f2d6ce4956669be7c57c38f23314fd4634b5569aec17618d412d0662ae5baf8f590433
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD libmavconn-0.19.0-r1.ebuild 499 BLAKE2B 3c0d8430aa3e771ad35d32d4d4970e950a82d3390129d3f17853d5f39c1479f72483d8f9311ff6229c4becc587e865304aff22374e85b54bf90c339f45be7979 SHA512 cf6f5d7ed4972f115f374993a04bdb5e2c855a592133e47ba684bd2c54ce7e6d5cf0678093a34e5a81475c55ca8d95be838c86718862107d502d9fd08af6ab92
-EBUILD libmavconn-9999.ebuild 431 BLAKE2B a98c07058726ca23ea9c93d4d072b51d94dbe9472f78caccd72b3e857250f18737981a4cfa2fc48c1c1c75db9313a4b129cd66320b9e82ccee04dc28616b905f SHA512 5d0ade0e7b70ff32b9fb2fed6041e2e9610a03deac57205a5e7136bc8ef9f27aa5a98a07e76e5d362784f37b4d5eb98a03184ededbd6dd39bd50f93531ace235
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD libmavconn-1.2.0.ebuild 428 BLAKE2B 45a0093dcdb1ff35960b317293c3c2d60a31fe5496c8c087f94520452762058495858e061347c92f056209751262a3ef238a41fe36cfe3d29bfd31b3adf5196a SHA512 8002db232d3bd46c069b4ccc20a02dac0724cba503fcc60bf7e5378dfe72fc2606e2ed606fee443f0966f4b03ce07916a3ce67cdd0ebf2c4ea3f81dc9deeb2ac
+EBUILD libmavconn-9999.ebuild 428 BLAKE2B 45a0093dcdb1ff35960b317293c3c2d60a31fe5496c8c087f94520452762058495858e061347c92f056209751262a3ef238a41fe36cfe3d29bfd31b3adf5196a SHA512 8002db232d3bd46c069b4ccc20a02dac0724cba503fcc60bf7e5378dfe72fc2606e2ed606fee443f0966f4b03ce07916a3ce67cdd0ebf2c4ea3f81dc9deeb2ac
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/libmavconn/files/boost170.patch b/dev-ros/libmavconn/files/boost170.patch
deleted file mode 100644
index 357025d90af5..000000000000
--- a/dev-ros/libmavconn/files/boost170.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Index: libmavconn/src/tcp.cpp
-===================================================================
---- libmavconn.orig/src/tcp.cpp
-+++ libmavconn/src/tcp.cpp
-@@ -41,13 +41,19 @@ static bool resolve_address_tcp(io_servi
- 	error_code ec;
- 
- 	tcp::resolver::query query(host, "");
--	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(),
--			[&](const tcp::endpoint & q_ep) {
--				ep = q_ep;
--				ep.port(port);
--				result = true;
--				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
--			});
-+
-+	auto fn = [&](const tcp::endpoint & q_ep) {
-+		ep = q_ep;
-+		ep.port(port);
-+		result = true;
-+		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+	};
-+
-+#if BOOST_ASIO_VERSION >= 101200
-+	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
-+#else
-+	std::for_each(resolver.resolve(query, ec), tcp::resolver::iterator(), fn);
-+#endif
- 
- 	if (ec) {
- 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
-@@ -112,7 +118,7 @@ void MAVConnTCPClient::client_connected(
- 			server_channel, conn_id, to_string_ss(server_ep).c_str());
- 
- 	// start recv
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_recv, shared_from_this()));
- }
- 
- MAVConnTCPClient::~MAVConnTCPClient()
-@@ -152,7 +158,7 @@ void MAVConnTCPClient::send_bytes(const
- 
- 		tx_q.emplace_back(bytes, length);
- 	}
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
- }
- 
- void MAVConnTCPClient::send_message(const mavlink_message_t *message)
-@@ -174,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
- 
- 		tx_q.emplace_back(message);
- 	}
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
- }
- 
- void MAVConnTCPClient::send_message(const mavlink::Message &message)
-@@ -194,7 +200,7 @@ void MAVConnTCPClient::send_message(cons
- 
- 		tx_q.emplace_back(message, get_status_p(), sys_id, comp_id);
- 	}
--	socket.get_io_service().post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
-+	static_cast<boost::asio::io_service&>(socket.get_executor().context()).post(std::bind(&MAVConnTCPClient::do_send, shared_from_this(), true));
- }
- 
- void MAVConnTCPClient::do_recv()
-Index: libmavconn/src/udp.cpp
-===================================================================
---- libmavconn.orig/src/udp.cpp
-+++ libmavconn/src/udp.cpp
-@@ -41,13 +41,19 @@ static bool resolve_address_udp(io_servi
- 	error_code ec;
- 
- 	udp::resolver::query query(host, "");
--	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(),
--			[&](const udp::endpoint & q_ep) {
--				ep = q_ep;
--				ep.port(port);
--				result = true;
--				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
--			});
-+
-+	auto fn = [&](const udp::endpoint & q_ep) {
-+		ep = q_ep;
-+		ep.port(port);
-+		result = true;
-+		CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+	};
-+
-+#if BOOST_ASIO_VERSION >= 101200
-+	for (auto q_ep : resolver.resolve(query, ec)) fn(q_ep);
-+#else
-+	std::for_each(resolver.resolve(query, ec), udp::resolver::iterator(), fn);
-+#endif
- 
- 	if (ec) {
- 		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
diff --git a/dev-ros/libmavconn/files/logging.patch b/dev-ros/libmavconn/files/logging.patch
deleted file mode 100644
index 3396a23c04df..000000000000
--- a/dev-ros/libmavconn/files/logging.patch
+++ /dev/null
@@ -1,420 +0,0 @@
-Index: libmavconn/src/interface.cpp
-===================================================================
---- libmavconn.orig/src/interface.cpp
-+++ libmavconn/src/interface.cpp
-@@ -133,7 +133,7 @@ void MAVConnInterface::log_recv(const ch
- 
- 	const char *proto_version_str = (msg.magic == MAVLINK_STX) ? "v2.0" : "v1.0";
- 
--	logDebug("%s%zu: recv: %s %4s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
-+	CONSOLE_BRIDGE_logDebug("%s%zu: recv: %s %4s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
- 			pfx, conn_id,
- 			proto_version_str,
- 			framing_str,
-@@ -144,7 +144,7 @@ void MAVConnInterface::log_send(const ch
- {
- 	const char *proto_version_str = (msg->magic == MAVLINK_STX) ? "v2.0" : "v1.0";
- 
--	logDebug("%s%zu: send: %s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
-+	CONSOLE_BRIDGE_logDebug("%s%zu: send: %s Message-Id: %u [%u bytes] IDs: %u.%u Seq: %u",
- 			pfx, conn_id,
- 			proto_version_str,
- 			msg->msgid, msg->len, msg->sysid, msg->compid, msg->seq);
-@@ -152,7 +152,7 @@ void MAVConnInterface::log_send(const ch
- 
- void MAVConnInterface::log_send_obj(const char *pfx, const mavlink::Message &msg)
- {
--	logDebug("%s%zu: send: %s", pfx, conn_id, msg.to_yaml().c_str());
-+	CONSOLE_BRIDGE_logDebug("%s%zu: send: %s", pfx, conn_id, msg.to_yaml().c_str());
- }
- 
- void MAVConnInterface::send_message_ignore_drop(const mavlink::mavlink_message_t *msg)
-@@ -161,7 +161,7 @@ void MAVConnInterface::send_message_igno
- 		send_message(msg);
- 	}
- 	catch (std::length_error &e) {
--		logError(PFX "%zu: DROPPED Message-Id %u [%u bytes] IDs: %u.%u Seq: %u: %s",
-+		CONSOLE_BRIDGE_logError(PFX "%zu: DROPPED Message-Id %u [%u bytes] IDs: %u.%u Seq: %u: %s",
- 				conn_id,
- 				msg->msgid, msg->len, msg->sysid, msg->compid, msg->seq,
- 				e.what());
-@@ -174,7 +174,7 @@ void MAVConnInterface::send_message_igno
- 		send_message(msg);
- 	}
- 	catch (std::length_error &e) {
--		logError(PFX "%zu: DROPPED Message %s: %s",
-+		CONSOLE_BRIDGE_logError(PFX "%zu: DROPPED Message %s: %s",
- 				conn_id,
- 				msg.get_name().c_str(),
- 				e.what());
-@@ -247,14 +247,14 @@ static void url_parse_query(std::string
- 	auto ids_it = std::search(query.begin(), query.end(),
- 			ids_end.begin(), ids_end.end());
- 	if (ids_it == query.end()) {
--		logWarn(PFX "URL: unknown query arguments");
-+		CONSOLE_BRIDGE_logWarn(PFX "URL: unknown query arguments");
- 		return;
- 	}
- 
- 	std::advance(ids_it, ids_end.length());
- 	auto comma_it = std::find(ids_it, query.end(), ',');
- 	if (comma_it == query.end()) {
--		logError(PFX "URL: no comma in ids= query");
-+		CONSOLE_BRIDGE_logError(PFX "URL: no comma in ids= query");
- 		return;
- 	}
- 
-@@ -264,7 +264,7 @@ static void url_parse_query(std::string
- 	sysid = std::stoi(sys);
- 	compid = std::stoi(comp);
- 
--	logDebug(PFX "URL: found system/component id = [%u, %u]", sysid, compid);
-+	CONSOLE_BRIDGE_logDebug(PFX "URL: found system/component id = [%u, %u]", sysid, compid);
- }
- 
- static MAVConnInterface::Ptr url_parse_serial(
-@@ -292,7 +292,7 @@ static MAVConnInterface::Ptr url_parse_u
- 
- 	auto sep_it = std::find(hosts.begin(), hosts.end(), '@');
- 	if (sep_it == hosts.end()) {
--		logError(PFX "UDP URL should contain @!");
-+		CONSOLE_BRIDGE_logError(PFX "UDP URL should contain @!");
- 		throw DeviceError("url", "UDP separator not found");
- 	}
- 
-@@ -360,7 +360,7 @@ MAVConnInterface::Ptr MAVConnInterface::
- 			proto_end.begin(), proto_end.end());
- 	if (proto_it == url.end()) {
- 		// looks like file path
--		logDebug(PFX "URL: %s: looks like file path", url.c_str());
-+		CONSOLE_BRIDGE_logDebug(PFX "URL: %s: looks like file path", url.c_str());
- 		return url_parse_serial(url, "", system_id, component_id, false);
- 	}
- 
-@@ -384,7 +384,7 @@ MAVConnInterface::Ptr MAVConnInterface::
- 		++query_it;
- 	query.assign(query_it, url.end());
- 
--	logDebug(PFX "URL: %s: proto: %s, host: %s, path: %s, query: %s",
-+	CONSOLE_BRIDGE_logDebug(PFX "URL: %s: proto: %s, host: %s, path: %s, query: %s",
- 			url.c_str(), proto.c_str(), host.c_str(),
- 			path.c_str(), query.c_str());
- 
-Index: libmavconn/src/mavlink_helpers.cpp.em
-===================================================================
---- libmavconn.orig/src/mavlink_helpers.cpp.em
-+++ libmavconn/src/mavlink_helpers.cpp.em
-@@ -27,20 +27,20 @@ using mavconn::MAVConnInterface;
- 
- void MAVConnInterface::init_msg_entry()
- {
--	logDebug("mavconn: Initialize message_entries map");
-+	CONSOLE_BRIDGE_logDebug("mavconn: Initialize message_entries map");
- 
- 	auto load = [&](const char *dialect, const mavlink::mavlink_msg_entry_t & e) {
- 		auto it = message_entries.find(e.msgid);
- 		if (it != message_entries.end()) {
- 			if (memcmp(&e, it->second, sizeof(e)) != 0) {
--				logWarn("mavconn: init: message from %s, MSG-ID %d ignored! Table has different entry.", dialect, e.msgid);
-+				CONSOLE_BRIDGE_logWarn("mavconn: init: message from %s, MSG-ID %d ignored! Table has different entry.", dialect, e.msgid);
- 			}
- 			else {
--				logDebug("mavconn: init: message from %s, MSG-ID %d in table.", dialect, e.msgid);
-+				CONSOLE_BRIDGE_logDebug("mavconn: init: message from %s, MSG-ID %d in table.", dialect, e.msgid);
- 			}
- 		}
- 		else {
--			logDebug("mavconn: init: add message entry for %s, MSG-ID %d", dialect, e.msgid);
-+			CONSOLE_BRIDGE_logDebug("mavconn: init: add message entry for %s, MSG-ID %d", dialect, e.msgid);
- 			message_entries[e.msgid] = &e;
- 		}
- 	};
-Index: libmavconn/src/serial.cpp
-===================================================================
---- libmavconn.orig/src/serial.cpp
-+++ libmavconn/src/serial.cpp
-@@ -43,7 +43,7 @@ MAVConnSerial::MAVConnSerial(uint8_t sys
- {
- 	using SPB = boost::asio::serial_port_base;
- 
--	logInform(PFXd "device: %s @ %d bps", conn_id, device.c_str(), baudrate);
-+	CONSOLE_BRIDGE_logInform(PFXd "device: %s @ %d bps", conn_id, device.c_str(), baudrate);
- 
- 	try {
- 		serial_dev.open(device);
-@@ -95,7 +95,7 @@ void MAVConnSerial::close()
- void MAVConnSerial::send_bytes(const uint8_t *bytes, size_t length)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -115,7 +115,7 @@ void MAVConnSerial::send_message(const m
- 	assert(message != nullptr);
- 
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -135,7 +135,7 @@ void MAVConnSerial::send_message(const m
- void MAVConnSerial::send_message(const mavlink::Message &message)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -159,7 +159,7 @@ void MAVConnSerial::do_read(void)
- 			buffer(rx_buf),
- 			[sthis] (error_code error, size_t bytes_transferred) {
- 				if (error) {
--					logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -187,7 +187,7 @@ void MAVConnSerial::do_write(bool check_
- 				assert(bytes_transferred <= buf_ref.len);
- 
- 				if (error) {
--					logError(PFXd "write: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "write: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-Index: libmavconn/src/tcp.cpp
-===================================================================
---- libmavconn.orig/src/tcp.cpp
-+++ libmavconn/src/tcp.cpp
-@@ -46,11 +46,11 @@ static bool resolve_address_tcp(io_servi
- 				ep = q_ep;
- 				ep.port(port);
- 				result = true;
--				logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
- 			});
- 
- 	if (ec) {
--		logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
-+		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
- 		result = false;
- 	}
- 
-@@ -73,7 +73,7 @@ MAVConnTCPClient::MAVConnTCPClient(uint8
- 	if (!resolve_address_tcp(io_service, conn_id, server_host, server_port, server_ep))
- 		throw DeviceError("tcp: resolve", "Bind address resolve failed");
- 
--	logInform(PFXd "Server address: %s", conn_id, to_string_ss(server_ep).c_str());
-+	CONSOLE_BRIDGE_logInform(PFXd "Server address: %s", conn_id, to_string_ss(server_ep).c_str());
- 
- 	try {
- 		socket.open(tcp::v4());
-@@ -108,7 +108,7 @@ MAVConnTCPClient::MAVConnTCPClient(uint8
- 
- void MAVConnTCPClient::client_connected(size_t server_channel)
- {
--	logInform(PFXd "Got client, id: %zu, address: %s",
-+	CONSOLE_BRIDGE_logInform(PFXd "Got client, id: %zu, address: %s",
- 			server_channel, conn_id, to_string_ss(server_ep).c_str());
- 
- 	// start recv
-@@ -140,7 +140,7 @@ void MAVConnTCPClient::close()
- void MAVConnTCPClient::send_bytes(const uint8_t *bytes, size_t length)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -160,7 +160,7 @@ void MAVConnTCPClient::send_message(cons
- 	assert(message != nullptr);
- 
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -180,7 +180,7 @@ void MAVConnTCPClient::send_message(cons
- void MAVConnTCPClient::send_message(const mavlink::Message &message)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
-@@ -204,7 +204,7 @@ void MAVConnTCPClient::do_recv()
- 			buffer(rx_buf),
- 			[sthis] (error_code error, size_t bytes_transferred) {
- 				if (error) {
--					logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -232,7 +232,7 @@ void MAVConnTCPClient::do_send(bool chec
- 				assert(bytes_transferred <= buf_ref.len);
- 
- 				if (error) {
--					logError(PFXd "send: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "send: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -269,7 +269,7 @@ MAVConnTCPServer::MAVConnTCPServer(uint8
- 	if (!resolve_address_tcp(io_service, conn_id, server_host, server_port, bind_ep))
- 		throw DeviceError("tcp-l: resolve", "Bind address resolve failed");
- 
--	logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
-+	CONSOLE_BRIDGE_logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
- 
- 	try {
- 		acceptor.open(tcp::v4());
-@@ -302,7 +302,7 @@ void MAVConnTCPServer::close()
- 	if (!is_open())
- 		return;
- 
--	logInform(PFXd "Terminating server. "
-+	CONSOLE_BRIDGE_logInform(PFXd "Terminating server. "
- 			"All connections will be closed.", conn_id);
- 
- 	io_service.stop();
-@@ -395,7 +395,7 @@ void MAVConnTCPServer::do_accept()
- 			acceptor_client->server_ep,
- 			[sthis, acceptor_client] (error_code error) {
- 				if (error) {
--					logError(PFXd "accept: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "accept: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
-@@ -416,7 +416,7 @@ void MAVConnTCPServer::client_closed(std
- {
- 	if (auto instp = weak_instp.lock()) {
- 		bool locked = mutex.try_lock();
--		logInform(PFXd "Client connection closed, id: %p, address: %s",
-+		CONSOLE_BRIDGE_logInform(PFXd "Client connection closed, id: %p, address: %s",
- 				conn_id, instp.get(), to_string_ss(instp->server_ep).c_str());
- 
- 		client_list.remove(instp);
-Index: libmavconn/src/udp.cpp
-===================================================================
---- libmavconn.orig/src/udp.cpp
-+++ libmavconn/src/udp.cpp
-@@ -46,11 +46,11 @@ static bool resolve_address_udp(io_servi
- 				ep = q_ep;
- 				ep.port(port);
- 				result = true;
--				logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
-+				CONSOLE_BRIDGE_logDebug(PFXd "host %s resolved as %s", chan, host.c_str(), to_string_ss(ep).c_str());
- 			});
- 
- 	if (ec) {
--		logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
-+		CONSOLE_BRIDGE_logWarn(PFXd "resolve error: %s", chan, ec.message().c_str());
- 		result = false;
- 	}
- 
-@@ -75,7 +75,7 @@ MAVConnUDP::MAVConnUDP(uint8_t system_id
- 	if (!resolve_address_udp(io_service, conn_id, bind_host, bind_port, bind_ep))
- 		throw DeviceError("udp: resolve", "Bind address resolve failed");
- 
--	logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
-+	CONSOLE_BRIDGE_logInform(PFXd "Bind address: %s", conn_id, to_string_ss(bind_ep).c_str());
- 
- 	if (remote_host != "") {
- 		if (remote_host != BROADCAST_REMOTE_HOST)
-@@ -86,9 +86,9 @@ MAVConnUDP::MAVConnUDP(uint8_t system_id
- 		}
- 
- 		if (remote_exists)
--			logInform(PFXd "Remote address: %s", conn_id, to_string_ss(remote_ep).c_str());
-+			CONSOLE_BRIDGE_logInform(PFXd "Remote address: %s", conn_id, to_string_ss(remote_ep).c_str());
- 		else
--			logWarn(PFXd "Remote address resolve failed.", conn_id);
-+			CONSOLE_BRIDGE_logWarn(PFXd "Remote address resolve failed.", conn_id);
- 	}
- 
- 	try {
-@@ -144,12 +144,12 @@ void MAVConnUDP::close()
- void MAVConnUDP::send_bytes(const uint8_t *bytes, size_t length)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
- 	if (!remote_exists) {
--		logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
-+		CONSOLE_BRIDGE_logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
- 		return;
- 	}
- 
-@@ -169,12 +169,12 @@ void MAVConnUDP::send_message(const mavl
- 	assert(message != nullptr);
- 
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
- 	if (!remote_exists) {
--		logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
-+		CONSOLE_BRIDGE_logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
- 		return;
- 	}
- 
-@@ -194,12 +194,12 @@ void MAVConnUDP::send_message(const mavl
- void MAVConnUDP::send_message(const mavlink::Message &message)
- {
- 	if (!is_open()) {
--		logError(PFXd "send: channel closed!", conn_id);
-+		CONSOLE_BRIDGE_logError(PFXd "send: channel closed!", conn_id);
- 		return;
- 	}
- 
- 	if (!remote_exists) {
--		logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
-+		CONSOLE_BRIDGE_logDebug(PFXd "send: Remote not known, message dropped.", conn_id);
- 		return;
- 	}
- 
-@@ -224,13 +224,13 @@ void MAVConnUDP::do_recvfrom()
- 			remote_ep,
- 			[sthis] (error_code error, size_t bytes_transferred) {
- 				if (error) {
--					logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "receive: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
- 
- 				if (sthis->remote_ep != sthis->last_remote_ep) {
--					logInform(PFXd "Remote address: %s", sthis->conn_id, to_string_ss(sthis->remote_ep).c_str());
-+					CONSOLE_BRIDGE_logInform(PFXd "Remote address: %s", sthis->conn_id, to_string_ss(sthis->remote_ep).c_str());
- 					sthis->remote_exists = true;
- 					sthis->last_remote_ep = sthis->remote_ep;
- 				}
-@@ -259,11 +259,11 @@ void MAVConnUDP::do_sendto(bool check_tx
- 				assert(bytes_transferred <= buf_ref.len);
- 
- 				if (error == boost::asio::error::network_unreachable) {
--					logWarn(PFXd "sendto: %s, retrying", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logWarn(PFXd "sendto: %s, retrying", sthis->conn_id, error.message().c_str());
- 					// do not return, try to resend
- 				}
- 				else if (error) {
--					logError(PFXd "sendto: %s", sthis->conn_id, error.message().c_str());
-+					CONSOLE_BRIDGE_logError(PFXd "sendto: %s", sthis->conn_id, error.message().c_str());
- 					sthis->close();
- 					return;
- 				}
diff --git a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild b/dev-ros/libmavconn/libmavconn-1.2.0.ebuild
similarity index 76%
rename from dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
rename to dev-ros/libmavconn/libmavconn-1.2.0.ebuild
index d42a92fd0e64..83f3ebc994a9 100644
--- a/dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
+++ b/dev-ros/libmavconn/libmavconn-1.2.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -19,7 +19,3 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=(
-	"${FILESDIR}/logging.patch"
-	"${FILESDIR}/boost170.patch"
-)
diff --git a/dev-ros/libmavconn/libmavconn-9999.ebuild b/dev-ros/libmavconn/libmavconn-9999.ebuild
index 9eb27fcc7ea7..83f3ebc994a9 100644
--- a/dev-ros/libmavconn/libmavconn-9999.ebuild
+++ b/dev-ros/libmavconn/libmavconn-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/map_msgs/Manifest b/dev-ros/map_msgs/Manifest
index 38be61967c4c..913b8fdbc830 100644
--- a/dev-ros/map_msgs/Manifest
+++ b/dev-ros/map_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST navigation_msgs-1.13.0.tar.gz 2251 BLAKE2B b70ade2d296f8a94ae89286caa4f23adba5ac5c058ccfcdf6a35a9bac03e5238a37bcd91bbf99f62d3fe806639e8a655c5fcc9391e637e37238f0421805903dd SHA512 e7b4a83bbbd5384f72d1a9d7e3544cde718728ba2a2562b3c0da5b5fd7db146faf8c717d4af2509eaf1ff545ac85da121f7e37cb7b6b53c8a5b8d683c6b4e66c
-EBUILD map_msgs-1.13.0.ebuild 508 BLAKE2B 69b5d31089f072be9c18c671701eeef472f43e0d97ebf1caea117eaf5de8a0e1f0d451eb578b359e8f781443d7dee15218505bb6614f3348c346700df0a6546c SHA512 f37b7b01edae26afe2cce58072781a50e0ebb6c8dee75df6c5d82a3e602aef98edc23895f25e87e21d7f661491292b59878be32cca7586134f664b64e8fae18e
-EBUILD map_msgs-9999.ebuild 508 BLAKE2B 69b5d31089f072be9c18c671701eeef472f43e0d97ebf1caea117eaf5de8a0e1f0d451eb578b359e8f781443d7dee15218505bb6614f3348c346700df0a6546c SHA512 f37b7b01edae26afe2cce58072781a50e0ebb6c8dee75df6c5d82a3e602aef98edc23895f25e87e21d7f661491292b59878be32cca7586134f664b64e8fae18e
+DIST navigation_msgs-1.14.0.tar.gz 2329 BLAKE2B 7414a4b67fde26223cdf81a14b1c3e56f2bf5519d46455234de75bf79b10c8fa0f1a04a2865703723c0a975bde77e22754e751c07edc73fddd10bae9ac5b0feb SHA512 0354856b8964547cb96d59717d1d1e8b4c261b79bd451a25755303d295aecf3f0011a825307e0fc6ccd5179f4ea921a8debd8be79b5e4d2bdab0f0d57b54e56d
+EBUILD map_msgs-1.14.0.ebuild 468 BLAKE2B 5850756a4875bb5f53df0dd6b8f173a49e638e857414d1bcd7454ac7d614a4f575a7c6c6bd37777ebc7cb598a189ebb6dd6b0db7ff9df6411329814c08baf573 SHA512 2df227ee9518bfbe271a84767bf7aabf959e5216d2344a36f2e2876feb60bd93e36984d9ba3d4f0a18023d991da49bdfe035adcdc13054feb7e39df57812fb4c
+EBUILD map_msgs-9999.ebuild 468 BLAKE2B 5850756a4875bb5f53df0dd6b8f173a49e638e857414d1bcd7454ac7d614a4f575a7c6c6bd37777ebc7cb598a189ebb6dd6b0db7ff9df6411329814c08baf573 SHA512 2df227ee9518bfbe271a84767bf7aabf959e5216d2344a36f2e2876feb60bd93e36984d9ba3d4f0a18023d991da49bdfe035adcdc13054feb7e39df57812fb4c
 MISC metadata.xml 342 BLAKE2B c278231941f53347e7457813d64fc0bf8b32bcacbfddc955c8d90538c9ae9c23504c51747c32ef7f8c5555c22d25bd34c1a5185df6d864b6f0509fdccedbcdd0 SHA512 6b28c6c3ff5f68ebfe8ba768c80ebc61c054453fde126fc64aa406e69fdf2f3174031930b8830144ba25401354df016f8179ab3d16c50d339b486a13421dd684
diff --git a/dev-ros/map_msgs/map_msgs-1.13.0.ebuild b/dev-ros/map_msgs/map_msgs-1.14.0.ebuild
similarity index 90%
rename from dev-ros/map_msgs/map_msgs-1.13.0.ebuild
rename to dev-ros/map_msgs/map_msgs-1.14.0.ebuild
index c6857178b651..b8edba6c29a9 100644
--- a/dev-ros/map_msgs/map_msgs-1.13.0.ebuild
+++ b/dev-ros/map_msgs/map_msgs-1.14.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs dev-ros/nav_msgs"
 
diff --git a/dev-ros/map_msgs/map_msgs-9999.ebuild b/dev-ros/map_msgs/map_msgs-9999.ebuild
index c6857178b651..b8edba6c29a9 100644
--- a/dev-ros/map_msgs/map_msgs-9999.ebuild
+++ b/dev-ros/map_msgs/map_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs dev-ros/nav_msgs"
 
diff --git a/dev-ros/mavlink-gbp-release/Manifest b/dev-ros/mavlink-gbp-release/Manifest
index acdd00cc93e9..1332c12f37f6 100644
--- a/dev-ros/mavlink-gbp-release/Manifest
+++ b/dev-ros/mavlink-gbp-release/Manifest
@@ -1,8 +1,4 @@
 AUX gentoo.patch 708 BLAKE2B ad41a87474f0c542dcab2189e08f744c37ebc0a5993c9ca46633d3f02b3c13b002cd1b1644123694bd0bea756168d29d121eca9cd8071a548ae592f6e81431f1 SHA512 2ab7861c421e630a87924ae4b5f282493be043d1d0a53188ed6ec2938250ac4fb1e402072d4f10afc747271c94cad424bd84ca15d49d38e871b245b5068de698
-DIST mavlink-gbp-release-2017.2.7.tar.gz 460082 BLAKE2B 3274be8d0ed28f996d1cb521bdca63c3671b913ef9fb3c4aed98c76a040d2eab719a48da6eea042b7dc59322c05c3a8fe4d193236e49c75d0fc90c8fd2b39501 SHA512 07c21a4d80f1d67657cc824bbd46279620008374af48dfa92547e6373cee5a48509fabf269b55911bdb1d63660c5581cb362b7ea469f0ca00317e5d32084b73c
-DIST mavlink-gbp-release-2017.5.5.tar.gz 3943384 BLAKE2B 839ec17ad02b880b392a50a3171da2f8fc6159830ccfa6f383c5535f00599f094a4ee277d3e860bb430462e4df94fc749421ef34989056589676b360f7356165 SHA512 8c4a746187ee3c18cb9f236d77e942fb96ee8fc4ad561f0391290a9113cf0cb018f13916e67030a8ca60bfbc163cb54315747f78230057bc41154afe62c66859
-DIST mavlink-gbp-release-2019.11.11.tar.gz 4101019 BLAKE2B aa2e09fab46d82bbe463b637bc02551ba512c011892663ecc7e187070f2591ec7f7aa249d1b294fadbea86c82a8f02a3a3219e16662f92508c399fd9251df391 SHA512 112a6c0055c68eaaa289237a3d94b89a632ccbe22344a1e923e3ded2273fb32a54515febba8a9e97590af10402cec3e414f286c012ed7605ced98822509eedad
-EBUILD mavlink-gbp-release-2017.2.7-r1.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
-EBUILD mavlink-gbp-release-2017.5.5.ebuild 576 BLAKE2B c3d6a95973c6d07aac79c6bad1a441cff91d690d66e2e29034260f1a84ae3b824a4f0e12171758619985d81f39b475de233410584536ab650ed6dda55b28a295 SHA512 baa6c811db6e77da2a6b1ae92be6414c6bacc853adec848c1788270f3d7f730fa0a9b2581be801c25dfa5a4b5365a6ab9b1fd076aa60f4df2900d96541730eb3
-EBUILD mavlink-gbp-release-2019.11.11.ebuild 573 BLAKE2B d5d788a838d60fed8a941509a923d7a34e388bdf9a3df6aa536e7b9bf47d6920a646db08f168530684ee2e2fe343d7b48773ef0b21c418bd63dbb26b02215c8a SHA512 8c1d6792aa4ffd6ec0b3d532dd33d8d9e9350cccb2d4df5656b58d173cf4ad38ff78deb46e4b0dd00ab6bdc4957f2c762cc5cbef5a89e95a450cabb7f6e0cd3a
+DIST mavlink-gbp-release-2020.7.7.tar.gz 4130271 BLAKE2B e9e6759da3734fe918e1c9441ca823a62d8629f08e3b049a1817103ddd7dca14098f69842b4d38f3fda991f7c9020e9cde84315eb1c8b47ae9785c7c26957420 SHA512 bd23f9f4cfba941ef928e79d5c26d6c310189eefbd1c29f019b688c5d2a07cccf1bcf6212d516cccff28fdcfbc3cff0f585eb5e7640fc011eab252e0222cee46
+EBUILD mavlink-gbp-release-2020.7.7.ebuild 615 BLAKE2B 5f3e1327d1739455c4f4915b191cb43a607699f94954f18975576e7a5b0d195a4369c0eb05b652c9b52dbc4864f0a71872ad979cce18d1b6468f5b9585e871ef SHA512 9a62b4ab880f394bc504002dbd9b8028fb37570a652523a2d9ad0aa6d84e852e05c11ea59d29a041393bba80cfbeb6117f56c78887b2637f65c848057e6ec2b2
 MISC metadata.xml 341 BLAKE2B 1292ea0319edc3c3597165f59f246829e6954b5582e623e92227de5503f35d0f61150a0516998dd1d99942c371291ed623a38112210abac7dd0a050cc810b34c SHA512 0b545da2a0f2d6372e63db33fd5f50497c0de04a69fdb3b94e57418ff617fcebaeed515241c474995efc38bbdf1c099ec67ad6a56dd3ae94b2e24be9f1f72d36
diff --git a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
deleted file mode 100644
index de8d9845ba24..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/kinetic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/kinetic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="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-2019.11.11.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
deleted file mode 100644
index a8c6412274a2..000000000000
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/melodic/mavlink/
-VER_SUFFIX=-${PV#*_p}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-EGIT_BRANCH="release/melodic/mavlink"
-DESCRIPTION="MAVLink message marshaling library"
-LICENSE="LGPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND="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-2017.2.7-r1.ebuild b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7.ebuild
similarity index 69%
rename from dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
rename to dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7.ebuild
index de8d9845ba24..b80138befc6b 100644
--- a/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
+++ b/dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavlink-gbp-release"
-VER_PREFIX=release/kinetic/mavlink/
+EGIT_BRANCH="release/noetic/mavlink"
+VER_PREFIX="${EGIT_BRANCH}/"
 VER_SUFFIX=-${PV#*_p}
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
-EGIT_BRANCH="release/kinetic/mavlink"
 DESCRIPTION="MAVLink message marshaling library"
 LICENSE="LGPL-3"
 SLOT="0"
@@ -20,3 +19,8 @@ RDEPEND="dev-python/future[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
 S="${WORKDIR}/${PN}-${EGIT_BRANCH//\//-}"
 PATCHES=( "${FILESDIR}/gentoo.patch" )
+
+src_configure() {
+	export ROS_PYTHON_VERSION=3.6
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/mavros/Manifest b/dev-ros/mavros/Manifest
index 1ae83a421715..5934b8e39813 100644
--- a/dev-ros/mavros/Manifest
+++ b/dev-ros/mavros/Manifest
@@ -1,4 +1,4 @@
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD mavros-0.19.0-r1.ebuild 1042 BLAKE2B 3969b7264ab87b0fdce3c3be44bf8af2608597d3a74f5f1331f807dc2a5d6f796a91b3c6f58164a060c66ba9dc89b0c4788dbc1b70d8eb91515c08e6aff43fff SHA512 b5ffc141f3c8fdf563b1bf60afedbad476fa334776ef065eda3be1233f7e52090e74bf3b45c128b0b19bec58cf8916ccecf459457ebdda545ee2cca3da18c488
-EBUILD mavros-9999.ebuild 1042 BLAKE2B 3969b7264ab87b0fdce3c3be44bf8af2608597d3a74f5f1331f807dc2a5d6f796a91b3c6f58164a060c66ba9dc89b0c4788dbc1b70d8eb91515c08e6aff43fff SHA512 b5ffc141f3c8fdf563b1bf60afedbad476fa334776ef065eda3be1233f7e52090e74bf3b45c128b0b19bec58cf8916ccecf459457ebdda545ee2cca3da18c488
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD mavros-1.2.0.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
+EBUILD mavros-9999.ebuild 1034 BLAKE2B 4d613cae01fcbc82955bfd139a7d35800f33cd6fe42dfb8c500b52d4bd214d8a6baa23db8c7a64afcd90165dc13e53b6259f91a235e403cf6e571baf6ae771a2 SHA512 fa742657088ad5275af8161b4fd795bd6d9e102fd745299117ae0c8b67b77932abd62445798a1870f6d4273cea660458006b98fcccd5112ecf310423fcfbd3fa
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros/mavros-0.19.0-r1.ebuild b/dev-ros/mavros/mavros-1.2.0.ebuild
similarity index 93%
rename from dev-ros/mavros/mavros-0.19.0-r1.ebuild
rename to dev-ros/mavros/mavros-1.2.0.ebuild
index 06d13ec84a26..74118adcd502 100644
--- a/dev-ros/mavros/mavros-0.19.0-r1.ebuild
+++ b/dev-ros/mavros/mavros-1.2.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -25,6 +24,11 @@ RDEPEND="
 	dev-ros/rosconsole_bridge
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2016.11.11
+	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}]
@@ -32,7 +36,4 @@ RDEPEND="
 	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/mavlink-gbp-release-2016.11.11
-	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros/mavros-9999.ebuild b/dev-ros/mavros/mavros-9999.ebuild
index 06d13ec84a26..74118adcd502 100644
--- a/dev-ros/mavros/mavros-9999.ebuild
+++ b/dev-ros/mavros/mavros-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -25,6 +24,11 @@ RDEPEND="
 	dev-ros/rosconsole_bridge
 	dev-libs/boost:=
 	dev-ros/eigen_conversions
+	sci-geosciences/GeographicLib
+	>=dev-ros/mavlink-gbp-release-2016.11.11
+	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}]
@@ -32,7 +36,4 @@ RDEPEND="
 	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/mavlink-gbp-release-2016.11.11
-	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index ef65aeae7635..cb74006a9d42 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,4 +1,4 @@
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD mavros_extras-0.19.0-r1.ebuild 908 BLAKE2B 379c7e36603dce144c5357d81e872d27daf67b8436e1d14bc124874b567322c08f9ca081af62f4e87744d23c91f4c85d69368623ebb46e7f42ded6e3df608815 SHA512 9656ed5574c064ead98cc237b4f65774e00a4324bc3a7b6e377c5d750d9fb488140a9715997bb2a8b607098ab584121e4650648586126e05a4f35d4bc9fd09d5
-EBUILD mavros_extras-9999.ebuild 908 BLAKE2B 379c7e36603dce144c5357d81e872d27daf67b8436e1d14bc124874b567322c08f9ca081af62f4e87744d23c91f4c85d69368623ebb46e7f42ded6e3df608815 SHA512 9656ed5574c064ead98cc237b4f65774e00a4324bc3a7b6e377c5d750d9fb488140a9715997bb2a8b607098ab584121e4650648586126e05a4f35d4bc9fd09d5
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD mavros_extras-1.2.0.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
+EBUILD mavros_extras-9999.ebuild 937 BLAKE2B d056641e3f9a5dae34c078062d1a103c393e40f1a5cbdca195a296d6d8b42b968627297822a135e2ca8045ad1452f73ea7e25a556fe7ff50f5d1dca22df18764 SHA512 0f487ad55d13c7bb6eb9582db0f5c1df4cef25b686dbd1924e05234715cfbf28277a8e5ba67faa3b62aa8dc655a439bf777fabd72e5895a3f8538427c309a83c
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_extras/mavros_extras-0.19.0-r1.ebuild b/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
similarity index 62%
rename from dev-ros/mavros_extras/mavros_extras-0.19.0-r1.ebuild
rename to dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
index 38a5b7343d0b..e7290bdf87be 100644
--- a/dev-ros/mavros_extras/mavros_extras-0.19.0-r1.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -19,14 +18,18 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/mavros
 	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	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/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/urdf
-	dev-cpp/eigen:3
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+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_extras/mavros_extras-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
index 38a5b7343d0b..e7290bdf87be 100644
--- a/dev-ros/mavros_extras/mavros_extras-9999.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -19,14 +18,18 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/mavros
 	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	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/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/urdf
-	dev-cpp/eigen:3
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+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 1df5c49ca7fb..7773cc0458f4 100644
--- a/dev-ros/mavros_msgs/Manifest
+++ b/dev-ros/mavros_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST mavros-0.18.7.tar.gz 213566 BLAKE2B 447e1c0e060e134d7246adbbc2d8174c97fa5f3b79f16626e9b8dfae9a5502c42a036f11573696cc0e705fec959c62aadaad6094fb430da5c4f8b21a7572d390 SHA512 8ab17de7b9892d8eb7141d998460814d572d359b6ab5a3d2fe6a854506eedd784b936f9630a917b3de9ef5db7ac1375ff8374e816e9d0262f3d6b926b86f68ec
-DIST mavros-0.19.0.tar.gz 219739 BLAKE2B 4e9a47fa4cdbf11b530bdc39a8048b1834689039af3005d30ffcc2b626651612db12ecc1929ecaf994c5a887224bcf2b0469d1e15ed5b353be4132fb0f523a96 SHA512 87b1b77505d3606196d609a016bcb89b3831e982f8352a13f69f5c2580f46ac603edb2d3c2ce4df5cdd1424172145b88d2b35d149c2be507eb0f23039e7e45a7
-EBUILD mavros_msgs-0.18.7.ebuild 456 BLAKE2B 6e9716c784522a40135d9c0c24455a79c6096bcc53d2e30ad58833ac129d0897310010c1713ee32eb5aec06dc7332445c8577a8c63d63552e009a489110f9e2f SHA512 41a1b3c3fac761261ea84a0382f74e2116a207b59bf4a856d5e38f21e1d89af06758b2b47aab113b97b10003f49e679e9ef1cdd061ab409b139ccc90e567311d
-EBUILD mavros_msgs-0.19.0.ebuild 456 BLAKE2B 6e9716c784522a40135d9c0c24455a79c6096bcc53d2e30ad58833ac129d0897310010c1713ee32eb5aec06dc7332445c8577a8c63d63552e009a489110f9e2f SHA512 41a1b3c3fac761261ea84a0382f74e2116a207b59bf4a856d5e38f21e1d89af06758b2b47aab113b97b10003f49e679e9ef1cdd061ab409b139ccc90e567311d
-EBUILD mavros_msgs-9999.ebuild 456 BLAKE2B 6e9716c784522a40135d9c0c24455a79c6096bcc53d2e30ad58833ac129d0897310010c1713ee32eb5aec06dc7332445c8577a8c63d63552e009a489110f9e2f SHA512 41a1b3c3fac761261ea84a0382f74e2116a207b59bf4a856d5e38f21e1d89af06758b2b47aab113b97b10003f49e679e9ef1cdd061ab409b139ccc90e567311d
+DIST mavros-1.2.0.tar.gz 309704 BLAKE2B 85fa9079e6e26a5507878a092f671dfc387f52c65b9d1b2ba1f66d98439369550807b8afe3c99e276725b0c14d479eb1df2bd75870f2b78fe6e95c6020355cc9 SHA512 b37e3713ab15bdac23e88f3e7111821c7eaaaa263d7354852a18dd1e9f6f782a2e9450b29264536b8d712ab04021ddd84d82deeb932715d8e486dc019bb6f374
+EBUILD mavros_msgs-1.2.0.ebuild 416 BLAKE2B 747835a7e4be830e3d5d60bc379a403f6be128439d5300a7028c7779bb8dc9bf5e78caf38c89ed6dfbe9d0e3638291a1fcf29bf9c5350d882520b9731f7dd323 SHA512 2d90597b901d1e691af9359e1816f5c650e784f9e45b2c92bae39393a165e2b92e605d0a7808ce625022baf8e0e64d12b4b3f17aefb1ca092c116a436db488a7
+EBUILD mavros_msgs-9999.ebuild 416 BLAKE2B 747835a7e4be830e3d5d60bc379a403f6be128439d5300a7028c7779bb8dc9bf5e78caf38c89ed6dfbe9d0e3638291a1fcf29bf9c5350d882520b9731f7dd323 SHA512 2d90597b901d1e691af9359e1816f5c650e784f9e45b2c92bae39393a165e2b92e605d0a7808ce625022baf8e0e64d12b4b3f17aefb1ca092c116a436db488a7
 MISC metadata.xml 328 BLAKE2B d7ed4dde907bc9dd5533e4a54e90939df954d6af2c0fac66156b21309508546a4eccf8ebaef5d70e42a30ec99091f6cadd52b90199e65e05bcf8fe92069d2ab7 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.18.7.ebuild b/dev-ros/mavros_msgs/mavros_msgs-0.18.7.ebuild
deleted file mode 100644
index c1a4b0685200..000000000000
--- a/dev-ros/mavros_msgs/mavros_msgs-0.18.7.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-CATKIN_HAS_MESSAGES=yes
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for MAVROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_msgs/mavros_msgs-0.19.0.ebuild b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
similarity index 89%
rename from dev-ros/mavros_msgs/mavros_msgs-0.19.0.ebuild
rename to dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
index c1a4b0685200..db94855f38ed 100644
--- a/dev-ros/mavros_msgs/mavros_msgs-0.19.0.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
index c1a4b0685200..db94855f38ed 100644
--- a/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
+++ b/dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/mavlink/mavros"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/media_export/Manifest b/dev-ros/media_export/Manifest
index d5196f687b72..1fbdb6cebca5 100644
--- a/dev-ros/media_export/Manifest
+++ b/dev-ros/media_export/Manifest
@@ -1,4 +1,4 @@
-DIST media_export-0.2.0.tar.gz 1350 BLAKE2B dd5bce1ab1ae77e5a5050a734bfabb208b907af1a18ea889ab7cdc4a0b8aca9ee0f9aad44f0b99e5ad91ad9e03664e7c833cc646460434edac5daca77d4939ed SHA512 3710c028972ba9d431cd1f450fa867131607a657478e8316acb48065420e42f0f7da82af58135be995648c4ecd31952c196d36196f9f28da87a40409de3f6520
-EBUILD media_export-0.2.0.ebuild 328 BLAKE2B 3d27c0732c9abbc9ab7417e38187af9a3ff6e594a5eadee12b9e3672f719131b49fb0f80b62d1c05bfc9670690623ecf62e54d5784569e20295487acf2026518 SHA512 3381f8ec84806586d7f70f448110b74e505a7ea4271b1112082c19177f1b30466815238daf1129bd799f692749ef6b1b46d4507ee951d814ec297b7829e9f892
-EBUILD media_export-9999.ebuild 328 BLAKE2B 3d27c0732c9abbc9ab7417e38187af9a3ff6e594a5eadee12b9e3672f719131b49fb0f80b62d1c05bfc9670690623ecf62e54d5784569e20295487acf2026518 SHA512 3381f8ec84806586d7f70f448110b74e505a7ea4271b1112082c19177f1b30466815238daf1129bd799f692749ef6b1b46d4507ee951d814ec297b7829e9f892
+DIST media_export-0.3.0.tar.gz 1435 BLAKE2B 7f907ad84539f9bd54963d3b3e79a0402229c70f65a152da9f9db0d88db790705a7aaf73a0ba42a0a5d7355fb4e4afeab6e857af452b1de49151f32e910c489f SHA512 eabeb2224c47a6fc835a1fbea06302ba183954903a1a9dc3496201e63eb8e4752ef4b4456b91a63820fd230d20d0b446a79d856de1c69986fddc80085f1cf27e
+EBUILD media_export-0.3.0.ebuild 325 BLAKE2B fb98a51d7c08f22bcc060a94b8f5884f0308e51b3f60ddff2112502ec3b1cb392aa0c045e909543cdd7f05d1b028e84f947b2073247c251f46372c3986d6574e SHA512 c5ca5af5630ac5dcd3e5fc8071bebee1780c4889155bf6f6500c694f2d6c479de9528c8b69e2ed065161b515e173585818b4229bcc78736d7941f0f098f158e2
+EBUILD media_export-9999.ebuild 325 BLAKE2B fb98a51d7c08f22bcc060a94b8f5884f0308e51b3f60ddff2112502ec3b1cb392aa0c045e909543cdd7f05d1b028e84f947b2073247c251f46372c3986d6574e SHA512 c5ca5af5630ac5dcd3e5fc8071bebee1780c4889155bf6f6500c694f2d6c479de9528c8b69e2ed065161b515e173585818b4229bcc78736d7941f0f098f158e2
 MISC metadata.xml 330 BLAKE2B 445bb40599e2c212c5902bb97879d555e5e182ac00f21261b8e4729b2677e2667e9b4b1a285f5f3295f69cef01f481d7f2f1f542fabba7ac7c16977800b03fa3 SHA512 2bb631abc39b4004389cdf1838234d0334faece28d1bd02e9afd2e5e5021969fecf4415c14ef86df2d11fdc02c1dbe4c9ab6b21ae68a4a5229ea08b25f2e9c6a
diff --git a/dev-ros/media_export/media_export-0.2.0.ebuild b/dev-ros/media_export/media_export-0.3.0.ebuild
similarity index 85%
rename from dev-ros/media_export/media_export-0.2.0.ebuild
rename to dev-ros/media_export/media_export-0.3.0.ebuild
index 9140f6143732..6d904cb88330 100644
--- a/dev-ros/media_export/media_export-0.2.0.ebuild
+++ b/dev-ros/media_export/media_export-0.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/media_export"
 KEYWORDS="~amd64"
diff --git a/dev-ros/media_export/media_export-9999.ebuild b/dev-ros/media_export/media_export-9999.ebuild
index 9140f6143732..6d904cb88330 100644
--- a/dev-ros/media_export/media_export-9999.ebuild
+++ b/dev-ros/media_export/media_export-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/media_export"
 KEYWORDS="~amd64"
diff --git a/dev-ros/message_generation/Manifest b/dev-ros/message_generation/Manifest
index 74987fd887ff..909139e62031 100644
--- a/dev-ros/message_generation/Manifest
+++ b/dev-ros/message_generation/Manifest
@@ -1,6 +1,4 @@
-DIST message_generation-0.3.0.tar.gz 709 BLAKE2B 952b16c024aaf223e7677f5f1eaee242a969ae53195e83019c10221e1ce47cea87ffa8a99f5c7a133d8094cf2f0fa34a828a2c6a8ac1104f9617e970de40a689 SHA512 45dc0584f07f5bf3f1562eef8488aae27eaaf8e43f1a7b003d973fccf79a3006e54d544b2e8392c4a2eb12fcfec0d40fc60a6f914177573d0de167e48aef8efa
-DIST message_generation-0.4.0.tar.gz 719 BLAKE2B 9343fe47ce17da81c5c236c073ed7a92a20a962ea101c49daca88fc410c1a0b1ebad804fa40abefe47bfd8a909a45484d2623a50cd1c2281e51e8f1c5570885a SHA512 585d71d6ff208dbeea8402df5c82f41f05508392974c58a91b2ebda301b1d8ce93dc59376bace04778e34fe9dc124a70d5ddef967251e6c05896adea5a6b82ad
-EBUILD message_generation-0.3.0.ebuild 444 BLAKE2B 4ed080d9d7b8486e3311d9cde17d8c77dc020575c1d5d972d61bfa910baf829d6e2daa0a1843e2ed0abbd36d71db62caa9c77315eb04e369b7eddc64e35cc697 SHA512 98532f33393b528b7089b6af016332868923fbd2519267ec2a5198caf517604515c213aebd9b91e18077499b0232ec131667f72c3c2e98c43a6da0314cda1215
-EBUILD message_generation-0.4.0.ebuild 463 BLAKE2B 5e0c2adb38d832c96a594a911e91728600ddeaaea2d62d55203880302930ef5d9165590b3c2a089aafd2a192531623524fd9ee512cc30820d888aea1dcd05f6a SHA512 d985841cf90fc9e43428619ae0e20fdbc944e958f950fceb5da34bad7b37d84e2de4785ced2c62cf7feeebb52f34778ddc753898918ea86efe065f004d5c2fb3
-EBUILD message_generation-9999.ebuild 463 BLAKE2B 5e0c2adb38d832c96a594a911e91728600ddeaaea2d62d55203880302930ef5d9165590b3c2a089aafd2a192531623524fd9ee512cc30820d888aea1dcd05f6a SHA512 d985841cf90fc9e43428619ae0e20fdbc944e958f950fceb5da34bad7b37d84e2de4785ced2c62cf7feeebb52f34778ddc753898918ea86efe065f004d5c2fb3
+DIST message_generation-0.4.1.tar.gz 726 BLAKE2B bc9e1881b005d48fc9b9bc5f740e1b30537879f3019b4d879d3764a7e5733afc27ec7b4acc44c614c00b2dc6bb61b34221ba512caee55e55f33d1fbc55f748d1 SHA512 9a256dac2e4463917362e4f279c9dcd1945f8493890e423be4d2b4c6121677ffc859332fd48ef6a85977bef690e8843926269dda35e2c35d41a65eb714d6988a
+EBUILD message_generation-0.4.1.ebuild 460 BLAKE2B 08d7e85dc67eaa37ba06d2e72547cd9a026b2eba4609205593c53226eb3817be3fe6072213b6678535a9cab5930ff99a83d5e9562f82badf047589cc30c68200 SHA512 0a541548b586b50aaa77c3c554b126e864b09b378a102e2d56979e576c96a2610edafc246fae1b65ef8cac16bd866012955140c888ce217d6a2a42bf2bfa7dcb
+EBUILD message_generation-9999.ebuild 460 BLAKE2B 08d7e85dc67eaa37ba06d2e72547cd9a026b2eba4609205593c53226eb3817be3fe6072213b6678535a9cab5930ff99a83d5e9562f82badf047589cc30c68200 SHA512 0a541548b586b50aaa77c3c554b126e864b09b378a102e2d56979e576c96a2610edafc246fae1b65ef8cac16bd866012955140c888ce217d6a2a42bf2bfa7dcb
 MISC metadata.xml 336 BLAKE2B 4fa96804363c713faccfb1c1f1839e10fca19a5bc4e274969d0046789b866dfa77f78785e64a44ca6e70742bb34162b4ca9a64f4cf2759bd78699c86b17e3f15 SHA512 171bec3cd05ff014e864d68e57d32df3165b969f2d40d2ab02021f94dc965d13ef76a1a7bf74ce12a5f01d6d54eebbbcb1e5fc170beb468e4e63facd20ca157b
diff --git a/dev-ros/message_generation/message_generation-0.3.0.ebuild b/dev-ros/message_generation/message_generation-0.3.0.ebuild
deleted file mode 100644
index 0c8a789f3a60..000000000000
--- a/dev-ros/message_generation/message_generation-0.3.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/message_generation"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Build-time dependencies for generating language bindings of messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/genmsg
-	dev-ros/genlisp
-	dev-ros/gencpp
-	dev-ros/genpy
-	dev-ros/geneus
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_generation/message_generation-0.4.0.ebuild b/dev-ros/message_generation/message_generation-0.4.1.ebuild
similarity index 89%
rename from dev-ros/message_generation/message_generation-0.4.0.ebuild
rename to dev-ros/message_generation/message_generation-0.4.1.ebuild
index 86130e2ca8c8..1ea158d9fce0 100644
--- a/dev-ros/message_generation/message_generation-0.4.0.ebuild
+++ b/dev-ros/message_generation/message_generation-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/message_generation"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/message_generation/message_generation-9999.ebuild b/dev-ros/message_generation/message_generation-9999.ebuild
index 86130e2ca8c8..1ea158d9fce0 100644
--- a/dev-ros/message_generation/message_generation-9999.ebuild
+++ b/dev-ros/message_generation/message_generation-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/message_generation"
 KEYWORDS="~amd64 ~arm"
diff --git a/dev-ros/message_runtime/Manifest b/dev-ros/message_runtime/Manifest
index 666044b5f0ba..00088e282ed2 100644
--- a/dev-ros/message_runtime/Manifest
+++ b/dev-ros/message_runtime/Manifest
@@ -1,4 +1,4 @@
-DIST message_runtime-0.4.12.tar.gz 781 BLAKE2B a66e955de34af6edf2f373425f19fbaf97ef3a0d4869f0daecf475af7f9f1fe664298a01b7da064a13f0cc462e93b7a37d552ee0d81fab1198f7c34ad19027d9 SHA512 d4554b3f38d9712b5b81ae40e9e0f8249aefc97b2dede475609ff6e41c1e8b9f0efe86d0fdbbca030f2af3be969a950a101d0aba1d68a088752caf0e8caf6650
-EBUILD message_runtime-0.4.12.ebuild 447 BLAKE2B 16005cc4ad71b170911c1e1329bac3669c3902f449ac747615d0db820ab6eb118cc543b6b0af10f4409b130d96e248c24125e5821becefe0b9b7d13a970aabaa SHA512 cc12bccf913a07fd1ea90d286e9ce53a3ce958676f008e4dfc3c8a7eb8c5e88d11a5980702d8ab25a10c0bdfe74b97bd9350ec164d52f6ea09038c44460c770e
-EBUILD message_runtime-9999.ebuild 447 BLAKE2B 16005cc4ad71b170911c1e1329bac3669c3902f449ac747615d0db820ab6eb118cc543b6b0af10f4409b130d96e248c24125e5821becefe0b9b7d13a970aabaa SHA512 cc12bccf913a07fd1ea90d286e9ce53a3ce958676f008e4dfc3c8a7eb8c5e88d11a5980702d8ab25a10c0bdfe74b97bd9350ec164d52f6ea09038c44460c770e
+DIST message_runtime-0.4.13.tar.gz 776 BLAKE2B e5ac21f92e3c16d9220dbbc667c8f08a4eebfbacfd03a0a82dc1580898710d3b066629846fe50b7c550df27e1f41cc8f3403d96ac60efd4c7fb29de85dd41fb9 SHA512 0a5dfd5892929a5868133dd51ed33d67c8ec4fb509ed27f977b060531b5dfded977e3112dfeeb6df5bae5223fc8d7bcf00810a58d27e3adbef0bd53a06db6d80
+EBUILD message_runtime-0.4.13.ebuild 444 BLAKE2B 742824d58c39438a0b7bc2e778be8190d4c02717e22cdc5933c6bca4b4357c13e96e11f1d37da8cfb4bb394463742a04797e191b29e6e55de9cd8e7babc06961 SHA512 06494dccef5ad9ef1f4dcec4feeb18dc76ab6a33885b8af6144d6cf90aeef50b9c2a975a7a345cd6aedf59923d6db1dd70852fca11f092e6ff19c2a36e7fa397
+EBUILD message_runtime-9999.ebuild 444 BLAKE2B 742824d58c39438a0b7bc2e778be8190d4c02717e22cdc5933c6bca4b4357c13e96e11f1d37da8cfb4bb394463742a04797e191b29e6e55de9cd8e7babc06961 SHA512 06494dccef5ad9ef1f4dcec4feeb18dc76ab6a33885b8af6144d6cf90aeef50b9c2a975a7a345cd6aedf59923d6db1dd70852fca11f092e6ff19c2a36e7fa397
 MISC metadata.xml 333 BLAKE2B 503d6faa6fed6e6cccdca69dd8a7c51623022f49baf2e69f26b5ecf7556bb0c5cf9eb80d3c20f32353664ce4c15b3375d633794d0d29f963455b18dd5dd7540a SHA512 e24bac62efb6ebc5a6974085b881492d8e35ff059a9fb10593af4d4ca457f7ef4bd70fc257e59a8817dd210f05378d00f4bf732e987fe877b561c4fefe812f31
diff --git a/dev-ros/message_runtime/message_runtime-0.4.12.ebuild b/dev-ros/message_runtime/message_runtime-0.4.13.ebuild
similarity index 89%
rename from dev-ros/message_runtime/message_runtime-0.4.12.ebuild
rename to dev-ros/message_runtime/message_runtime-0.4.13.ebuild
index 169716e72670..0168d5fac070 100644
--- a/dev-ros/message_runtime/message_runtime-0.4.12.ebuild
+++ b/dev-ros/message_runtime/message_runtime-0.4.13.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/message_runtime"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/message_runtime/message_runtime-9999.ebuild b/dev-ros/message_runtime/message_runtime-9999.ebuild
index 169716e72670..0168d5fac070 100644
--- a/dev-ros/message_runtime/message_runtime-9999.ebuild
+++ b/dev-ros/message_runtime/message_runtime-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros/message_runtime"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/message_to_tf/Manifest b/dev-ros/message_to_tf/Manifest
index 92e8ded9fa7b..eba36875515c 100644
--- a/dev-ros/message_to_tf/Manifest
+++ b/dev-ros/message_to_tf/Manifest
@@ -1,4 +1,4 @@
 DIST hector_localization-0.3.0.tar.gz 73656 BLAKE2B 8e895c760974f8707eb174b3b385f03f07f93f89b470d88140f1134a3cb9fb8e67e65a86484b702dbaed09e4d614f4c6759f1e08b536385f86ec15dc3db6a644 SHA512 5763a98247754b021631c894d44172d7c215d81f556760578f585febf2248da8dfcf10c6f1430cff47800778d39a79ab31a59916ad13c6d5ecf8a17eeac4e8df
-EBUILD message_to_tf-0.3.0.ebuild 618 BLAKE2B 186b7388b25bf2dae7144a79d0f57b38c6bcc7da12cc95ff774a6fb307f63975289e828c2ea93f5688d388e14e4a1f679097f215e4621b5c49611e9b7be67efd SHA512 f5a23da8ea1d7c371554b7b459497098ba42be625291773824729a046c4903c4d2bb97f8417d9d3267effa6774dfa4ab60c148d440e0b7b0ba16d9ca97823e25
-EBUILD message_to_tf-9999.ebuild 618 BLAKE2B 186b7388b25bf2dae7144a79d0f57b38c6bcc7da12cc95ff774a6fb307f63975289e828c2ea93f5688d388e14e4a1f679097f215e4621b5c49611e9b7be67efd SHA512 f5a23da8ea1d7c371554b7b459497098ba42be625291773824729a046c4903c4d2bb97f8417d9d3267effa6774dfa4ab60c148d440e0b7b0ba16d9ca97823e25
+EBUILD message_to_tf-0.3.0.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
+EBUILD message_to_tf-9999.ebuild 611 BLAKE2B 5c7534594ca539dfc4722359537a546859e0815e4b460eadcead11cd1074654c7a4be9480074b70528a3f4cf429dda0d6c80bb34143ef17943ed18bbdb252060 SHA512 b20087191da892d03baad6aef63f653599c2c26e3475507888a1b2f44eeb36e76c920a77dd79b4a3060da6713aba157ff124510c1332b2645f84f7c1e5c9cdc6
 MISC metadata.xml 354 BLAKE2B 8fa87680be83a7fc421afc00fa7e203bd512c42324cee5ce59f08a6acdfacdd09a8427e547982ccff17253589708a0556e51420188c3639ab638df4994e4edb7 SHA512 5efea6ff063bdb92ca5c0c45cbc4c9cc110d4ed800b8631259abdffb771abb183594d9e72920e0daf9948c909a69ab564b70fed83bb2a0a879d5712f3c608420
diff --git a/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild b/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
index 5b2da944b6a4..1c31dc9a9a66 100644
--- a/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
+++ b/dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Translates pose information from different kind of common_msgs message types to tf"
+DESCRIPTION="Translates pose information from different kind of common message types to tf"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/tf
+	dev-ros/topic_tools
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/message_to_tf/message_to_tf-9999.ebuild b/dev-ros/message_to_tf/message_to_tf-9999.ebuild
index 5b2da944b6a4..1c31dc9a9a66 100644
--- a/dev-ros/message_to_tf/message_to_tf-9999.ebuild
+++ b/dev-ros/message_to_tf/message_to_tf-9999.ebuild
@@ -1,24 +1,25 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/tu-darmstadt-ros-pkg/hector_localization"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Translates pose information from different kind of common_msgs message types to tf"
+DESCRIPTION="Translates pose information from different kind of common message types to tf"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/tf
+	dev-ros/topic_tools
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/topic_tools
-	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/move_base_msgs/Manifest b/dev-ros/move_base_msgs/Manifest
index 13c982b1b929..471c1676b74e 100644
--- a/dev-ros/move_base_msgs/Manifest
+++ b/dev-ros/move_base_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST navigation_msgs-1.13.0.tar.gz 2251 BLAKE2B b70ade2d296f8a94ae89286caa4f23adba5ac5c058ccfcdf6a35a9bac03e5238a37bcd91bbf99f62d3fe806639e8a655c5fcc9391e637e37238f0421805903dd SHA512 e7b4a83bbbd5384f72d1a9d7e3544cde718728ba2a2562b3c0da5b5fd7db146faf8c717d4af2509eaf1ff545ac85da121f7e37cb7b6b53c8a5b8d683c6b4e66c
-EBUILD move_base_msgs-1.13.0.ebuild 533 BLAKE2B 6d3c03c439cf065903dd4fa99f7a0f5a8a6aff52499edcdb35b83118bd2ffc00df407dd52cbf8bbb5b32cd512e85bfa12a52155043538ec33a333f3e0ad81b5e SHA512 10f0a3ab821b9d46789b8a4fd2f02ebc86ba741a205d4823b8b348d16e372ceb5eb8ec19b329727967404f53aef4c84cb7bcafce9a683d7f4cc4ea9549f5090f
-EBUILD move_base_msgs-9999.ebuild 533 BLAKE2B 6d3c03c439cf065903dd4fa99f7a0f5a8a6aff52499edcdb35b83118bd2ffc00df407dd52cbf8bbb5b32cd512e85bfa12a52155043538ec33a333f3e0ad81b5e SHA512 10f0a3ab821b9d46789b8a4fd2f02ebc86ba741a205d4823b8b348d16e372ceb5eb8ec19b329727967404f53aef4c84cb7bcafce9a683d7f4cc4ea9549f5090f
+DIST navigation_msgs-1.14.0.tar.gz 2329 BLAKE2B 7414a4b67fde26223cdf81a14b1c3e56f2bf5519d46455234de75bf79b10c8fa0f1a04a2865703723c0a975bde77e22754e751c07edc73fddd10bae9ac5b0feb SHA512 0354856b8964547cb96d59717d1d1e8b4c261b79bd451a25755303d295aecf3f0011a825307e0fc6ccd5179f4ea921a8debd8be79b5e4d2bdab0f0d57b54e56d
+EBUILD move_base_msgs-1.14.0.ebuild 493 BLAKE2B 52d5450b37242e3433f95ac5db7c51b33405428a807e0c964f5c43a75517ccf783096c23bacf023aeff348fb1303019bc890a4dfc96ad46c52877b6190651380 SHA512 69a1f51dd0802aa7c862304af5ed1adf80436d15e36021b6acbdcf8d4f306fb821c026a01b3c98c9a0d759c144fbaa4ee1f722d26c9bd3e9c45d0fb59063b773
+EBUILD move_base_msgs-9999.ebuild 493 BLAKE2B 52d5450b37242e3433f95ac5db7c51b33405428a807e0c964f5c43a75517ccf783096c23bacf023aeff348fb1303019bc890a4dfc96ad46c52877b6190651380 SHA512 69a1f51dd0802aa7c862304af5ed1adf80436d15e36021b6acbdcf8d4f306fb821c026a01b3c98c9a0d759c144fbaa4ee1f722d26c9bd3e9c45d0fb59063b773
 MISC metadata.xml 342 BLAKE2B c278231941f53347e7457813d64fc0bf8b32bcacbfddc955c8d90538c9ae9c23504c51747c32ef7f8c5555c22d25bd34c1a5185df6d864b6f0509fdccedbcdd0 SHA512 6b28c6c3ff5f68ebfe8ba768c80ebc61c054453fde126fc64aa406e69fdf2f3174031930b8830144ba25401354df016f8179ab3d16c50d339b486a13421dd684
diff --git a/dev-ros/move_base_msgs/move_base_msgs-1.13.0.ebuild b/dev-ros/move_base_msgs/move_base_msgs-1.14.0.ebuild
similarity index 91%
rename from dev-ros/move_base_msgs/move_base_msgs-1.13.0.ebuild
rename to dev-ros/move_base_msgs/move_base_msgs-1.14.0.ebuild
index 29432d3e9a38..4ccf99a8e8da 100644
--- a/dev-ros/move_base_msgs/move_base_msgs-1.13.0.ebuild
+++ b/dev-ros/move_base_msgs/move_base_msgs-1.14.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild b/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
index 29432d3e9a38..4ccf99a8e8da 100644
--- a/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
+++ b/dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-planning/navigation_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=${PN}
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
 
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index a6d209147024..480f195529c0 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1,6 +1,4 @@
-DIST moveit_msgs-0.10.0.tar.gz 17847 BLAKE2B f80d7c267aab47b38e426b88e7a1e5487c738a8aeda143eee3d4c83a5929b66380aff939536d8f587b7acacbe239bfb2d5a8489fa3100a1f9f15cbe0cff310db SHA512 80a7dca2e9bda4bcf191691671ba179a42fb031b9ba2ac64c8e73854a94dc15ffaaedb1dce06da42d994c9c8b3161e6d55a8ef7a9c3c5a1f3629779eac5c1dba
-DIST moveit_msgs-0.9.1.tar.gz 17760 BLAKE2B 1ac7c9c30e5873ecf51db435c66553d3ded4104cfca6a5daaa3396d96380eb41580b3c494b94c002b2829f01c001f947f126935c5dd9f239362da08bc8567ff2 SHA512 af998019a5c1c82a2026c6d2071feb7494616b6eef942450dbb81178f0c393c173ca8b8c17018f6da15b5b0ac438515a762914122ad315572cc5ef25567be758
-EBUILD moveit_msgs-0.10.0.ebuild 625 BLAKE2B fc95849a42a3703937483f3e369fbabd37e0ca7e3a94979331f6eb9600af8af149daf3d0f68187d7adc89038613e28153896cbb74ae7f0fa7e505d3f408e99d2 SHA512 ff25afcb212cdbaed817caa1650506b07943cafb1e10bee2e771ee73e965d978fe3bb95f0ae68b329e10108aba6eb1a166c30140ec2cb72e1358f1acf2a79842
-EBUILD moveit_msgs-0.9.1.ebuild 625 BLAKE2B fc95849a42a3703937483f3e369fbabd37e0ca7e3a94979331f6eb9600af8af149daf3d0f68187d7adc89038613e28153896cbb74ae7f0fa7e505d3f408e99d2 SHA512 ff25afcb212cdbaed817caa1650506b07943cafb1e10bee2e771ee73e965d978fe3bb95f0ae68b329e10108aba6eb1a166c30140ec2cb72e1358f1acf2a79842
-EBUILD moveit_msgs-9999.ebuild 625 BLAKE2B fc95849a42a3703937483f3e369fbabd37e0ca7e3a94979331f6eb9600af8af149daf3d0f68187d7adc89038613e28153896cbb74ae7f0fa7e505d3f408e99d2 SHA512 ff25afcb212cdbaed817caa1650506b07943cafb1e10bee2e771ee73e965d978fe3bb95f0ae68b329e10108aba6eb1a166c30140ec2cb72e1358f1acf2a79842
+DIST moveit_msgs-0.10.1.tar.gz 19163 BLAKE2B b24b9b0330350c42c80588f6bd9273ba467958812f294918f7a4695ef435b6105591aab01f856c008ac0d73679d5bab34249f82b723de954fd66ac461ee9bbb6 SHA512 7b574bcffc7533dba44420b5a965604bc8396cfac7d1d3f3dc8e0ecb8f65c4a7b4692c06286db80ee3e3cf995c79dc52297aa9cd5237a0d87613266f762cb2dd
+EBUILD moveit_msgs-0.10.1.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
+EBUILD moveit_msgs-9999.ebuild 585 BLAKE2B 9869f0901d9a7147418fb131865f33bb4f221460eacb9eb635fe50e12d1c436a7b87c841880e1ec28574e739a5a8172894a54b21a13a89771a7871db02108fd6 SHA512 3ff92b8cf23fefac59574aef6a5154a331282fcb78dc355be7bd230b1fd1ecd78a1f9f9e90259272cdad2448dc226bff433c23e14f9fcec8ff4c81510338a5d2
 MISC metadata.xml 338 BLAKE2B f91c4144e8f04fe987c5db67b6ebf539420aa3c07bd50c58394bd489a5d6b41f6122a645dd2c182dc6c14d4755d97b89fe444e2a1b48a6b048a6726c36bd31e9 SHA512 232c4c964a3798a5b5aa26692e74b2f71e1a6f4bf89e618c86824d0a6fd97b4064b68ecb380dc505c4cf492fd45671e89bb419d96377e5fced8a665b864fb1a1
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
deleted file mode 100644
index 2bc52771c9d3..000000000000
--- a/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="
-	dev-ros/actionlib_msgs
-	dev-ros/sensor_msgs
-	dev-ros/geometry_msgs
-	dev-ros/trajectory_msgs
-	dev-ros/shape_msgs
-	dev-ros/std_msgs
-	dev-ros/octomap_msgs
-	dev-ros/object_recognition_msgs
-"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages, services and actions used by MoveIt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.9.1.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
similarity index 92%
rename from dev-ros/moveit_msgs/moveit_msgs-0.9.1.ebuild
rename to dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
index 2bc52771c9d3..6490a10393ef 100644
--- a/dev-ros/moveit_msgs/moveit_msgs-0.9.1.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/sensor_msgs
diff --git a/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild b/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
index 2bc52771c9d3..6490a10393ef 100644
--- a/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
+++ b/dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-planning/moveit_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/sensor_msgs
diff --git a/dev-ros/nmea_msgs/Manifest b/dev-ros/nmea_msgs/Manifest
index 1a0d2e2d4010..fa4446879654 100644
--- a/dev-ros/nmea_msgs/Manifest
+++ b/dev-ros/nmea_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST nmea_msgs-1.0.0.tar.gz 1259 BLAKE2B 116c649a8e56040f27156991ad19ebf1465241c0ce2e243eed3fec5944b536c27f118b1ac8b9b82140758cdebdaf2ed0e8daeed0d4e45544aa3691aadaa16cab SHA512 159c9792390bd68dd64b239c3aee53096f2d86ecce1d0ff33269329899bdd0dfc95d278dbc25326af0ae1e1e6e7ee7bdd2e3936bd45bb048b2d7fc1c6533e7d0
-EBUILD nmea_msgs-1.0.0.ebuild 462 BLAKE2B 92fa0df58fa95337dec2156317e0d5c75651a8626920c3c12b988bc99704cfe159032453370c5113f51f45d7bdaffada27c9da3552b61d55648eeaa174ec0c73 SHA512 0ed007fd07a2c226d37976f4d52c31efe06832cfd34be705ac5a8cd10534cab5137a19406fe8c86f3200fe83da7a9c24149f6a70f8ef80ed8aaf9dcbe5937855
-EBUILD nmea_msgs-9999.ebuild 462 BLAKE2B 92fa0df58fa95337dec2156317e0d5c75651a8626920c3c12b988bc99704cfe159032453370c5113f51f45d7bdaffada27c9da3552b61d55648eeaa174ec0c73 SHA512 0ed007fd07a2c226d37976f4d52c31efe06832cfd34be705ac5a8cd10534cab5137a19406fe8c86f3200fe83da7a9c24149f6a70f8ef80ed8aaf9dcbe5937855
+DIST nmea_msgs-1.1.0.tar.gz 2289 BLAKE2B 0e3b7819f4104e04f9a54a5355245097cfc8e86cb3289bf92d246529bb5b7ac5a7488535ddc4622ed2aecf6c1d923e4d765735b95b90800e4090e48bc5482f2e SHA512 7bf66adf6913bd56be12d180a435f02f71ae7739e9b76967b7fde0a61478272a523e7aef436223a659ffffd0abb0ec3bc6d79d2214b587c2aba13e6199a6d293
+EBUILD nmea_msgs-1.1.0.ebuild 404 BLAKE2B 02e425e40c05342ef90ac821f8d9ae69df86db0aee9ab59e3e449544ad075995bf37f8ff74d774f4e5df72456b7e11dd90b55a1385e610ec9a5bbd4cbcbf3fdc SHA512 e1607ca9e1dd3596c1fce06a10259c2533e802fca5cbaf8979bff7b6045bbc7f4e0b29b863101cb38e8ce2523af7518eb1e1707fad720b545e6635c05314a7e5
+EBUILD nmea_msgs-9999.ebuild 404 BLAKE2B 02e425e40c05342ef90ac821f8d9ae69df86db0aee9ab59e3e449544ad075995bf37f8ff74d774f4e5df72456b7e11dd90b55a1385e610ec9a5bbd4cbcbf3fdc SHA512 e1607ca9e1dd3596c1fce06a10259c2533e802fca5cbaf8979bff7b6045bbc7f4e0b29b863101cb38e8ce2523af7518eb1e1707fad720b545e6635c05314a7e5
 MISC metadata.xml 335 BLAKE2B 6f3566b11c9f6b3acb6821cbd74d9dc41db35bffcaaec7f0aecaf9ed5083a8a6936483d380f00b145873243490962e73097e387a84bd3636385a2666339bada2 SHA512 7a6144c3e15356968de437fa861ae2327e810e0fd546f00832a844f10208e421fddf270fd00be6de24395c62620bc89c27b9d68d37adac4be2a3c734336adc71
diff --git a/dev-ros/nmea_msgs/nmea_msgs-1.0.0.ebuild b/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
similarity index 85%
rename from dev-ros/nmea_msgs/nmea_msgs-1.0.0.ebuild
rename to dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
index 3e401f9fe3ac..685e1a5323d0 100644
--- a/dev-ros/nmea_msgs/nmea_msgs-1.0.0.ebuild
+++ b/dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-drivers/nmea_msgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-VER_PREFIX=${PN}-
 
 inherit ros-catkin
 
diff --git a/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild b/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
index 3e401f9fe3ac..685e1a5323d0 100644
--- a/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
+++ b/dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-drivers/nmea_msgs"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-VER_PREFIX=${PN}-
 
 inherit ros-catkin
 
diff --git a/dev-ros/object_recognition_msgs/Manifest b/dev-ros/object_recognition_msgs/Manifest
index 954caae85e44..9b3419badf22 100644
--- a/dev-ros/object_recognition_msgs/Manifest
+++ b/dev-ros/object_recognition_msgs/Manifest
@@ -1,4 +1,4 @@
 DIST object_recognition_msgs-0.4.1.tar.gz 4756 BLAKE2B 9d6c919b82d4e9300eebc9ba36498414f62a9a6392649adb7db011e315eb64d2810b1c8eab6f647a58d8ab60dfa1dfae77d98164b9f97d9f4a9c47716a0d3cc4 SHA512 4e2d48795b0376640dbb6eb82ca3d0cdf5e2d4a2e7ec8d723ce7613c678fc2dc037fceafe8b37a905d9bb2f0a283e84e4adbf986dd6e5322ae96d43de120a3cf
-EBUILD object_recognition_msgs-0.4.1.ebuild 585 BLAKE2B bb9443a665ef1fee85e610c1c2f5c25d6436aa9324a6a970efc811941687f29d6643495afda81ff069b5a1bc5e181498b838596cacc67a479361709ce6419d26 SHA512 273649f7f5c1274ec6a18eff29fde601568acda20dc074fea970e72470f49f2a6f8320c48c69bd18a78c5d8f1df1c752d0c26e552763b29457fe055ade82a869
-EBUILD object_recognition_msgs-9999.ebuild 585 BLAKE2B bb9443a665ef1fee85e610c1c2f5c25d6436aa9324a6a970efc811941687f29d6643495afda81ff069b5a1bc5e181498b838596cacc67a479361709ce6419d26 SHA512 273649f7f5c1274ec6a18eff29fde601568acda20dc074fea970e72470f49f2a6f8320c48c69bd18a78c5d8f1df1c752d0c26e552763b29457fe055ade82a869
+EBUILD object_recognition_msgs-0.4.1.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
+EBUILD object_recognition_msgs-9999.ebuild 545 BLAKE2B d8164cbc0fd7851157e6dcd30e4bdcfb3620673e4409e9acde9ce8ddd1c4cc8f571e9b830f59c7941e2a950445a15993f5859e84799b0e6bf13a6333ff3bc691 SHA512 57a72839acc0955f79395bfb96c66d8a2e7508de27a3b1eaa38811eeb7db7a38eaa3fe53a51574d8bd213dd441f217e34ed39d7f60cd58527257d11251e5d02a
 MISC metadata.xml 351 BLAKE2B 08c11c3e85e64d6bfad30f493bf14be8f672c8482edd9ff90c8e4d7686e9cb031f955b01bb4c8e35030e8dadc37ae299811d84da692ecaf8badcd9cc4041e8bf SHA512 84326325a832b3a3029f36b758aad22fc18b13bbfdcfd64cd25ed7f4e4e88a578788d34fe6ae9fe3e765ddf20c754448ca138753ab5ca4e881eaae36094fda2c
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
index b816408304e8..9af6f1bdaa76 100644
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
+++ b/dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/wg-perception/object_recognition_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/geometry_msgs
diff --git a/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild b/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
index b816408304e8..9af6f1bdaa76 100644
--- a/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
+++ b/dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/wg-perception/object_recognition_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="
 	dev-ros/actionlib_msgs
 	dev-ros/geometry_msgs
diff --git a/dev-ros/octomap_msgs/Manifest b/dev-ros/octomap_msgs/Manifest
index 21ea3eff0ee2..1e36571b3173 100644
--- a/dev-ros/octomap_msgs/Manifest
+++ b/dev-ros/octomap_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST octomap_msgs-0.3.3.tar.gz 4566 BLAKE2B f0f2d7591b203b05d40722e7a9b52ca831af63e36c5026004e5c727baea0ffe4d5b6206ded90aaa6893b48fa2a493b880b00c28afdf449f906e8ca1e2c786660 SHA512 b88d708e981cdac0c1180013305cee8a107e7019aacb74152c70be828cb0d581fac0e6525c0599328dd8dd5b0e3df9880773752f36d94d35b3435c38584ddbe1
-EBUILD octomap_msgs-0.3.3.ebuild 490 BLAKE2B 4992af4f5d9fd1d1ebf2a1e3e9b56d669742ab0b52cacbe983197b32b65398fcb826f6284e35acc87cab056fcb9e57ac3edb3201b003974d6d2e3afad1494eaa SHA512 bba6828290c6934f9ef4e86671cec05b6cee5526aa94760fa887566881eb6b5f53a5647d8b28b3d450cc676aa5b0bcbe565b4182b87462cd45a787f659115870
-EBUILD octomap_msgs-9999.ebuild 490 BLAKE2B 4992af4f5d9fd1d1ebf2a1e3e9b56d669742ab0b52cacbe983197b32b65398fcb826f6284e35acc87cab056fcb9e57ac3edb3201b003974d6d2e3afad1494eaa SHA512 bba6828290c6934f9ef4e86671cec05b6cee5526aa94760fa887566881eb6b5f53a5647d8b28b3d450cc676aa5b0bcbe565b4182b87462cd45a787f659115870
+DIST octomap_msgs-0.3.5.tar.gz 4676 BLAKE2B 495172a8e2d01d1e21ef09f936eae4133fdb7ac7de089df13672ec01f833b413350484081c786a54a0a037af7de04ba65ac8d751c3ee0c60098c982befe452a0 SHA512 b828b8839d2e19f3df58041bb55034b086dbec057e91476ebfd00f637bdc7c6e02bedbafaa6aa96c5399d06af7bb513f6e4088ab8499842e6c537d22325dcde7
+EBUILD octomap_msgs-0.3.5.ebuild 450 BLAKE2B cacecf1df0c4d36d4796dff5cc60be3c89ef292c320c576d0d39f122b4fee72b15407ac522c81014c125c715a3105a5e2dfafd3d4bde2b06d03b580a266052c5 SHA512 f2bc70985ef975401583e90e1c56a614a1f24c5400a5b28dc91c946fc50c72f17a21817c07a454a11ff2f2c4dc0896381f56f42413e81cb45a547cb4531b97cd
+EBUILD octomap_msgs-9999.ebuild 450 BLAKE2B cacecf1df0c4d36d4796dff5cc60be3c89ef292c320c576d0d39f122b4fee72b15407ac522c81014c125c715a3105a5e2dfafd3d4bde2b06d03b580a266052c5 SHA512 f2bc70985ef975401583e90e1c56a614a1f24c5400a5b28dc91c946fc50c72f17a21817c07a454a11ff2f2c4dc0896381f56f42413e81cb45a547cb4531b97cd
 MISC metadata.xml 334 BLAKE2B d259b147c66e00b0efa297c0491593ffd4873606e0adad96742c146d46c785a3a4757d3b369dd98582a7c9ed00909a9bfec6ef360afef9cd5f4f628a4071e9fc SHA512 0c7997d8652614b7b37d6bb9126d1cf89b0b9aebb72cee36ab8229894725e6d0d10002340e664b5a3d05e4b9536f7d5984fdabfd0df1a53f6026d97508231205
diff --git a/dev-ros/octomap_msgs/octomap_msgs-0.3.3.ebuild b/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
similarity index 90%
rename from dev-ros/octomap_msgs/octomap_msgs-0.3.3.ebuild
rename to dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
index 855713abc478..fb5758dfad35 100644
--- a/dev-ros/octomap_msgs/octomap_msgs-0.3.3.ebuild
+++ b/dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/OctoMap/octomap_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild b/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
index 855713abc478..fb5758dfad35 100644
--- a/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
+++ b/dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/OctoMap/octomap_msgs"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/octomap_ros/Manifest b/dev-ros/octomap_ros/Manifest
index 36333bfd3c10..e7aa7ee96028 100644
--- a/dev-ros/octomap_ros/Manifest
+++ b/dev-ros/octomap_ros/Manifest
@@ -1,4 +1,4 @@
-DIST octomap_ros-0.4.0.tar.gz 5076 BLAKE2B 4c1431d139e7025cae3ac9fa41fa86c71690be58d3177a3a4694f62affc2d61a73eeb456ab78b17c6b63ece8cf9582cff179c4f73ba3520e792a1e819e5ee69b SHA512 41910879d042dcbd969544e89fe40c1da8be75118ef1b813e3cb0319b83529a9c759fe99ed430b275d10d5df987bed7e2b4d7300ed561d159b6007de306bc8ce
-EBUILD octomap_ros-0.4.0-r1.ebuild 509 BLAKE2B 358e20cbdfa9c9662bd7de637aba0660dacee5e233896ddf9c476ea0b8dd3ab4a120e6295a71d1628d2ce01f5adc74dda4d7104219ea8ed421b53dcc284eeebf SHA512 2db338b29533ed7103a0eaa23289d5744d55909ff246a867d7369b1eedfb4fed647ef169400306ffd377192695333b80a6352be3c8d78ea8a2c4e1eda97c4c8c
-EBUILD octomap_ros-9999.ebuild 509 BLAKE2B 358e20cbdfa9c9662bd7de637aba0660dacee5e233896ddf9c476ea0b8dd3ab4a120e6295a71d1628d2ce01f5adc74dda4d7104219ea8ed421b53dcc284eeebf SHA512 2db338b29533ed7103a0eaa23289d5744d55909ff246a867d7369b1eedfb4fed647ef169400306ffd377192695333b80a6352be3c8d78ea8a2c4e1eda97c4c8c
+DIST octomap_ros-0.4.1.tar.gz 5879 BLAKE2B a41d8d6688bfc2a182fce6c7b2e032c3cbc7b467c6c8b806adc4e93f371fb49a1aa5d9001b17407d8db33facc3edf868020816a06ff051d5190b9ca5463d6b12 SHA512 692a9f16589b24521440f81f4a55ddaca1778a5bc3c05e30313847300b4012af3a2d2db3786fec7e4a6b7af197c37dc447fded81ab343fcccfa2a4c8810883ab
+EBUILD octomap_ros-0.4.1.ebuild 507 BLAKE2B 37859dcb3020e93096235e3b3876eda22fc23ba77261074d4b5fa6e7216641a4b7a1ed921dbd8d3d4823da1fc2b88b3de32d95d284c60b1b803c3ff365274021 SHA512 82c9aa27831c864486c55381d764c10a8b2f526ec9e64e4543216ddc238fcf67bffd9773ac174155dca645f2ce84bcd9c7d2e8211272140154903c2cc581f75d
+EBUILD octomap_ros-9999.ebuild 507 BLAKE2B 37859dcb3020e93096235e3b3876eda22fc23ba77261074d4b5fa6e7216641a4b7a1ed921dbd8d3d4823da1fc2b88b3de32d95d284c60b1b803c3ff365274021 SHA512 82c9aa27831c864486c55381d764c10a8b2f526ec9e64e4543216ddc238fcf67bffd9773ac174155dca645f2ce84bcd9c7d2e8211272140154903c2cc581f75d
 MISC metadata.xml 333 BLAKE2B 0997902e45c25ffbdac0d4a065c63a5adf108ffc126c133ce6e5e8776ad7319d6458dfa19ce1aac238d9b522abbab9ab60d29a29c0d5cafa53322cc481fa0964 SHA512 6ae210514f0405e56fdefc8db22fc196de2648d687163e3d55bec4c0fa8d950bf60b7d7b4220f56d545ccbd88ac1b5e6075673a01ab4c6b69f7febde8bf33362
diff --git a/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild b/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
similarity index 86%
rename from dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
rename to dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
index b73677241874..a45d9828a875 100644
--- a/dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
+++ b/dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
 KEYWORDS="~amd64 ~arm"
 
@@ -16,7 +16,8 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/pcl_ros
 	sci-libs/octomap
+"
+DEPEND="${RDEPEND}
 	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/octomap_ros/octomap_ros-9999.ebuild b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
index b73677241874..a45d9828a875 100644
--- a/dev-ros/octomap_ros/octomap_ros-9999.ebuild
+++ b/dev-ros/octomap_ros/octomap_ros-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/OctoMap/octomap_ros"
 KEYWORDS="~amd64 ~arm"
 
@@ -16,7 +16,8 @@ RDEPEND="
 	dev-ros/tf
 	dev-ros/pcl_ros
 	sci-libs/octomap
+"
+DEPEND="${RDEPEND}
 	dev-ros/octomap_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest
index 63c2973bd22a..f468a0babcb7 100644
--- a/dev-ros/opencv_apps/Manifest
+++ b/dev-ros/opencv_apps/Manifest
@@ -1,5 +1,5 @@
 AUX ocv4.patch 5101 BLAKE2B 1f298695f9c0dd46dad07c6495975043e9031ee5e19fdb886a512861a04bfa3029427213db00af9f6e68ef678c1a172e6ffdaf671bfa9a108f17d58204dd5bf9 SHA512 a24a4a510a501caafaa78a9a856724e3bdf8b9ea70cbf41da7b6b96e18a013b08f01660289e4cb0e77567c9ae6fbabf751cbbefef6ba391a37ecb6b09cb1c373
 DIST opencv_apps-2.0.1.tar.gz 83497 BLAKE2B 31d0447696716ba623e64e69dc269491c4a943125c90c33ac2e495ce2a64f417758e0a142f36c5dde9032475abee516fecf9e227bbe977706f1a89ea02a3daad SHA512 db263bb49f1b083cfd84f325911da804c3a2c8b3db7f3a2ce697a4fe2dde2b692a2b1921bd32aecb19d67c93f7bf6809340c418b6bf4619ebd7beed1469838da
-EBUILD opencv_apps-2.0.1.ebuild 718 BLAKE2B ed7aac7cf21fac146d6128c05699646ed4290e425146fbb85e398368155d799581a0e46ef55d6b462a8e626cad8486f773224dd7c1b763495df77dc9fe821061 SHA512 0a17c17195a8bbe8dd61b52f4135413374536f1cf1c271a47623bc2da940a273842e836d0cacba183efa50d1891ee3ad2767393a0090440422a2eb80a8dad679
-EBUILD opencv_apps-9999.ebuild 684 BLAKE2B 137307ff871a7f5aa7003692e977c6957beb772f0c8f8dfdc43f6c44849b951f4ef434e8063d6130b881b313a2f4f9f07b51112fd77d732b9a2c71438d0988af SHA512 1314179ad9e8f67931fe1f38585a52cb3799436b2f245bbb48b746b154cf8a4ae9eeceb3e174e25f7617ebb5e47ceea6593b48f38b3789c26386e23a273c10d0
+EBUILD opencv_apps-2.0.1.ebuild 691 BLAKE2B 3ca73b4c6406142ce0ae1a368a1f29a3f75b3a2776320c016871f902d0457715390c060a8639b3a8d7d4738c4db4eb843be114aefe1bd6d101da92dde4cda235 SHA512 d6e50733b05bc8e40dc0a4db827fdddcc29ae69ea60c590334e85b965cbc68f74b0f2021c51a5c5538428fb3023b01ed387fbcc422e0d5a5ed0bc2f727755761
+EBUILD opencv_apps-9999.ebuild 654 BLAKE2B 2a0290b6f18d91af3cc59fbbb268ff8e38611338e8ce898a3a955c09083c566aa0ce065a35999d394ee33d54e31695af8d3ab63ee83b52b28679b2bbaf9a851c SHA512 e45419fe5296d4d9b91d40b06bf374d157d0bff454371b0f3d40c8178b0bfb7d77c5b982a8d54f5d512ffd99a69859001510e78190d5af4d28b4287ffbe0ee46
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
index 74105169c2d5..f8987e6874e5 100644
--- a/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
@@ -19,12 +18,13 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 	dev-ros/image_transport
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	>=media-libs/opencv-3.3:0=[contrib]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
 PATCHES=( "${FILESDIR}/ocv4.patch" )
diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
index ddf09bbd814e..2d5b432fc6f9 100644
--- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild
+++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/opencv_apps"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 CATKIN_HAS_MESSAGES=yes
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
 
@@ -19,11 +18,12 @@ RDEPEND="
 	dev-ros/cv_bridge
 	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
 	dev-ros/image_transport
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
 	>=media-libs/opencv-3.3:0=[contrib]
 	dev-libs/boost:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
index de909d7af7cc..083fecc1ddb0 100644
--- a/dev-ros/opencv_tests/Manifest
+++ b/dev-ros/opencv_tests/Manifest
@@ -1,18 +1,4 @@
-DIST vision_opencv-1.12.1.tar.gz 79203 BLAKE2B 55453f3ebdd26fbebf6cc527ca7029bf7ac8c1ee343b05f9a1fbf5a0dae284d7b1e29879ee0e23fd8b6a6a8317ce916147a368535075eb6bdf3bdfb40f0e3662 SHA512 f95b3247eed1d5f4403b1a123a033a5178d3491cf5deee27bf8386a9dab66475ef7889d0787483a03545ba9fc11e039b4ab0beedfa09121562cabd1bd33b5f88
-DIST vision_opencv-1.12.2.tar.gz 79771 BLAKE2B adc102d23eccdaca8c39fc0ef27510c32c36568a0deb242519392d454054d56e695f0d7b2ae006d99e2557f7209054d724cbba2b3fed742ac229e30ff773a753 SHA512 823e7e122d351e615e95093f6962b38ff76c01a876f71f4810fa2014ee9c71ec0c1e63d3d5a01a0297d6c58012e6b6a14ee850f57feda83d4d7125b9e0bd12c0
-DIST vision_opencv-1.12.3.tar.gz 80497 BLAKE2B 97e9c6d623108307216ae88dd5a4c6231b61d64826907c130233bab7c1590a50adf4e6bfdca3f6130365848a98ff1d2f58228c7f2dbc256aff6bbe04f164161b SHA512 2f732c7f9d9b5aa68b775fa08c8836bfb01cd3fe0fee9bd9bf862fecb26a23a58d754a96e723b420663b48b590f24e454e5a1871b6f4dcd4219d3c3e413ade3c
-DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79eaf4637e5f5775151e066cc92a92f8993a6bc047ddc35adbb77745e6070797111d78add690ee7bb54cc8179cf2f7cfa5 SHA512 9ed426ddae7af343eed01d6ebf2769d654476bb28b095d67394e75feeec8440859aca34f62c9faff81018cf98fe58b731b96f3f7ffeaa459d14e6a3c59ad02e5
-DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
-DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
-DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
-DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
-EBUILD opencv_tests-1.12.1-r1.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
-EBUILD opencv_tests-1.12.2.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
-EBUILD opencv_tests-1.12.3.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
-EBUILD opencv_tests-1.12.4.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
-EBUILD opencv_tests-1.12.5.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
-EBUILD opencv_tests-1.12.7.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
-EBUILD opencv_tests-1.12.8.ebuild 751 BLAKE2B c63cc3f23dc5546cd60ccf055a67cb8203e2963f05c8b4b51b122dd99755ee30d8c477bf1c8fa049e802b8e0df3424afbe340193f171f3cd3a316d424cfffc4b SHA512 ab5a16d3034f13aaf7b8dbb15eee3f686cde42b69617e8ee852fd1cfd1f401a96754ce794b6354b6fe273f1311da20a84d5e00d44b299b377b459dc19e1263c2
-EBUILD opencv_tests-1.13.0.ebuild 751 BLAKE2B c63cc3f23dc5546cd60ccf055a67cb8203e2963f05c8b4b51b122dd99755ee30d8c477bf1c8fa049e802b8e0df3424afbe340193f171f3cd3a316d424cfffc4b SHA512 ab5a16d3034f13aaf7b8dbb15eee3f686cde42b69617e8ee852fd1cfd1f401a96754ce794b6354b6fe273f1311da20a84d5e00d44b299b377b459dc19e1263c2
-EBUILD opencv_tests-9999.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
+EBUILD opencv_tests-1.15.0.ebuild 639 BLAKE2B ecd608406f98d927cc6162721b7c4f5cb0a641510f906908f562a8099065aa7ff09066a0097978038da717e4b27e31460170862e50bede2ca3284efcac919b44 SHA512 246adb64a8b29afcb6dcf0202cd80e86a9b786b23210dcb43823338e2d66d5e7c712313a392ee50e98550273ee93f29521ef2f10c7678b90e2f7a115b135e0b3
+EBUILD opencv_tests-9999.ebuild 639 BLAKE2B ecd608406f98d927cc6162721b7c4f5cb0a641510f906908f562a8099065aa7ff09066a0097978038da717e4b27e31460170862e50bede2ca3284efcac919b44 SHA512 246adb64a8b29afcb6dcf0202cd80e86a9b786b23210dcb43823338e2d66d5e7c712313a392ee50e98550273ee93f29521ef2f10c7678b90e2f7a115b135e0b3
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
deleted file mode 100644
index 6a888f82993b..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.2.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.2.ebuild
deleted file mode 100644
index 6a888f82993b..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.3.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.3.ebuild
deleted file mode 100644
index 6a888f82993b..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.5.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.5.ebuild
deleted file mode 100644
index 96b12009c607..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.7.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.7.ebuild
deleted file mode 100644
index 96b12009c607..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild
deleted file mode 100644
index 83b23217853e..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
deleted file mode 100644
index 83b23217853e..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.4.ebuild b/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
similarity index 79%
rename from dev-ros/opencv_tests/opencv_tests-1.12.4.ebuild
rename to dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
index 96b12009c607..ecaea4660586 100644
--- a/dev-ros/opencv_tests/opencv_tests-1.12.4.ebuild
+++ b/dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/opencv_tests/opencv_tests-9999.ebuild b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
index 6a888f82993b..ecaea4660586 100644
--- a/dev-ros/opencv_tests/opencv_tests-9999.ebuild
+++ b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
 KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/openni2_camera/Manifest b/dev-ros/openni2_camera/Manifest
index 6eccb08b0f2c..6753405f7150 100644
--- a/dev-ros/openni2_camera/Manifest
+++ b/dev-ros/openni2_camera/Manifest
@@ -1,8 +1,4 @@
-DIST openni2_camera-0.3.0.tar.gz 36450 BLAKE2B 3b292a4012371d8020f945828a61dd6757eda0d4df51ad72eb3a7930142f6e9d5821c5c838296fdf8f291c0f4c9c878c1c5878ce2c731a2efc3ba2e47375bcd3 SHA512 0e5737e8ea06fb0c73b2a99905e472f6634f024f5a50de9b94761ae3ca9879cf47a029b1906d01b31cb8081b73292af871eff581aeddb56584951824edd0007c
-DIST openni2_camera-0.4.0.tar.gz 39472 BLAKE2B 9d8944ffe12ac0b6c75039cb6cff5c3026afa565ca30997f4f121e3c0de8298d64ea1b6176a7bcd9cdba8863bf52624207a5c99f11c7d17f0c30bc313a9563c2 SHA512 6c200e7fe9cb440286b2b8afbbc357e7db1eb2ae02d9a97fbd994d4960b356155f91c09bd8cb66757704422c9693c1fe7048c21635f8dca0602158d0795be71e
-DIST openni2_camera-0.4.2.tar.gz 39732 BLAKE2B 1203a298f859c2e29b6ff6e5f4f9261f7bc981566a3df15fbed3f5ec094256adc63ccd82b4961efd87ce1e798f80b7e48553ccccf5ea8c8909f61931a2e2df8d SHA512 5c40d5edf767688726ede4da0e9ed1401da2a50977ed609c6c7e286dcb1bb84f73fd7072a0e044b15e5575d62851d1b025d5facb993de33c6304f12846cdac10
-EBUILD openni2_camera-0.3.0-r1.ebuild 679 BLAKE2B 1b609e9a97f2836ab830d3e97f3f8a6a2c3f0735b14f975370d104587547617f0db2c3896288bdf3c487a0ffee27d4fe4df64e6f3f9efa1aab0a10e4f8811981 SHA512 7a4053931badcc154dae80826a8fbfebdafe18ce660463fa1e72345ef0ed028ede6902777bfa575b2b1d37cb4e676197dd858b2c22a1f8cdc2120c54170f4447
-EBUILD openni2_camera-0.4.0.ebuild 679 BLAKE2B dc18fceea88e2f73fbf9eaaf3e9fbab14064d7004eb4dd3874c9262b48830c2c2ec635cfb26b9e3032b32838d6747451a6afafdb46b25cfea3799855d6e80992 SHA512 876b7948f602672931f8eeabd98cbe7527dbecd54761acdc8664e14ad10fdc7ce8b3a5c14ee7ddf38337082aa5c82945a7e09890650c1a1571d73123bc65ea06
-EBUILD openni2_camera-0.4.2.ebuild 676 BLAKE2B 8a299680aa6489137d149b708dd2a3e9227515e3928e9165e638ebfbe6312ae1dcfd64c64937eee45dfd1e7313dc3008a9b72aeee1e2f01dab4a776ff00bae4f SHA512 d6ffdfe0a8ef5809be0bbd6d1bebb31c64b6c438475a79e1157ec621d5930b3740f581e6c99e6728e80ba3cf6b69b53fddf3e3db5413db5f6394ee42324d4ea5
-EBUILD openni2_camera-9999.ebuild 679 BLAKE2B 1b609e9a97f2836ab830d3e97f3f8a6a2c3f0735b14f975370d104587547617f0db2c3896288bdf3c487a0ffee27d4fe4df64e6f3f9efa1aab0a10e4f8811981 SHA512 7a4053931badcc154dae80826a8fbfebdafe18ce660463fa1e72345ef0ed028ede6902777bfa575b2b1d37cb4e676197dd858b2c22a1f8cdc2120c54170f4447
+DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
+EBUILD openni2_camera-1.4.2.ebuild 649 BLAKE2B fdabfdeb3acbc82e2cce7d491e3a8142d24dd5f018e5da2c6ef61006d8a5f9d2f764443e9182a0700005b280cbe60fc31752a1efba49d49ea9932fa22dfe2690 SHA512 2250ea7c5aaf79db73c4e0aea95e1f15a7f472499fa4c371ac9dd248be79c1400c0dadbc225bf1c447ade84d2d1cf469675c9a7b1f12dd945e2e66157fa40606
+EBUILD openni2_camera-9999.ebuild 649 BLAKE2B fdabfdeb3acbc82e2cce7d491e3a8142d24dd5f018e5da2c6ef61006d8a5f9d2f764443e9182a0700005b280cbe60fc31752a1efba49d49ea9932fa22dfe2690 SHA512 2250ea7c5aaf79db73c4e0aea95e1f15a7f472499fa4c371ac9dd248be79c1400c0dadbc225bf1c447ade84d2d1cf469675c9a7b1f12dd945e2e66157fa40606
 MISC metadata.xml 340 BLAKE2B a66fd18f61874c90197221e853b05c28502cf38118807b51616c9feb0db670945ffe31bd325aa9092dc22c226f214ec2259276c7bc11ee731a694fa200cdfd03 SHA512 c8b9dc967e3e6de3bcae15894d39b3701e4bd223565660284c0b2a41d4b7e475935b9342296644e620b63a8c99098c8bf65363aa4899e7e5de3ad92059a4b064
diff --git a/dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild b/dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild
deleted file mode 100644
index 4c4df556466d..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/camera_info_manager
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/OpenNI2
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild b/dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild
deleted file mode 100644
index 2ec2b60c34db..000000000000
--- a/dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS drivers for the Asus Xtion and Primesense Devices"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/camera_info_manager
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/OpenNI2
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild b/dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
similarity index 86%
rename from dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
rename to dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
index 73dbd592b198..483a6d127c31 100644
--- a/dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -22,8 +21,9 @@ RDEPEND="
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/OpenNI2
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/openni2_camera/openni2_camera-9999.ebuild b/dev-ros/openni2_camera/openni2_camera-9999.ebuild
index 4c4df556466d..483a6d127c31 100644
--- a/dev-ros/openni2_camera/openni2_camera-9999.ebuild
+++ b/dev-ros/openni2_camera/openni2_camera-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 CATKIN_HAS_MESSAGES=yes
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -22,8 +21,9 @@ RDEPEND="
 	dev-ros/nodelet
 	dev-libs/console_bridge:=
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-libs/OpenNI2
 	dev-libs/boost:=[threads]
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/openni2_launch/Manifest b/dev-ros/openni2_launch/Manifest
index 18b57fd39b2d..0736e40c490b 100644
--- a/dev-ros/openni2_launch/Manifest
+++ b/dev-ros/openni2_launch/Manifest
@@ -1,6 +1,4 @@
-DIST openni2_camera-0.4.0.tar.gz 39472 BLAKE2B 9d8944ffe12ac0b6c75039cb6cff5c3026afa565ca30997f4f121e3c0de8298d64ea1b6176a7bcd9cdba8863bf52624207a5c99f11c7d17f0c30bc313a9563c2 SHA512 6c200e7fe9cb440286b2b8afbbc357e7db1eb2ae02d9a97fbd994d4960b356155f91c09bd8cb66757704422c9693c1fe7048c21635f8dca0602158d0795be71e
-DIST openni2_camera-0.4.2.tar.gz 39732 BLAKE2B 1203a298f859c2e29b6ff6e5f4f9261f7bc981566a3df15fbed3f5ec094256adc63ccd82b4961efd87ce1e798f80b7e48553ccccf5ea8c8909f61931a2e2df8d SHA512 5c40d5edf767688726ede4da0e9ed1401da2a50977ed609c6c7e286dcb1bb84f73fd7072a0e044b15e5575d62851d1b025d5facb993de33c6304f12846cdac10
-EBUILD openni2_launch-0.4.0.ebuild 502 BLAKE2B 1697ab43d42574d640ee7e11fc322b23a59cea09744cf3bfa9abdbf5d754789a589c5a7a7ac8434d4d11ed8a2b25f3332fac670d3386447d22347d6c43dfa394 SHA512 8eaca9a985a54e894ca848861f21cf119d17d08b13d43b152a7da009415c30d6b783057ed45c7f0b628d4b46944ad2287a1980635188b609113c02e990f6cc33
-EBUILD openni2_launch-0.4.2.ebuild 558 BLAKE2B 4489104a815e6cb62e006ed962f97d62ea876507ba61e55a99dc34228711773f88ffd15f5aaf53ff3288c255c8762c1e790538696628a054243c9df60d7c5c75 SHA512 c767584883d82df27f63e75a0bf350312369884e20d46131011febc3b2e9aab5f85184bc6ec4e8c4dd6870159def0d45f4e07054243d30d6188d3867f2feadf9
-EBUILD openni2_launch-9999.ebuild 558 BLAKE2B 4489104a815e6cb62e006ed962f97d62ea876507ba61e55a99dc34228711773f88ffd15f5aaf53ff3288c255c8762c1e790538696628a054243c9df60d7c5c75 SHA512 c767584883d82df27f63e75a0bf350312369884e20d46131011febc3b2e9aab5f85184bc6ec4e8c4dd6870159def0d45f4e07054243d30d6188d3867f2feadf9
+DIST openni2_camera-1.4.2.tar.gz 39789 BLAKE2B e20fe380e4832c7c38ed945e3472867ea7546c675677a89eda216bbaa448538b73a7b546e7182dc493520c9cb60b9cbdd9fb1bd1cd82ac75bf4ba3320a1521aa SHA512 b6dde7b55349e4d3a2f06f07e944208c90ab37f9e0b5366d8eefadda37a96f970de81784fa107ba8eb6a9e6636881279f3a2b3e7d60a9ac64eab4b0c9efccdb3
+EBUILD openni2_launch-1.4.2.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
+EBUILD openni2_launch-9999.ebuild 558 BLAKE2B a7999520b80a7acfc5ca55731aa174254522d9d78af34ef134db203341d076f117b98cb1f8a94e487c7047a5bb6330b3544faea142ffa029b48fad7c6010c691 SHA512 66a88ea7c2b75d8a38c1d8a427cef83050cd0a4d75f88e02c02a500905b28d64d59c935c0de0363d7d1df76880f1801d1b29c67818402a1ce65f6e07cbc657b7
 MISC metadata.xml 340 BLAKE2B 666c2530cabfb6d86f6fb1e45072133c9a3826254a42b7713ca3b0506b09adb38be616e281a8e19fab3f6540133a9eee6c9605accbc7b7444715faf38e199b97 SHA512 5fdcf4ac865e7456967ef7e20b7694a7dd04eed9658eab3dbaa1754538a843e499ca1671189d444730b47ff85267d643518c6f1faa708f374fabfeb4d7af7caa
diff --git a/dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild b/dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild
deleted file mode 100644
index 0fe985c1db94..000000000000
--- a/dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Launch files to start the openni2_camera drivers using rgbd_launch"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rgbd_launch
-	dev-ros/depth_image_proc
-	dev-ros/image_proc
-	dev-ros/nodelet
-	dev-ros/openni2_camera
-	dev-ros/tf
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild b/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
similarity index 92%
rename from dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
rename to dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
index 491eb3e16541..227a922039f1 100644
--- a/dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
+++ b/dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/openni2_launch/openni2_launch-9999.ebuild b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
index 491eb3e16541..227a922039f1 100644
--- a/dev-ros/openni2_launch/openni2_launch-9999.ebuild
+++ b/dev-ros/openni2_launch/openni2_launch-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-drivers/openni2_camera"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/openslam_gmapping/Manifest b/dev-ros/openslam_gmapping/Manifest
index 8c8e62e62e9e..fcf0214351dc 100644
--- a/dev-ros/openslam_gmapping/Manifest
+++ b/dev-ros/openslam_gmapping/Manifest
@@ -1,6 +1,4 @@
-DIST openslam_gmapping-0.1.1.tar.gz 96997 BLAKE2B e9ed4ff602d179f321bc6d94f7adfea2aef94933aa98ee207f1c52d3290db6d9f7d79111195580d8b51c89221be6b4307496fe165101f2017102237c314f23a9 SHA512 37d8c343bfb817323f0f74b2db397c34629032699d3e503baa3067d38fe2400caa11cf2dbf40c745a9030ee70bd2d4f19c18d88e01fda162ada9c2075381421e
-DIST openslam_gmapping-0.1.2.tar.gz 97427 BLAKE2B 3e1b0534d783e5205bd199bc572958f00d35769636ebf4860d50fb46c2f7827b1d46f2fe9f289422a514d9c746a6021bfbe222e74d8ce72840425062dd66ef6f SHA512 0932849d9f35a5edf582bdeee17bfeb791b30694553909ba4f54279e1b4fac1af041a5d2f340203cbdb5161155c074c4f74db472bbc4884c10447621be13e1a9
-EBUILD openslam_gmapping-0.1.1.ebuild 350 BLAKE2B ef7dbf38d8d296d1340fca14ea51cf6194aae7c42aa3fdde44b2d40b98387196e2d99881a6e5178ac7a22e5bde82cd311f7370b238c2ce88bfe6de6f5a783176 SHA512 5f339926d4be01a3dfd641be7fe0ce02f41ed505fc8e2ebb4a640447822b9f1c4da475b2fb1b20fafda6f306bf6af770133ee21a661bd64160722c55685c306d
-EBUILD openslam_gmapping-0.1.2.ebuild 350 BLAKE2B ad116d98c3ae1f37219c54377f90d31a408f6cec87184ce42bcf06710ab6b2646eb76f33db0c2ee2f970a39ed63b30769673231599a39a6ec78c416a59334e72 SHA512 6566944250729836dba94da9b539cb33b889b2500ad42609d7abdc87396d93cd3cd05dccd95e6e026d1ea0310611109f4cde6fd1e8cfc105b926cd8b8360e7b2
-EBUILD openslam_gmapping-9999.ebuild 350 BLAKE2B ef7dbf38d8d296d1340fca14ea51cf6194aae7c42aa3fdde44b2d40b98387196e2d99881a6e5178ac7a22e5bde82cd311f7370b238c2ce88bfe6de6f5a783176 SHA512 5f339926d4be01a3dfd641be7fe0ce02f41ed505fc8e2ebb4a640447822b9f1c4da475b2fb1b20fafda6f306bf6af770133ee21a661bd64160722c55685c306d
+DIST openslam_gmapping-0.2.1.tar.gz 104933 BLAKE2B fbd31e66849ee28b63ac24ec059ebca368f31c8796b229f59fda56af7aceec12d45673651ad05c690da268e8a0fc7ae581b7911ea6e773af833c6374fb83843e SHA512 bb3b1a634ded258f526dd65b1b70c7a0f284810eedb5cfafbc2012a4997793c1e7aeacdca2afeea4ddec13cadb445b994cac07cb0763117c5fa478b3def1cbe6
+EBUILD openslam_gmapping-0.2.1.ebuild 347 BLAKE2B 44a24715b9bf4de958cd1280e2971ae23735f01539e9b7aa69b85fad56276332f40e588c344ea28c4c9a410d34461f17aa045deb5432282054969e5fb22b12a2 SHA512 db0d7d6dcf78291e8670f7a174606f36268f528a1be9788cbdc8b79fe73683ad8c501fc606ec138707fe82ec8ebe3156a18c12dfeb664fd5016b099ef0f4e632
+EBUILD openslam_gmapping-9999.ebuild 347 BLAKE2B 44a24715b9bf4de958cd1280e2971ae23735f01539e9b7aa69b85fad56276332f40e588c344ea28c4c9a410d34461f17aa045deb5432282054969e5fb22b12a2 SHA512 db0d7d6dcf78291e8670f7a174606f36268f528a1be9788cbdc8b79fe73683ad8c501fc606ec138707fe82ec8ebe3156a18c12dfeb664fd5016b099ef0f4e632
 MISC metadata.xml 346 BLAKE2B c0c8566bd6db8866d91cd1bbdaec66a954eed369e9601a222d5604947d12caca4703b5460e872b9d07cde549c338179b52b391d05172915221d18d49aafdee28 SHA512 74324f6ba9d2217018fb1194b620e3d48c07d8a89654b20c9e08f7aae3c3820fc9a624f2e9c12239ab0a951792270c08b04edae6f8cda4c3edc6c720aa442c22
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild
deleted file mode 100644
index 596615e2a06f..000000000000
--- a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/openslam_gmapping"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-ified version of gmapping SLAM"
-LICENSE="CC-BY-NC-SA-2.5"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
similarity index 86%
rename from dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild
rename to dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
index c65802afc06a..972294be7c44 100644
--- a/dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild
+++ b/dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/openslam_gmapping"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild b/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
index c65802afc06a..972294be7c44 100644
--- a/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
+++ b/dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/openslam_gmapping"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/dev-ros/pcl_conversions/Manifest b/dev-ros/pcl_conversions/Manifest
index a6c5d55fa250..53cd7f16ca8a 100644
--- a/dev-ros/pcl_conversions/Manifest
+++ b/dev-ros/pcl_conversions/Manifest
@@ -1,4 +1,4 @@
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B d8b3c17adfd1c5d19e1ea556dddeb049cbb4dcd58626d2bbad06a6d69002f665564b4839435334c418e6a0e71df2e45efbedb83acb0c91ca964939de01260cd6 SHA512 e5196ab80aa43164808e6dae8dffc2fd9ad88440a237e34daa1affc383ca2655e8c164b4f82034abbf2c256590d4e2091af52e327fe0f1a1de7e202b01bd8bf6
-EBUILD pcl_conversions-9999.ebuild 605 BLAKE2B 874aa3d03575a1d1496cf8d2ae4b66e23c9ce5c419cac0fe73e1514e39adc460bf81d331331f290d5b3a9caaae31fd505b080b5be4d94814b4057fc5797c129c SHA512 57f71a5744712cbeecb98dc3b55cec7731d5f516c9db9596b48757948d28c37bd43db769921e7217f48453c61df5ebd60c0479e7f49bf1fc2fb714daff9ecd70
+EBUILD pcl_conversions-1.7.1.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
+EBUILD pcl_conversions-9999.ebuild 602 BLAKE2B 488cfb2ca76f22ae02c751d2b4936cedc2cb0e5f48189e2cb08df5039459e52b3e77cd642db191271cabf7cd6b38033ee8bb332be35b98c6b697c7e2d1504ce9 SHA512 e04e58d53feb53a00ec9628ce4bad4911ff3095c20394807bc7af4357b40903b0be52e68e759067431eb2a08706f49cf4b2779246c1030b705d587150d47bee6
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild b/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
index 2d924e7a3445..2aa2de1919aa 100644
--- a/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
+++ b/dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -16,10 +16,10 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	sci-libs/pcl:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
index 79f1ab5d1922..2aa2de1919aa 100644
--- a/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
+++ b/dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 ROS_SUBDIR=${PN}
 KEYWORDS="~amd64 ~arm"
@@ -16,10 +16,10 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	sci-libs/pcl:=
+"
+DEPEND="${RDEPEND}
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/pcl_msgs/Manifest b/dev-ros/pcl_msgs/Manifest
index 931ee0b3ea94..2aa310b108b8 100644
--- a/dev-ros/pcl_msgs/Manifest
+++ b/dev-ros/pcl_msgs/Manifest
@@ -1,4 +1,4 @@
-DIST pcl_msgs-0.2.0.tar.gz 1596 BLAKE2B 2cf1e05f5006bcf0fe6d7b763f62a61c494b4f5404122493a7728bd886bf6538a1fad5f8a627b2ba7fdd8c5d03e9791d1de5a3beb13bf21cedf05118f12b1c9e SHA512 e132ad068683829d4f73b451584ce7e67a75b8ded9397b50c6bd92f5cb8a862303e766b5d3e0d7c1430e8241993166493167e2c3d2010a600dfbb66db0e87eae
-EBUILD pcl_msgs-0.2.0.ebuild 473 BLAKE2B 5fbbf9c4a26f792809a7bb34ca098c74e65836fc53815d1b167db2810d7acc43e8a6da260937adcda75a5ff4c051153694ababd794bef07505cf7c7913543f12 SHA512 b7703550a2db05a4e956d3c982bd581317fdf8c29e65b3d2f747d4cac68ed9bd7a1e705b85e03a6efb671b3d8731f289813a11614e981a967c844e5ceff607bb
-EBUILD pcl_msgs-9999.ebuild 473 BLAKE2B 5fbbf9c4a26f792809a7bb34ca098c74e65836fc53815d1b167db2810d7acc43e8a6da260937adcda75a5ff4c051153694ababd794bef07505cf7c7913543f12 SHA512 b7703550a2db05a4e956d3c982bd581317fdf8c29e65b3d2f747d4cac68ed9bd7a1e705b85e03a6efb671b3d8731f289813a11614e981a967c844e5ceff607bb
+DIST pcl_msgs-0.3.0.tar.gz 1674 BLAKE2B 4700014325557987dd2ac18ce24f5b17e92861dc0030ef65d2511609d90d1b3ad6f7dab56d173fb95b3a713ecca7e8d45a5e5882b0c606ece6988a0a4b61e7b5 SHA512 30a0af7e5447e29754168b6d9358bd8ba30ee35e156d5b112c5562c98e30915f5965d4791831334b57222864b5d3de6d77d67108222f87279a76666dd96caedb
+EBUILD pcl_msgs-0.3.0.ebuild 433 BLAKE2B b5d453cb821bf605416d0daa76e7cad99525e069629b535f73196f3d6a4e24eda28c9ab7cbf55498d01e32d1a43e4a575c29175b0a194053c1da777b167e8fc1 SHA512 f7f213d0a7fcf7683e222edf1e949e76646a52bffa3745e2da051685d66b222007372717f9182d7b240386c0bb8fe6729ade94b7bbc6ecffb36d3edd117bfc04
+EBUILD pcl_msgs-9999.ebuild 433 BLAKE2B b5d453cb821bf605416d0daa76e7cad99525e069629b535f73196f3d6a4e24eda28c9ab7cbf55498d01e32d1a43e4a575c29175b0a194053c1da777b167e8fc1 SHA512 f7f213d0a7fcf7683e222edf1e949e76646a52bffa3745e2da051685d66b222007372717f9182d7b240386c0bb8fe6729ade94b7bbc6ecffb36d3edd117bfc04
 MISC metadata.xml 337 BLAKE2B 5abc57673f2e3d509979857bccb367754f28e09b0028e4288d2a9952faacc5b296cffd83a8709bf39215eb46a97d9d030f04f88b4d9f62e6e09d6c0ca139342c SHA512 3620fefbf7715755498f9e14ccb1778cc657e73a12fefd354946e38d9b31b1714ab3b3240fe0796d8b0a4fdc8e9483a9ab8f1f38273078aa2798c87d7d4145e8
diff --git a/dev-ros/pcl_msgs/pcl_msgs-0.2.0.ebuild b/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
similarity index 90%
rename from dev-ros/pcl_msgs/pcl_msgs-0.2.0.ebuild
rename to dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
index ac478e34fe4c..b19fe487df07 100644
--- a/dev-ros/pcl_msgs/pcl_msgs-0.2.0.ebuild
+++ b/dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros-perception/pcl_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild b/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
index ac478e34fe4c..b19fe487df07 100644
--- a/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
+++ b/dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 CATKIN_HAS_MESSAGES=yes
 ROS_REPO_URI="https://github.com/ros-perception/pcl_msgs"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/sensor_msgs dev-ros/std_msgs"
 
 inherit ros-catkin
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index 99bc2088146a..22601e7fbb46 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,5 @@
-AUX pcl111.patch 39097 BLAKE2B c9612c7a10f9bf92d4aa3b1d053035f13c682ecdd3cabfdb23cc0152a31fa7b1da0f9d0e18a22242a76ab7e8601b0fb3c52d300baf3839e84c6b127c58daf39b SHA512 fe8330ca9c1991a274310918a0f575cbb5b83e48969cb8cb285032f7a5e8d571c9dae131837aeaf1edbec18baaedf27ece82e428d4d960d73f5b0aa86e5861f3
+AUX pcl111.patch 38649 BLAKE2B 8895cde34c315ba81f522d55fd6b692725ded70f7dbfd38d7e502b2303dd48041cd1e0bef1a685f204d82c9d42f76f3bf4b957c2859a97b761ee4b2790224ff0 SHA512 b745640d86c9b01a0c7d2777ac8c6a8ce81c9544ae7f74ea0aff7d31823c66eca47ac82ad150980b009d702113412501deed7c700d55a44d2307f4dce444be03
 DIST perception_pcl-1.7.1.tar.gz 80899 BLAKE2B 2898d88efa1b27a27eea06fb949254127cf92eb2c788ae914a40f0000fa8204202c4823c69ab5fa9bd83c2426289a4897a56fab9ec3df61e3ab0a184fc068c41 SHA512 97e9240c660adde84976860ed9c94cf8c127615526641dbcdb729ffbda4cda4dfb9f351cc2d471988732ad61e6508bfa5906c8b4503c31172e7f4e4dfc31260e
-EBUILD pcl_ros-1.7.1.ebuild 954 BLAKE2B baa8161e13c24fb884917b21f9d6d5cc80f69d345bdb6903a1775f7bc4f0eb49d1675381ff86eb9d5595005496d829f273f09f1422839958e6ad4c5963277c86 SHA512 ff793a450e3b1e9891a433291b9ca2957a18e17f63bc7a9d9b0ec818a8af039cc902148d6cb172d1f7450673ebbd72dabd03533e7be134b2abb4cd22cee6eccc
-EBUILD pcl_ros-9999.ebuild 915 BLAKE2B e15107eeae1fa3524c5f217a4bb58d07e90ff54a04557081d3792dfdd98d8f508175b43b11ef17da4f59946c64c627b103cdebaad1b79b4bb8f32be2867015c7 SHA512 8e3fa2c8ddb14638e2995b2bc857fb4dc8ffa0342f45be94ce59fc1887fed001fc1ce89792d4094a07a1553a43d73d38cb99e65c27d27cdb9fa4e91b2fd0700c
+EBUILD pcl_ros-1.7.1.ebuild 955 BLAKE2B f775bb216eb89372ba58db63bbe79991d986efc94d30a5ff9cadd9a51fbae359df1299101fa3a75df4669593ba937739b614bbe592e631c420735fe5173c48c7 SHA512 065d4ae237f892587e50bb168905a7fdf5a71c6bd1ad80bf6dd9ad6c3bb84553fb90872be6d5d722162743a69a12671ebd1ac1da79aacbd68feffbc266d15344
+EBUILD pcl_ros-9999.ebuild 916 BLAKE2B e660cbf351c913eb5c16aeeef5ac7a2bf69686fb3fd55455dda2661f082abc1cd1cf65636d79557433b0788d0c36435048f6c881fafefe59f0f227c340a1696b SHA512 ef2d79a7c1b057c7922579a3b0b14cd803823c1ea3af806608c82e0fdba303008203bfeffb4fa1f28975c39d6d873a6b532bcfafd52e942308f922e5ea8e2b98
 MISC metadata.xml 343 BLAKE2B c3702e4ed6c355b81fed82f2cf5bcc1ad37082d134130f55ff5a7b4ce3eba79e758ac6dae129b0e76dc9f0171caa52d04a4b428a286458a4a8052a054c6b5d0d SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585
diff --git a/dev-ros/pcl_ros/files/pcl111.patch b/dev-ros/pcl_ros/files/pcl111.patch
index 8f3433ffccaa..839e87dcf0a1 100644
--- a/dev-ros/pcl_ros/files/pcl111.patch
+++ b/dev-ros/pcl_ros/files/pcl111.patch
@@ -45,8 +45,8 @@ Subject: [PATCH] Changes in preparation for PCL 1.11 (#273)
 
 diff --git a/pcl_ros/include/pcl_ros/features/feature.h b/pcl_ros/include/pcl_ros/features/feature.h
 index 26bcfe6b..098c20bc 100644
---- a/pcl_ros/include/pcl_ros/features/feature.h
-+++ b/pcl_ros/include/pcl_ros/features/feature.h
+--- a/include/pcl_ros/features/feature.h
++++ b/include/pcl_ros/features/feature.h
 @@ -69,11 +69,11 @@ namespace pcl_ros
        typedef pcl::KdTree<pcl::PointXYZ>::Ptr KdTreePtr;
  
@@ -85,8 +85,8 @@ index 26bcfe6b..098c20bc 100644
  
 diff --git a/pcl_ros/include/pcl_ros/filters/filter.h b/pcl_ros/include/pcl_ros/filters/filter.h
 index 94c1e883..b4e79538 100644
---- a/pcl_ros/include/pcl_ros/filters/filter.h
-+++ b/pcl_ros/include/pcl_ros/filters/filter.h
+--- a/include/pcl_ros/filters/filter.h
++++ b/include/pcl_ros/filters/filter.h
 @@ -58,8 +58,8 @@ namespace pcl_ros
      public:
        typedef sensor_msgs::PointCloud2 PointCloud2;
@@ -100,8 +100,8 @@ index 94c1e883..b4e79538 100644
  
 diff --git a/pcl_ros/include/pcl_ros/pcl_nodelet.h b/pcl_ros/include/pcl_ros/pcl_nodelet.h
 index f12e62d7..279d6730 100644
---- a/pcl_ros/include/pcl_ros/pcl_nodelet.h
-+++ b/pcl_ros/include/pcl_ros/pcl_nodelet.h
+--- a/include/pcl_ros/pcl_nodelet.h
++++ b/include/pcl_ros/pcl_nodelet.h
 @@ -48,6 +48,7 @@
  // PCL includes
  #include <pcl_msgs/PointIndices.h>
@@ -134,8 +134,8 @@ index f12e62d7..279d6730 100644
        PCLNodelet () : use_indices_ (false), latched_indices_ (false),
 diff --git a/pcl_ros/include/pcl_ros/point_cloud.h b/pcl_ros/include/pcl_ros/point_cloud.h
 index bbf30ad1..93df7365 100644
---- a/pcl_ros/include/pcl_ros/point_cloud.h
-+++ b/pcl_ros/include/pcl_ros/point_cloud.h
+--- a/include/pcl_ros/point_cloud.h
++++ b/include/pcl_ros/point_cloud.h
 @@ -270,4 +270,125 @@ namespace ros
  
  } // namespace ros
@@ -264,8 +264,8 @@ index bbf30ad1..93df7365 100644
  #endif
 diff --git a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
 index 7134f905..13b85316 100644
---- a/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
+--- a/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
++++ b/include/pcl_ros/segmentation/extract_polygonal_prism_data.h
 @@ -64,8 +64,8 @@ namespace pcl_ros
    class ExtractPolygonalPrismData : public PCLNodelet
    {
@@ -279,8 +279,8 @@ index 7134f905..13b85316 100644
         /** \brief The output PointIndices publisher. */
 diff --git a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
 index af2c9126..9243e363 100644
---- a/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/sac_segmentation.h
+--- a/include/pcl_ros/segmentation/sac_segmentation.h
++++ b/include/pcl_ros/segmentation/sac_segmentation.h
 @@ -61,8 +61,8 @@ namespace pcl_ros
    class SACSegmentation : public PCLNodelet
    {
@@ -311,8 +311,8 @@ index af2c9126..9243e363 100644
        /** \brief Set the input TF frame the data should be transformed into before processing, if input.header.frame_id is different.
 diff --git a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
 index 4914bc86..da767ab3 100644
---- a/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
-+++ b/pcl_ros/include/pcl_ros/segmentation/segment_differences.h
+--- a/include/pcl_ros/segmentation/segment_differences.h
++++ b/include/pcl_ros/segmentation/segment_differences.h
 @@ -60,8 +60,8 @@ namespace pcl_ros
    class SegmentDifferences : public PCLNodelet
    {
@@ -326,8 +326,8 @@ index 4914bc86..da767ab3 100644
        /** \brief Empty constructor. */
 diff --git a/pcl_ros/include/pcl_ros/surface/convex_hull.h b/pcl_ros/include/pcl_ros/surface/convex_hull.h
 index e419c0f8..54a1f367 100644
---- a/pcl_ros/include/pcl_ros/surface/convex_hull.h
-+++ b/pcl_ros/include/pcl_ros/surface/convex_hull.h
+--- a/include/pcl_ros/surface/convex_hull.h
++++ b/include/pcl_ros/surface/convex_hull.h
 @@ -53,8 +53,8 @@ namespace pcl_ros
    class ConvexHull2D : public PCLNodelet
    {
@@ -341,8 +341,8 @@ index e419c0f8..54a1f367 100644
        /** \brief Nodelet initialization routine. */
 diff --git a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
 index b909edf8..e90f562a 100644
---- a/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
-+++ b/pcl_ros/include/pcl_ros/surface/moving_least_squares.h
+--- a/include/pcl_ros/surface/moving_least_squares.h
++++ b/include/pcl_ros/surface/moving_least_squares.h
 @@ -62,8 +62,8 @@ namespace pcl_ros
      typedef pcl::PointNormal NormalOut;
  
@@ -356,8 +356,8 @@ index b909edf8..e90f562a 100644
      typedef pcl::KdTree<PointIn> KdTree;
 diff --git a/pcl_ros/src/pcl_ros/features/boundary.cpp b/pcl_ros/src/pcl_ros/features/boundary.cpp
 index 9334641a..26ee07c1 100644
---- a/pcl_ros/src/pcl_ros/features/boundary.cpp
-+++ b/pcl_ros/src/pcl_ros/features/boundary.cpp
+--- a/src/pcl_ros/features/boundary.cpp
++++ b/src/pcl_ros/features/boundary.cpp
 @@ -43,7 +43,7 @@ pcl_ros::BoundaryEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -391,8 +391,8 @@ index 9334641a..26ee07c1 100644
  typedef pcl_ros::BoundaryEstimation BoundaryEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/fpfh.cpp b/pcl_ros/src/pcl_ros/features/fpfh.cpp
 index 3f698aad..53be549c 100644
---- a/pcl_ros/src/pcl_ros/features/fpfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/fpfh.cpp
+--- a/src/pcl_ros/features/fpfh.cpp
++++ b/src/pcl_ros/features/fpfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::FPFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -427,8 +427,8 @@ index 3f698aad..53be549c 100644
  typedef pcl_ros::FPFHEstimation FPFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
 index 58dd911f..e4adcabb 100644
---- a/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/fpfh_omp.cpp
+--- a/src/pcl_ros/features/fpfh_omp.cpp
++++ b/src/pcl_ros/features/fpfh_omp.cpp
 @@ -43,7 +43,7 @@ pcl_ros::FPFHEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -463,8 +463,8 @@ index 58dd911f..e4adcabb 100644
  typedef pcl_ros::FPFHEstimationOMP FPFHEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
 index d0ec3441..a6e2249a 100644
---- a/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
-+++ b/pcl_ros/src/pcl_ros/features/moment_invariants.cpp
+--- a/src/pcl_ros/features/moment_invariants.cpp
++++ b/src/pcl_ros/features/moment_invariants.cpp
 @@ -43,7 +43,7 @@ pcl_ros::MomentInvariantsEstimation::emptyPublish (const PointCloudInConstPtr &c
  {
    PointCloudOut output;
@@ -497,8 +497,8 @@ index d0ec3441..a6e2249a 100644
  typedef pcl_ros::MomentInvariantsEstimation MomentInvariantsEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d.cpp b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
 index 9e700f78..042186a9 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d.cpp
+--- a/src/pcl_ros/features/normal_3d.cpp
++++ b/src/pcl_ros/features/normal_3d.cpp
 @@ -43,7 +43,7 @@ pcl_ros::NormalEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -531,8 +531,8 @@ index 9e700f78..042186a9 100644
  typedef pcl_ros::NormalEstimation NormalEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
 index a741c052..3e92d2f2 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d_omp.cpp
+--- a/src/pcl_ros/features/normal_3d_omp.cpp
++++ b/src/pcl_ros/features/normal_3d_omp.cpp
 @@ -43,7 +43,7 @@ pcl_ros::NormalEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -565,8 +565,8 @@ index a741c052..3e92d2f2 100644
  typedef pcl_ros::NormalEstimationOMP NormalEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
 index a4a8581e..680a4a02 100644
---- a/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
-+++ b/pcl_ros/src/pcl_ros/features/normal_3d_tbb.cpp
+--- a/src/pcl_ros/features/normal_3d_tbb.cpp
++++ b/src/pcl_ros/features/normal_3d_tbb.cpp
 @@ -45,7 +45,7 @@ pcl_ros::NormalEstimationTBB::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloud output;
@@ -587,8 +587,8 @@ index a4a8581e..680a4a02 100644
  typedef pcl_ros::NormalEstimationTBB NormalEstimationTBB;
 diff --git a/pcl_ros/src/pcl_ros/features/pfh.cpp b/pcl_ros/src/pcl_ros/features/pfh.cpp
 index 38b4d19c..dd8409e2 100644
---- a/pcl_ros/src/pcl_ros/features/pfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/pfh.cpp
+--- a/src/pcl_ros/features/pfh.cpp
++++ b/src/pcl_ros/features/pfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::PFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -623,8 +623,8 @@ index 38b4d19c..dd8409e2 100644
  typedef pcl_ros::PFHEstimation PFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
 index 113124dc..501d686e 100644
---- a/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
-+++ b/pcl_ros/src/pcl_ros/features/principal_curvatures.cpp
+--- a/src/pcl_ros/features/principal_curvatures.cpp
++++ b/src/pcl_ros/features/principal_curvatures.cpp
 @@ -43,7 +43,7 @@ pcl_ros::PrincipalCurvaturesEstimation::emptyPublish (const PointCloudInConstPtr
  {
    PointCloudOut output;
@@ -659,8 +659,8 @@ index 113124dc..501d686e 100644
  typedef pcl_ros::PrincipalCurvaturesEstimation PrincipalCurvaturesEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/shot.cpp b/pcl_ros/src/pcl_ros/features/shot.cpp
 index d051ab0f..ed6ba44b 100644
---- a/pcl_ros/src/pcl_ros/features/shot.cpp
-+++ b/pcl_ros/src/pcl_ros/features/shot.cpp
+--- a/src/pcl_ros/features/shot.cpp
++++ b/src/pcl_ros/features/shot.cpp
 @@ -42,7 +42,7 @@ pcl_ros::SHOTEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -695,8 +695,8 @@ index d051ab0f..ed6ba44b 100644
  typedef pcl_ros::SHOTEstimation SHOTEstimation;
 diff --git a/pcl_ros/src/pcl_ros/features/shot_omp.cpp b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
 index 1ac1b065..4563f123 100644
---- a/pcl_ros/src/pcl_ros/features/shot_omp.cpp
-+++ b/pcl_ros/src/pcl_ros/features/shot_omp.cpp
+--- a/src/pcl_ros/features/shot_omp.cpp
++++ b/src/pcl_ros/features/shot_omp.cpp
 @@ -42,7 +42,7 @@ pcl_ros::SHOTEstimationOMP::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -731,8 +731,8 @@ index 1ac1b065..4563f123 100644
  typedef pcl_ros::SHOTEstimationOMP SHOTEstimationOMP;
 diff --git a/pcl_ros/src/pcl_ros/features/vfh.cpp b/pcl_ros/src/pcl_ros/features/vfh.cpp
 index 9d0fe361..ece448fd 100644
---- a/pcl_ros/src/pcl_ros/features/vfh.cpp
-+++ b/pcl_ros/src/pcl_ros/features/vfh.cpp
+--- a/src/pcl_ros/features/vfh.cpp
++++ b/src/pcl_ros/features/vfh.cpp
 @@ -43,7 +43,7 @@ pcl_ros::VFHEstimation::emptyPublish (const PointCloudInConstPtr &cloud)
  {
    PointCloudOut output;
@@ -767,8 +767,8 @@ index 9d0fe361..ece448fd 100644
  typedef pcl_ros::VFHEstimation VFHEstimation;
 diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
 index 17adec46..5599b408 100644
---- a/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/extract_clusters.cpp
+--- a/src/pcl_ros/segmentation/extract_clusters.cpp
++++ b/src/pcl_ros/segmentation/extract_clusters.cpp
 @@ -202,7 +202,7 @@ pcl_ros::EuclideanClusterExtraction::input_indices_callback (
    if (indices)
      indices_ptr.reset (new std::vector<int> (indices->indices));
@@ -789,8 +789,8 @@ index 17adec46..5599b408 100644
      }
 diff --git a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
 index 0185bfbe..ff823b19 100644
---- a/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
+--- a/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
++++ b/src/pcl_ros/segmentation/extract_polygonal_prism_data.cpp
 @@ -189,16 +189,16 @@ pcl_ros::ExtractPolygonalPrismData::input_hull_indices_callback (
        pub_output_.publish (inliers);
        return;
@@ -813,8 +813,8 @@ index 0185bfbe..ff823b19 100644
    // Final check if the data is empty (remember that indices are set to the size of the data -- if indices* = NULL)
 diff --git a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
 index b73dd3fd..bc7b97e7 100644
---- a/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/sac_segmentation.cpp
+--- a/src/pcl_ros/segmentation/sac_segmentation.cpp
++++ b/src/pcl_ros/segmentation/sac_segmentation.cpp
 @@ -324,7 +324,7 @@ pcl_ros::SACSegmentation::input_indices_callback (const PointCloudConstPtr &clou
    if (indices && !indices->header.frame_id.empty ())
      indices_ptr.reset (new std::vector<int> (indices->indices));
@@ -837,8 +837,8 @@ index b73dd3fd..bc7b97e7 100644
    if (indices && !indices->header.frame_id.empty ())
 diff --git a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
 index 4c934152..e3979549 100644
---- a/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
-+++ b/pcl_ros/src/pcl_ros/segmentation/segment_differences.cpp
+--- a/src/pcl_ros/segmentation/segment_differences.cpp
++++ b/src/pcl_ros/segmentation/segment_differences.cpp
 @@ -115,7 +115,7 @@ pcl_ros::SegmentDifferences::input_target_callback (const PointCloudConstPtr &cl
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
      PointCloud output;
@@ -867,8 +867,8 @@ index 4c934152..e3979549 100644
  }
 diff --git a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
 index 4b7eeaf5..75903889 100644
---- a/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
-+++ b/pcl_ros/src/pcl_ros/surface/convex_hull.cpp
+--- a/src/pcl_ros/surface/convex_hull.cpp
++++ b/src/pcl_ros/surface/convex_hull.cpp
 @@ -121,7 +121,7 @@ void
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
      // Publish an empty message
@@ -907,8 +907,8 @@ index 4b7eeaf5..75903889 100644
  typedef pcl_ros::ConvexHull2D ConvexHull2D;
 diff --git a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
 index b9a01e64..99e5d481 100644
---- a/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
-+++ b/pcl_ros/src/pcl_ros/surface/moving_least_squares.cpp
+--- a/src/pcl_ros/surface/moving_least_squares.cpp
++++ b/src/pcl_ros/surface/moving_least_squares.cpp
 @@ -141,7 +141,7 @@ pcl_ros::MovingLeastSquares::input_indices_callback (const PointCloudInConstPtr
    {
      NODELET_ERROR ("[%s::input_indices_callback] Invalid input!", getName ().c_str ());
@@ -950,8 +950,8 @@ index b9a01e64..99e5d481 100644
  //////////////////////////////////////////////////////////////////////////////////////////////
 diff --git a/pcl_ros/tools/pointcloud_to_pcd.cpp b/pcl_ros/tools/pointcloud_to_pcd.cpp
 index 484113da..fb149b46 100644
---- a/pcl_ros/tools/pointcloud_to_pcd.cpp
-+++ b/pcl_ros/tools/pointcloud_to_pcd.cpp
+--- a/tools/pointcloud_to_pcd.cpp
++++ b/tools/pointcloud_to_pcd.cpp
 @@ -78,7 +78,7 @@ class PointCloudToPCD
      ////////////////////////////////////////////////////////////////////////////////
      // Callback
diff --git a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
index 0ffd456d66af..6de77f715380 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -32,9 +32,10 @@ RDEPEND="
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
 	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/pcl111.patch" )
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index 2101a7b6837e..8228065d2bc6 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/perception_pcl"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
@@ -32,8 +32,9 @@ RDEPEND="
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
 	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 1e2c20f515c0..7ebc5389a824 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,7 +1,5 @@
 AUX catkin_prefix_path2.patch 678 BLAKE2B c494700f8d2cfce884b65ef87963cbf414dc4af1a9c9390978e7f458ad7f93b28c54bcd9831ff3edf4d6a421c4ec9ad1859bafff5f8ed209662ea1d14a70c299 SHA512 3b91fac26a2e48087fc70a773f5416e6cc3f7758adcddea6d50ba97a2d1ff8ae2f14fd5b74ba043a5546a8809def8b2154c70a97b10c451ba3773a82eda67100
-DIST pluginlib-1.12.0.tar.gz 20298 BLAKE2B 9d6e5adb6bd64f02d237fa1992402cb016266071c0fa0447709880f90550f36f9e280163a3e054594235d0102f7fb22f4b98a56216b0db9ebaa200b99d018570 SHA512 fcd51908c6c7223bbe50eb43733ba6d00e11419b26d2b9a05aaaf6498020fcd44bacc19313c3a4dd7524bf69d4f54aec27e05b1f88ee578191484c53c1e3f767
-DIST pluginlib-1.12.1.tar.gz 19619 BLAKE2B e91fb15b4857fae10012a71df606f5040d5a62bdee596695c873808790eea02cd380eedda6c438388264003d7ac930ebc2c649a421411580dd095365c93d3c8e SHA512 1a15cd934c4f93fecf32d7d3cab1ee6caae61d59aa65d1f796ab2ba63d5204a6fe28744c28eac80d304bd802b184afe79ead621b3c370c6d3526a944c144d724
-EBUILD pluginlib-1.12.0-r1.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
-EBUILD pluginlib-1.12.1.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
-EBUILD pluginlib-9999.ebuild 626 BLAKE2B f58ae902b345d142a549829716a35d7ff30707771d69397a06951ce597fc4cc90f57f28957a2a9f940cdea119376c97c5f0bd7636bcdf3ccbb3017f41253c2a9 SHA512 cba852d0350d921b0b7e746fe2d5b3be495bf1e64f288c115f4eba7549d52d80c729cc2f566d2df56e187fa7e1cf4fca128eb4a5258685adfd7487bf961ed6d1
+DIST pluginlib-1.13.0.tar.gz 20124 BLAKE2B d2c2c643345e3b76bc580e413538af3ddb49ffe00d9d14ee6ad4dfb3d930ca70bad12ef232c831474238050f4b934c0ca5accded800b8c719c006c01e3c7ac00 SHA512 69566fad8aad92cf1d481117e5beb46c6033538ea08db0487e10766c40e89510d6a58e817f52c0bdce2946813272f2f2e72145e949647e24465f1e13995cf85f
+EBUILD pluginlib-1.13.0.ebuild 611 BLAKE2B c63579e54b996a9107142a240fc7cacae74c7a222ad18b22a096a9c5473ef82ca414d1d7266c69b3ff59302726220af921feb6819d2225942d7ed9ebf1ea5ab6 SHA512 cbc4ef5efbb9b01e806a42e2e9eef030063bd5684d1b7568a697adc74c436f54e8032158ab2a22471eda9ab67342ca2d4226ee72dfbe72e152dfbd489055d9ab
+EBUILD pluginlib-9999.ebuild 611 BLAKE2B c63579e54b996a9107142a240fc7cacae74c7a222ad18b22a096a9c5473ef82ca414d1d7266c69b3ff59302726220af921feb6819d2225942d7ed9ebf1ea5ab6 SHA512 cbc4ef5efbb9b01e806a42e2e9eef030063bd5684d1b7568a697adc74c436f54e8032158ab2a22471eda9ab67342ca2d4226ee72dfbe72e152dfbd489055d9ab
 MISC metadata.xml 327 BLAKE2B f94cb82ca7e89f9c45d423a4b56a573d7d220a5bf218838163659dc027554338b845539ae4090df944e0053ce3e0264c0323a442732619147116a583926fc405 SHA512 cf53258133948a2b0d201af3f0d439f5dcfc9c43691ae4d2b175a70258dd26ffd0fd99511aa02df57cfafb8fc4a1a8185759de0b23f7a1496a227f706900b7a2
diff --git a/dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild b/dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild
deleted file mode 100644
index 8b802f6e3618..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR="${PN}"
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5:=
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-1.12.1.ebuild b/dev-ros/pluginlib/pluginlib-1.13.0.ebuild
similarity index 81%
rename from dev-ros/pluginlib/pluginlib-1.12.1.ebuild
rename to dev-ros/pluginlib/pluginlib-1.13.0.ebuild
index 8b802f6e3618..e21d6c7ad77a 100644
--- a/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.13.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/pluginlib"
 KEYWORDS="~amd64 ~arm"
@@ -10,7 +10,7 @@ ROS_SUBDIR="${PN}"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
+DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/pluginlib/pluginlib-9999.ebuild b/dev-ros/pluginlib/pluginlib-9999.ebuild
index 8b802f6e3618..e21d6c7ad77a 100644
--- a/dev-ros/pluginlib/pluginlib-9999.ebuild
+++ b/dev-ros/pluginlib/pluginlib-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/pluginlib"
 KEYWORDS="~amd64 ~arm"
@@ -10,7 +10,7 @@ ROS_SUBDIR="${PN}"
 
 inherit ros-catkin
 
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
+DESCRIPTION="Tools for writing and dynamically loading plugins using the ROS infrastructure"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/pointcloud_to_laserscan/Manifest b/dev-ros/pointcloud_to_laserscan/Manifest
index d15b16ee2218..5ab76e9374d9 100644
--- a/dev-ros/pointcloud_to_laserscan/Manifest
+++ b/dev-ros/pointcloud_to_laserscan/Manifest
@@ -1,4 +1,4 @@
-DIST pointcloud_to_laserscan-1.4.0.tar.gz 6502 BLAKE2B 02614ce3e046f4b6c828df7121dcd5a2d033e8fefa979a8541127684d5ea6bb40d74412ea9c1ccffc934aa7172343968f75198f444b2ca38391318f584e40901 SHA512 f54d65edc4eda2e97d75ed26b1d374a669f188c4ef2426730312ae479e051a0834abb782cdd00febbd8dc97cb6a0723b6a735d2cbf07e2f8260ad0e54e79376f
-EBUILD pointcloud_to_laserscan-1.4.0-r1.ebuild 567 BLAKE2B 3943a2ee24ad44c920abbd54409a7250c1b76893009efdba5da8e3ff31d97efe6d684aea131ae6c1ac1a4dd817d767398b72d4e977afda785c970f967307f008 SHA512 17be604706279edb4a20b0c1b7024be4123038e415c4d52c41c328ac4c427a3ba72367267c20d99f10872850264ea3eda12f38eaeacd071c399c5eefd2c6256b
-EBUILD pointcloud_to_laserscan-9999.ebuild 567 BLAKE2B 3943a2ee24ad44c920abbd54409a7250c1b76893009efdba5da8e3ff31d97efe6d684aea131ae6c1ac1a4dd817d767398b72d4e977afda785c970f967307f008 SHA512 17be604706279edb4a20b0c1b7024be4123038e415c4d52c41c328ac4c427a3ba72367267c20d99f10872850264ea3eda12f38eaeacd071c399c5eefd2c6256b
+DIST pointcloud_to_laserscan-1.4.1.tar.gz 7645 BLAKE2B b3b32213920679e3b0f76d1401658b5dce5057f9556f442e96e79719f083910454aa42e85869628c6713f0dfb858e10e16fc089a92c0e2233b810b9b698334a5 SHA512 c81fdb38affe6cf7da76db9de2b1c17f60a0c464fbd25278d013a601e8474a528a72ec981c3e2e8d257239c398f266960f9adc41e46e5d09bae81d9da8c05c84
+EBUILD pointcloud_to_laserscan-1.4.1.ebuild 565 BLAKE2B 7bc0225159ec843cf3beb332651cf117ea7d3f488e90a727e16a35732f9a75b9d230d6d544d7c0d8d24ea9eea848a0dabeed1c5029d400d7fa19da5f6c35359d SHA512 464596df424565c4480301ae8003ddad363759b6937293b2b667e25de998bbbfe50146f784a8fbe200cd9ec011dd9b8ef3dac6afdafcb5d8a071249c1537d909
+EBUILD pointcloud_to_laserscan-9999.ebuild 565 BLAKE2B 7bc0225159ec843cf3beb332651cf117ea7d3f488e90a727e16a35732f9a75b9d230d6d544d7c0d8d24ea9eea848a0dabeed1c5029d400d7fa19da5f6c35359d SHA512 464596df424565c4480301ae8003ddad363759b6937293b2b667e25de998bbbfe50146f784a8fbe200cd9ec011dd9b8ef3dac6afdafcb5d8a071249c1537d909
 MISC metadata.xml 352 BLAKE2B e6e84324ce9e250cbcbbc842560bd902aec079b7be5cfa60ba2a3b1e19d7e998f21fdc1bacff7addb2325f99d0b9f6fb0d6b928f7111a99c591174da8db34eab SHA512 d25a2c3b70b16e29ba73ea87630bfc1b82ecbde5235a02b02d6ee98b8bbc50fd5899f8ff99c46fb392f4c84841a5ae2781bec9afd89cf53bdd8631eea02ee0e9
diff --git a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
similarity index 88%
rename from dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild
rename to dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
index 36c5cfc0838d..e6427082f109 100644
--- a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild
+++ b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/pointcloud_to_laserscan"
 KEYWORDS="~amd64 ~arm"
 
@@ -16,11 +16,12 @@ RDEPEND="
 	dev-ros/message_filters
 	dev-ros/nodelet
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_ros
 	dev-ros/tf2_sensor_msgs
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
index 36c5cfc0838d..e6427082f109 100644
--- a/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
+++ b/dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/pointcloud_to_laserscan"
 KEYWORDS="~amd64 ~arm"
 
@@ -16,11 +16,12 @@ RDEPEND="
 	dev-ros/message_filters
 	dev-ros/nodelet
 	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_ros
 	dev-ros/tf2_sensor_msgs
 	dev-libs/boost:=
 	dev-libs/console_bridge:=
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
diff --git a/dev-ros/polled_camera/Manifest b/dev-ros/polled_camera/Manifest
index e5662b7573be..22b30f619e81 100644
--- a/dev-ros/polled_camera/Manifest
+++ b/dev-ros/polled_camera/Manifest
@@ -1,6 +1,4 @@
-DIST image_common-1.11.12.tar.gz 53920 BLAKE2B 296601a14b0e18e6685924ae4557ead446a95ac91ddffb791f9b0b4d643b8f9e40c17f8ace1a705bb5193647bb07444ac81513c888864b0cdd9b45464c14916c SHA512 cd64edd658092c88060a99bbf2cd501cd27441123c34914fc4c8d8c8a8a1fe6d4a929211e71d813b6eb72e1d844842ee3e12567bc40d32981db9ee430e61fb10
-DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
-EBUILD polled_camera-1.11.12.ebuild 603 BLAKE2B c4f3830256b8765936b4e3b6c2dac3639ac6ba89bb374f13d14fc3b76b5026771f44d9985b8fce0e5acef094e65302a61673628f5b684af2f6884e3f2a13d053 SHA512 1b535ce5aec064661bde77bdfad4d0f927d371fc6fc662a42278757873a803a31322663db07df6c2d8cdd8fa9a7ee0bd6eaa04627aae2d368bb532c18d306654
-EBUILD polled_camera-1.11.13.ebuild 603 BLAKE2B c4f3830256b8765936b4e3b6c2dac3639ac6ba89bb374f13d14fc3b76b5026771f44d9985b8fce0e5acef094e65302a61673628f5b684af2f6884e3f2a13d053 SHA512 1b535ce5aec064661bde77bdfad4d0f927d371fc6fc662a42278757873a803a31322663db07df6c2d8cdd8fa9a7ee0bd6eaa04627aae2d368bb532c18d306654
-EBUILD polled_camera-9999.ebuild 603 BLAKE2B c4f3830256b8765936b4e3b6c2dac3639ac6ba89bb374f13d14fc3b76b5026771f44d9985b8fce0e5acef094e65302a61673628f5b684af2f6884e3f2a13d053 SHA512 1b535ce5aec064661bde77bdfad4d0f927d371fc6fc662a42278757873a803a31322663db07df6c2d8cdd8fa9a7ee0bd6eaa04627aae2d368bb532c18d306654
+DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
+EBUILD polled_camera-1.12.0.ebuild 526 BLAKE2B b691a89ad6cac4b547d5fdf36b09b95a547ac7f29024c3a55952393b3e88f3d43f8fe3d6ef58e3ee374db358064c1064255e3d34bc46406c569ec028c9e571ed SHA512 013f3bc89ec672758b8bd5f423a4299d7307ca9166daf165f691a3990f44416d7e65286a445040ebd746b1354272c47a9440fdba994e3893a0f0d4c3b552d1d2
+EBUILD polled_camera-9999.ebuild 526 BLAKE2B b691a89ad6cac4b547d5fdf36b09b95a547ac7f29024c3a55952393b3e88f3d43f8fe3d6ef58e3ee374db358064c1064255e3d34bc46406c569ec028c9e571ed SHA512 013f3bc89ec672758b8bd5f423a4299d7307ca9166daf165f691a3990f44416d7e65286a445040ebd746b1354272c47a9440fdba994e3893a0f0d4c3b552d1d2
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/polled_camera/polled_camera-1.11.13.ebuild b/dev-ros/polled_camera/polled_camera-1.11.13.ebuild
deleted file mode 100644
index bab2c157f20a..000000000000
--- a/dev-ros/polled_camera/polled_camera-1.11.13.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_common"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/image_transport
-	dev-ros/rosconsole
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/polled_camera/polled_camera-1.11.12.ebuild b/dev-ros/polled_camera/polled_camera-1.12.0.ebuild
similarity index 74%
rename from dev-ros/polled_camera/polled_camera-1.11.12.ebuild
rename to dev-ros/polled_camera/polled_camera-1.12.0.ebuild
index bab2c157f20a..b2ad5f93c137 100644
--- a/dev-ros/polled_camera/polled_camera-1.11.12.ebuild
+++ b/dev-ros/polled_camera/polled_camera-1.12.0.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it"
+DESCRIPTION="C++ classes for implementing a polled camera driver node"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/polled_camera/polled_camera-9999.ebuild b/dev-ros/polled_camera/polled_camera-9999.ebuild
index bab2c157f20a..b2ad5f93c137 100644
--- a/dev-ros/polled_camera/polled_camera-9999.ebuild
+++ b/dev-ros/polled_camera/polled_camera-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/image_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="C++ helper classes for implementing a polled camera driver node and requesting images from it"
+DESCRIPTION="C++ classes for implementing a polled camera driver node"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/pr2_dashboard_aggregator/Manifest b/dev-ros/pr2_dashboard_aggregator/Manifest
index 113d65d64424..c75b913c3c0c 100644
--- a/dev-ros/pr2_dashboard_aggregator/Manifest
+++ b/dev-ros/pr2_dashboard_aggregator/Manifest
@@ -1,22 +1,4 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 BLAKE2B 8f504aaf9ba2fc3d2d07f3e93b30c54e22fc68f8702f3f214fb52e5ad137add256a2e991c86cd1d140bb0f8e98613fdfaf93998d093c0e1a2185cfa82d544f60 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748
-DIST pr2_common-1.11.11.tar.gz 33597551 BLAKE2B 87667f3011e3cf8a786fb1c045647cb5f454832ccc8bad22cadc33eaf67c7b5d7562e653b1d42ae5344521118f85857c3afb0603f250e3ee9588e1ba583ab673 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b
-DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd566b8bd70eee3134b5a28bae8eb93d101bc388c0d01066572a532562b06a05661f2e1f2da205414e772ccdbfef76a5f4 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987
-DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
-DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_dashboard_aggregator-1.11.10.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.11.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.13.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.14.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.11.9.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.12.0.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
-EBUILD pr2_dashboard_aggregator-1.12.1.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
-EBUILD pr2_dashboard_aggregator-1.12.2.ebuild 542 BLAKE2B c2b9b70732d96c9b4828346afeb160ac782a35680e31d2198f1994f466f11a30d0d1aa2a77e864338f3430a617f74de43a577c61f0543973d67984d25f95c2c2 SHA512 001482e1ee8659473f59a9ba338d759712bc6fa5b775438cece7df5a16a309bd3caa7be436b598e2bc3d825b0f0c215f7dcd28cd87b55aaba2e96737aabe4b4e
-EBUILD pr2_dashboard_aggregator-1.12.3.ebuild 539 BLAKE2B e42f74b6dff1ad6118836842d37f6d1f8d31591d17c2114d0828df47de870faf013f1e471128f25412c806296f325f5bd8cccc0866d9ccbaac46a897d47c5ff0 SHA512 2467e53e347b739fd7e114238b584f737ec40da4b778c37ff75cf257bd408069f8a7254e4eb8fa05a4f561c68f0a5353f4383201da5ee2430bee0899b9d19344
-EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 539 BLAKE2B 76822cdad8be58da8ec9b79eca386ac6d72c47f059a4184076b68450ae654ad54f9fbb581c93f1829c2312c4f29f09f26eea2f1891510ff00689c32b3e79ed73 SHA512 2094e653b0b8ba12040b6e15e4ef28310283a362da77830f9014ec9f1243824364398bb75d277743957218dae95fa0c87d0b0afa03188cda468281658d724370
-EBUILD pr2_dashboard_aggregator-9999.ebuild 542 BLAKE2B e20d9749d106b41ca81569afd435b421b00dfea3120f3307aedcc261251b62864881c535564e740dcc29320ee6070ccd9ede47a21cb81c7b8bfe65d7ba680c0f SHA512 7ebbb6f010406152aafe02eb779568688c39c6ad426cb1c92adaa8656637fb406ac68d97df4849d90b6051a2fe7a4274cc38ec3d6aeed96b529e60347fce5ca4
+EBUILD pr2_dashboard_aggregator-1.12.4.ebuild 511 BLAKE2B cbef63c381b9631d47bb56c3f263ca186423721eaab700ba60223af745087c37ece1251b9d9267e93061798736c0074c7a43d1faa31c65d97f9ad1f04ba29c3c SHA512 0840c0a4c3b4872f6b1fe9b19d61f3c58f79c036c650e5d9636548f538ff8c5792dac0b9576724605891075f6696dd49eb45fba5cf7d0bca69b6448beab1d7af
+EBUILD pr2_dashboard_aggregator-9999.ebuild 511 BLAKE2B cbef63c381b9631d47bb56c3f263ca186423721eaab700ba60223af745087c37ece1251b9d9267e93061798736c0074c7a43d1faa31c65d97f9ad1f04ba29c3c SHA512 0840c0a4c3b4872f6b1fe9b19d61f3c58f79c036c650e5d9636548f538ff8c5792dac0b9576724605891075f6696dd49eb45fba5cf7d0bca69b6448beab1d7af
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.11.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.11.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.13.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.13.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.9.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.9.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.0.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.0.ebuild
deleted file mode 100644
index 3c97dd3043db..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
deleted file mode 100644
index 52c01cd2ea3e..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.2.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.2.ebuild
deleted file mode 100644
index 52c01cd2ea3e..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
deleted file mode 100644
index dc803c9232fa..000000000000
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Aggregates all of the topics that a 'pr2_dashboard' app might be interested in"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/pr2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
index 73ac3ae71814..020d0d7cada7 100644
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
index 3c97dd3043db..020d0d7cada7 100644
--- a/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
+++ b/dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/pr2_description/Manifest b/dev-ros/pr2_description/Manifest
index 036f45848a29..34ebe14bcb5d 100644
--- a/dev-ros/pr2_description/Manifest
+++ b/dev-ros/pr2_description/Manifest
@@ -1,13 +1,4 @@
-AUX tests.patch 582 BLAKE2B 33a4ebdb4e3cb56f3dda7d16d8d952bfb72ec883e2ebabd2a19a98bdc0fe3aee995654b9a0463ef551ad4343b77feb5719fe24489b220928162e81c1ac5eeee2 SHA512 435c0f6b38ffd49282971d563f4e68daa482b63da3b44ff2599ff68f08be404b7921e125463494970a2c70ce938871c7d7bbea00d06c0ce61a76ff8117dcea8b
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_description-1.12.0.ebuild 549 BLAKE2B 261499258b614a14fa77defd99c39031d0c91a1e278f71084ade80392b3fddc89057deaf10847f8d8ef76c12c2a67a412f7c531d88677f7740445dd43cbb1d0e SHA512 7fbcc6f38b7363adcdb226d8b8a30c404f62477f5fbdfd17d89b263ffd2f29fff3d24d6af51145484857a9485d922d3079db06e470b42ef7f05093e7717a1ccf
-EBUILD pr2_description-1.12.1.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-1.12.2.ebuild 549 BLAKE2B 9dc330a03b139dc0a9d3a4392bffdcc5061761ab85432c10365043c67de4110e52ab66cbee00b5b754f777723dbcf713b9cbcd6fa7b7fdf818674b5f9d77c2ff SHA512 555ea9ae0e9527403c295606b3d1cdded292282fdaf89590ee042915acc08d064a65e1dc8daf74a29e67d8b43e3bb7100b9a6c9e86f2f0c7da82906401c6dc4d
-EBUILD pr2_description-1.12.3.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
-EBUILD pr2_description-1.12.4.ebuild 508 BLAKE2B fffaec46e8683f1ec5482fe208638c7c40cd4d132db71610a28ccc896bf87981a809873781343e09d3a808730c1ea2eeb4fe2eebc4d23599c91f19088e1e0679 SHA512 ac1c97ed6fdd930bb0addd0f9f4f6e3247e6bec7209cfec0ee7707d52ebd2c6d4be6052d3de9051bf3f741c0b769d3be900f4b7475047d5beff4b96ac074b3a0
-EBUILD pr2_description-9999.ebuild 508 BLAKE2B 7f8fd26973b137fa104e5ea8563206776d83dc1f63236897b3b981c484745c77ea6401b44260bf138f0952f28cc164fc1ba8b8ff87e77d388dc1077ed79c07b4 SHA512 c604c0e50604781da7ec5a349b2c16c2a132690212f11ea241230ab446984890326a4ca0cdea0d2d5592e09603c5fd122c29737912fa330ed8b07eafb6b11078
+EBUILD pr2_description-1.12.4.ebuild 480 BLAKE2B b68952d27a069e18a36bcfc7c58751b70d7780fb1ab7c311f344e78dcf81c046ffd1286583117dd3fb9cc03b37439ad12a2c559ab8492fa0b05928f515797609 SHA512 633636899ae09265596eff394ce1f37cef25c4369400d7891dfb89139b5c67aca50f4844c583aaf6f47e3b49c9b1c2a7e7526887b3fe7fb2c7fd1526bcb7eea9
+EBUILD pr2_description-9999.ebuild 480 BLAKE2B b68952d27a069e18a36bcfc7c58751b70d7780fb1ab7c311f344e78dcf81c046ffd1286583117dd3fb9cc03b37439ad12a2c559ab8492fa0b05928f515797609 SHA512 633636899ae09265596eff394ce1f37cef25c4369400d7891dfb89139b5c67aca50f4844c583aaf6f47e3b49c9b1c2a7e7526887b3fe7fb2c7fd1526bcb7eea9
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_description/files/tests.patch b/dev-ros/pr2_description/files/tests.patch
deleted file mode 100644
index 40c3a378d45d..000000000000
--- a/dev-ros/pr2_description/files/tests.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
-===================================================================
---- pr2_common-1.12.0.orig/pr2_description/test/test_urdf.cpp
-+++ pr2_common-1.12.0/pr2_description/test/test_urdf.cpp
-@@ -100,7 +100,7 @@ int walker( std::string & result, int& t
-         }
-         xml_file.close();
- 
--        boost::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string);
-+        std::shared_ptr<urdf::ModelInterface> robot = urdf::parseURDF(xml_string);
-         if (!robot) test_result = test_result || 1;
- 
-       }
diff --git a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild b/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
deleted file mode 100644
index 1a73af70cf05..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild b/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
deleted file mode 100644
index afdbbe676ffc..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.2.ebuild b/dev-ros/pr2_description/pr2_description-1.12.2.ebuild
deleted file mode 100644
index afdbbe676ffc..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild b/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
deleted file mode 100644
index 3f2d184f517e..000000000000
--- a/dev-ros/pr2_description/pr2_description-1.12.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Description (mechanical, kinematic, visual,  etc.) of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-ros/xacro[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-ros/convex_decomposition
-	dev-ros/ivcon
-	test? ( dev-libs/urdfdom dev-cpp/gtest )"
diff --git a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
index ab216d560b19..ed8112aca505 100644
--- a/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+++ b/dev-ros/pr2_description/pr2_description-1.12.4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/pr2_description/pr2_description-9999.ebuild b/dev-ros/pr2_description/pr2_description-9999.ebuild
index 3f2d184f517e..ed8112aca505 100644
--- a/dev-ros/pr2_description/pr2_description-9999.ebuild
+++ b/dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/pr2_machine/Manifest b/dev-ros/pr2_machine/Manifest
index 5d5bd3d94fc0..1927c46f9cb0 100644
--- a/dev-ros/pr2_machine/Manifest
+++ b/dev-ros/pr2_machine/Manifest
@@ -1,22 +1,4 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 BLAKE2B 8f504aaf9ba2fc3d2d07f3e93b30c54e22fc68f8702f3f214fb52e5ad137add256a2e991c86cd1d140bb0f8e98613fdfaf93998d093c0e1a2185cfa82d544f60 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748
-DIST pr2_common-1.11.11.tar.gz 33597551 BLAKE2B 87667f3011e3cf8a786fb1c045647cb5f454832ccc8bad22cadc33eaf67c7b5d7562e653b1d42ae5344521118f85857c3afb0603f250e3ee9588e1ba583ab673 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b
-DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd566b8bd70eee3134b5a28bae8eb93d101bc388c0d01066572a532562b06a05661f2e1f2da205414e772ccdbfef76a5f4 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987
-DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
-DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_machine-1.11.10.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.11.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.13.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.14.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.11.9.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.12.0.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
-EBUILD pr2_machine-1.12.1.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
-EBUILD pr2_machine-1.12.2.ebuild 374 BLAKE2B 86ba2f0c3dcd06f19e3ea626bc745a5f42ea031ca5d86513661bc410d19d0a4f61b22ce66706ab01eec93e3f1c21d12c6c5b426dfed40a6881fbebaab4835d4f SHA512 62836154f2aee2c4a3167d70ee6ad98472e28f9d603d1e3627bf56e99f6358f4839ef8a355880a156562f03f3bb7e9af52dc64a12f6e648d1100459262b1b251
-EBUILD pr2_machine-1.12.3.ebuild 371 BLAKE2B 890080c116eee84c9b928748f20a59362b4c45ad07ceeb3a5f517c30c184d649ef5cbdf43266dee43cd1c5b218c732e7b3be8d7193e25799dc0072f8f4a251b8 SHA512 250bb1143f90cb18517ae4bcc9ad2386b8c256dea0edb40d513bc865366d67ac54928a0a9bc415ed99a14c4cfe9a72fc22e1bde63d37475195b090e20131c802
-EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B 173d0a389e8c5df687bfc93bb6b41a867349fd4e8be048c87036521f314910fb3d554011fd902e2e6cbbbf8e81764149843965628eca7d6a92fb5ab6a2a025b0 SHA512 89e84bdd762bc760e912a82eb826ecc7a44a0652f9b3a02b8de0f0a7f071da7c49f64e337029cd218426807d6cfc478e65853b49efeecac887148d992e0b55d0
-EBUILD pr2_machine-9999.ebuild 374 BLAKE2B 328603f1a10dcf0c34c63b76515964a0e8514e62c8e356e8df6e4e17ee3765da5326d2a2ec628f577e0628b9f4801c3542c169610c4397c931a817c4caaae25f SHA512 15a3a75c42f9e8994cca266310d20891c03be14996f7ed163e75f8cbee18d0dc433ca4570119069e2b7fc482237955db8dd3672ef11d43bfa925b0a7c904bbe5
+EBUILD pr2_machine-1.12.4.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
+EBUILD pr2_machine-9999.ebuild 371 BLAKE2B bef838adcd55896dee5b599d3ad47d727050d60747603ffec68a456a6e355a4dc78fce279df6436ca8dbdead92ea2549c4b9eeffe804cd9db5102917ad2c3c69 SHA512 da37d15dfa41249a5ebd95254c898e46762003978854990176baed596ab0fe9e5b3f46da8d02cde862c9d8a966cc86882f580cf7f6dcfe4f18e9e023053b42a6
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.11.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.11.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.11.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.13.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.13.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.13.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.11.9.ebuild b/dev-ros/pr2_machine/pr2_machine-1.11.9.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.11.9.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.0.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.0.ebuild
deleted file mode 100644
index 44fd194d9870..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
deleted file mode 100644
index 3a8a32077d50..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.2.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.2.ebuild
deleted file mode 100644
index 3a8a32077d50..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
deleted file mode 100644
index ba2219be56f3..000000000000
--- a/dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="xxx.machine files that describe the different hosts a node can be spawned on"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
index f3906878327d..258bc46816a7 100644
--- a/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
+++ b/dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/pr2_machine/pr2_machine-9999.ebuild b/dev-ros/pr2_machine/pr2_machine-9999.ebuild
index 44fd194d9870..258bc46816a7 100644
--- a/dev-ros/pr2_machine/pr2_machine-9999.ebuild
+++ b/dev-ros/pr2_machine/pr2_machine-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/dev-ros/pr2_msgs/Manifest b/dev-ros/pr2_msgs/Manifest
index 260e61f6af42..a43761f2560e 100644
--- a/dev-ros/pr2_msgs/Manifest
+++ b/dev-ros/pr2_msgs/Manifest
@@ -1,12 +1,4 @@
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_msgs-1.12.0.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.1.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.2.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.3.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-1.12.4.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
-EBUILD pr2_msgs-9999.ebuild 526 BLAKE2B 47dc948a7b4e4dfe3f108fbbaa7a9ff72b30ddfd8b23c0ff2e399a6b9c44d60082f9099d5e83c470b076bed35b52dede24ddfbe2fcfd1c18fefc594bf15b478c SHA512 19574c5a3fb21cde33415a07f89da2a18ee6fe7f08c5d7d779602ef7e8033a19b8c04f252e4cfedd30bca4f34c69cafc34ae22f459deaec37b54e17fa5608b85
+EBUILD pr2_msgs-1.12.4.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
+EBUILD pr2_msgs-9999.ebuild 427 BLAKE2B 853d578c3cb801817ad94411c583a15bbf535d11b2578f36563045888ba1b6eb9dc1b8938731523edffe1e29cbc359fce63c02b1ba1e1ed3c2e65148208b146e SHA512 02cd78974a0b281024bfc31a1c2c33589dc1a3769e41890caf73f2dc2c7f5fb5a4e795281f6bc5388dc72cfb1da1ba7bfa29d0508440155a69b5ba5960b1a84c
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.0.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.0.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.2.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.2.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild
deleted file mode 100644
index 98b0538ad185..000000000000
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
index 98b0538ad185..cbbb022aa76a 100644
--- a/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
+++ b/dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+DESCRIPTION="Messages for representing PR2 state"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild b/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
index 98b0538ad185..cbbb022aa76a 100644
--- a/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
+++ b/dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
@@ -1,17 +1,16 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors"
+DESCRIPTION="Messages for representing PR2 state"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index fb568ce93ff9..6983485ba230 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,7 +1,4 @@
-AUX var.patch 961 BLAKE2B 5bbf8db95f689cc7d2c0358d0dcccc8856a4318137eeda2f56458d145654bc20b6ed3a6d6df40d89f4f2a654762415776aa0bf8410dafddce5606e3d515e554f SHA512 4b774ae419f56094bb0d059fca1944043c9d8b176195dd6df970407ba7e4e71239fd2ad155c4cfaeb50bad585fea175f08ad7d6911cace5a8a21b0a03c483f52
-DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
-DIST python_qt_binding-0.3.5.tar.gz 12412 BLAKE2B ee2f2537bb1ddceb5cce0ca1963e042d10e5d011cffac25caba1a714c992d975413b7e1c4a23d5472567d4e214f482414dcfc56d499fcbcb0bd5559d7670b484 SHA512 a54ce90008d0893f236533cdda7d3520db264ba3e66b6edf18bac0d6e97975823e3900d1f265a7459813c823c9fc0bce7bb12570de1f8101b588954adeb073b4
-EBUILD python_qt_binding-0.3.4.ebuild 451 BLAKE2B 6b5d59a029849455e72d8e9c684f08ac8eb22eb14f9e391ed61a5e51804890c094aeb454d7dbe1743ddb99bd601f80b9e1a5b8034b183c9a9e81c3a93bf91d44 SHA512 c31c9520e1f7cfb8432be6adeba7694449f7974517d331237ea3c4e48b813895c8a8c2b24440c723fe5d9863385ce69868e16b052c01cbb5e7dc993cead37ab1
-EBUILD python_qt_binding-0.3.5-r1.ebuild 487 BLAKE2B d45bf248919d443956a3bf24e8bfaf7caa60c22d4c492e362b8520384c4c918ec6aa9522d3d071e1ff78c93fae48cdaf9db61cc1ec36479bd3a45566e4380e26 SHA512 3a54046c4fa155820ebc9253f0a708cf2c9b827f033f115a8dbfe96762ae7cbd60fa781d5f3d41c40a58c4009c7eb5f2c401e03880f57ff411c3af5239c6cfc4
-EBUILD python_qt_binding-9999.ebuild 451 BLAKE2B 6b5d59a029849455e72d8e9c684f08ac8eb22eb14f9e391ed61a5e51804890c094aeb454d7dbe1743ddb99bd601f80b9e1a5b8034b183c9a9e81c3a93bf91d44 SHA512 c31c9520e1f7cfb8432be6adeba7694449f7974517d331237ea3c4e48b813895c8a8c2b24440c723fe5d9863385ce69868e16b052c01cbb5e7dc993cead37ab1
+DIST python_qt_binding-0.4.3.tar.gz 12632 BLAKE2B 1403602262a18ce359d153234bb01ff3a6a90e91f9f4a84ddcd0551723c04c493526f51b81f750c90f78005d2c5b78cf77396ecd3132f1c505038bad8639b63d SHA512 103f791a27f8e8dad668a63c0bfc96facd93cbb043541bd036355d62c787759724fe0d66788c587c3cb68486e6d2732039d7c27f567ed48f2ecf21ce98d275af
+EBUILD python_qt_binding-0.4.3.ebuild 423 BLAKE2B db6219ee5b861b89b82669d6d7ec500abc89affe7be3417bf7b07c1a5a6460be369f8f214260ecc209b8347a4bee0c842787b1bef9e154de30eadce57ca9fbdd SHA512 c3b104c946ee99f6b8436a482ba5925abb7e4ffe90dbb40310d2ebacb5f512acaeb3b3e77ad350530a55fa53cb7ff4c73bf29f6a8ca1052413f10236ab663a6a
+EBUILD python_qt_binding-9999.ebuild 423 BLAKE2B db6219ee5b861b89b82669d6d7ec500abc89affe7be3417bf7b07c1a5a6460be369f8f214260ecc209b8347a4bee0c842787b1bef9e154de30eadce57ca9fbdd SHA512 c3b104c946ee99f6b8436a482ba5925abb7e4ffe90dbb40310d2ebacb5f512acaeb3b3e77ad350530a55fa53cb7ff4c73bf29f6a8ca1052413f10236ab663a6a
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/files/var.patch b/dev-ros/python_qt_binding/files/var.patch
deleted file mode 100644
index f0cd56d10a7e..000000000000
--- a/dev-ros/python_qt_binding/files/var.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b3000d2eccfad651b427de20028a4ca552e9ea7 Mon Sep 17 00:00:00 2001
-From: Hans Gaiser <h.gaiser@fizyr.com>
-Date: Mon, 29 Jul 2019 15:17:39 -0700
-Subject: [PATCH] Replace Qt variable in generated Makefile. (#64)
-
-* Replace Qt variable in generated Makefile.
-
-* use single quotes
----
- cmake/sip_configure.py | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
-index 49eb866..ce084dd 100644
---- a/cmake/sip_configure.py
-+++ b/cmake/sip_configure.py
-@@ -145,5 +145,14 @@ def split_paths(paths):
- else:
-     makefile.extra_cxxflags.append('-std=c++14')
- 
-+# Finalise the Makefile, preparing it to be saved to disk
-+makefile.finalise()
-+
-+# Replace Qt variables from libraries
-+libs = makefile.LIBS.as_list()
-+for i in range(len(libs)):
-+    libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
-+makefile.LIBS.set(libs)
-+
- # Generate the Makefile itself
- makefile.generate()
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
deleted file mode 100644
index c4bda1c59580..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/var.patch" )
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
similarity index 92%
rename from dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
rename to dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
index 6aed5cfe415e..e90e684db5bd 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
index 6aed5cfe415e..e90e684db5bd 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index c499ce877a6e..f29b1c14b340 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,4 @@
-DIST rviz-1.13.6.tar.gz 5096543 BLAKE2B f51750803ca2e133dd225de5b28bf3730b89fd6df9650b662fdbf9ab28551eaadbbd8bab50fd17e8a980702fc9d162ea41b1a3319c14309fdcb15714b8103e3c SHA512 d9f462cf25cc1386a6bfad4dee27e6963ba15e3714f7556df6f79db7eeaa1b43f60461630e6e8d354fd0c56755b7a2b8b38d98fcee4343dd30559a771b0cd157
-DIST rviz-1.14.0.tar.gz 5118043 BLAKE2B 2f5236c3b8bcb0421ebbbc76648ad421b38ad0cb4c6b2c107ef0532c2a84a1c2430b4c648ff6facc634c3247dd8dcb62dd4fe787bbe5c4c5db5a904380b11dc3 SHA512 7ab3d8b751268b6e76fb39184ba0f245cc19b45ef1bb59fa74ada594b12ec2c9c7024a91005a946c0b2c0d977442a8e64570837ab80a10b762729d3f5840411b
-EBUILD rviz-1.13.6-r1.ebuild 1723 BLAKE2B bc99acf8f0f6c783486467d9e7f7305c96150e8137f62a2e0719eaf1a7d99391f4589e693943d51a487e63778cc904fa99afc08a7d28a9a12c43958934606301 SHA512 4a4e0858aded3a6300e281ebcba7caf4ba5e8c0ee215d1e9e02524e758b2c003934277d5e4f10dd59d911838a78fbdcaacc1da98e6acd8a50b712ce7b483ea58
-EBUILD rviz-1.14.0.ebuild 1715 BLAKE2B 13f47a63badc18199c2c88ff83d22a23188bb8344ff6575f3be301f16a46b3b4c95122b4ccc155d797a6eb14bfe2e1b6591f3b0cabf47440c9b8c3f0d1901964 SHA512 a2f5c144f4011e349e79fcc073964b3ee2f9ea3281ec3eafebf91670812eedd2d1b03701420f063a710c57fe7d367dc9f387c4c43a6531b9ce60f41c51545563
-EBUILD rviz-9999.ebuild 1715 BLAKE2B 13f47a63badc18199c2c88ff83d22a23188bb8344ff6575f3be301f16a46b3b4c95122b4ccc155d797a6eb14bfe2e1b6591f3b0cabf47440c9b8c3f0d1901964 SHA512 a2f5c144f4011e349e79fcc073964b3ee2f9ea3281ec3eafebf91670812eedd2d1b03701420f063a710c57fe7d367dc9f387c4c43a6531b9ce60f41c51545563
+DIST rviz-1.14.1.tar.gz 5119463 BLAKE2B c318c84d47fe4579b5554f073d013bb21189c2bff6edb286aea737837e67683a457ffaa0af1c05f1aedd96336689a0975fb8e72fb09af5bd8904bc29e1ee994b SHA512 deefb4f35bc301df2eca310104100c5d01d41a5c5c0204e59519faa8ba6c04efbce5304d1507804d5a42ca904086ea22891cd448b9d5e0d500fe9a7c9be94863
+EBUILD rviz-1.14.1.ebuild 1764 BLAKE2B 394187932e5548ac475a7e6986b428c09b6fcdc04dc0d71548c72e4965a54f6a2c9a562003b1a5fc27ee142128a547ac43a06bd51a5ad7341ab61174e1b0220b SHA512 982e0494d71b640eeecc9dc3ac88a19b881f456c39f38c9adb89cb5fd4a58fecee603a7e86b8627edd043a90f4282e5f08bb2659cd9fafd1ddb3b47c64e1a81a
+EBUILD rviz-9999.ebuild 1764 BLAKE2B 394187932e5548ac475a7e6986b428c09b6fcdc04dc0d71548c72e4965a54f6a2c9a562003b1a5fc27ee142128a547ac43a06bd51a5ad7341ab61174e1b0220b SHA512 982e0494d71b640eeecc9dc3ac88a19b881f456c39f38c9adb89cb5fd4a58fecee603a7e86b8627edd043a90f4282e5f08bb2659cd9fafd1ddb3b47c64e1a81a
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.14.0.ebuild b/dev-ros/rviz/rviz-1.14.0.ebuild
deleted file mode 100644
index 4c97b1574bab..000000000000
--- a/dev-ros/rviz/rviz-1.14.0.ebuild
+++ /dev/null
@@ -1,71 +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-visualization/rviz"
-KEYWORDS=""
-
-inherit ros-catkin virtualx
-
-DESCRIPTION="3D visualization tool for ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	media-libs/assimp
-	<dev-games/ogre-1.10:=[-double-precision]
-	virtual/opengl
-	dev-qt/qtwidgets:5
-	dev-qt/qtcore:5
-	dev-qt/qtopengl:5
-	dev-cpp/eigen:3
-	dev-cpp/yaml-cpp:=
-	dev-libs/urdfdom:=
-	dev-libs/tinyxml2:=
-
-	dev-ros/angles
-	dev-ros/image_geometry
-	dev-ros/image_transport
-	dev-ros/interactive_markers
-	dev-ros/laser_geometry
-	dev-ros/message_filters
-	dev-ros/pluginlib
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-	dev-ros/resource_retriever
-	dev-ros/rosbag[${PYTHON_USEDEP}]
-	dev-ros/rosconsole
-	dev-libs/console_bridge:=
-	dev-ros/roscpp
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf
-	dev-ros/urdf
-	dev-ros/media_export
-
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
-	test? (
-		dev-ros/rostest[${PYTHON_USEDEP}]
-		dev-cpp/gtest
-	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
-
-src_test() {
-	virtx ros-catkin_src_test
-}
diff --git a/dev-ros/rviz/rviz-1.13.6-r1.ebuild b/dev-ros/rviz/rviz-1.14.1.ebuild
similarity index 77%
rename from dev-ros/rviz/rviz-1.13.6-r1.ebuild
rename to dev-ros/rviz/rviz-1.14.1.ebuild
index 1e9f682c7ffe..091d8d84b10d 100644
--- a/dev-ros/rviz/rviz-1.13.6-r1.ebuild
+++ b/dev-ros/rviz/rviz-1.14.1.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rviz"
 KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit ros-catkin virtualx
 
@@ -45,26 +48,26 @@ RDEPEND="
 	dev-ros/urdf
 	dev-ros/media_export
 
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
 	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? (
 		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-cpp/gtest
 	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
+BDEPEND="
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+"
 
 src_test() {
 	virtx ros-catkin_src_test
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index 4c97b1574bab..091d8d84b10d 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -4,7 +4,10 @@
 EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/rviz"
-KEYWORDS=""
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+
+CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit ros-catkin virtualx
 
@@ -45,26 +48,26 @@ RDEPEND="
 	dev-ros/urdf
 	dev-ros/media_export
 
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
 	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	virtual/pkgconfig
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	test? (
 		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-cpp/gtest
 	)"
-
-src_configure() {
-	local mycatkincmakeargs=( "-DUseQt5=ON" )
-	ros-catkin_src_configure
-}
+BDEPEND="
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+"
 
 src_test() {
 	virtx ros-catkin_src_test
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 83aee38dfc97..5a3c47a40997 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/jwt/Manifest b/dev-ruby/jwt/Manifest
index 14d1e333207d..05497c7d79d7 100644
--- a/dev-ruby/jwt/Manifest
+++ b/dev-ruby/jwt/Manifest
@@ -5,5 +5,5 @@ DIST jwt-2.2.1.tar.gz 41269 BLAKE2B 51a47d07c9386c42dd22832d4b1c5a7c8c1b599dad15
 EBUILD jwt-1.5.6.ebuild 678 BLAKE2B f799859c28ebb2daab33604f350df13bca00e98cf911b2e996000bd10d4b313374536d1e4340cd7e2b28f025d18e7b209559b353066793f5e6f762f8542488ac SHA512 715f7b2cc586536480a9f84889eb999844c448adff10fc55df610f8d1ecc1aade26435f3c0fa66eecbaebf3069f351dc6c2a0f900e2382d44533ba4c33d7a7e9
 EBUILD jwt-2.1.0.ebuild 701 BLAKE2B c8b1f519529db9c0fb535196ee063424a062356774ec475226ed0175d00c47f2e8345ebce00c52a9870cc0398fcb03798e05b4efa77709490496263057b816b2 SHA512 c73c0717981c5e52d0904f96499a322fd1cdf8c656bcb66719d200012c8904043d0b927118b3a23b4ebc70351ebb6ca8623abda042830a4a6916a2b0d09f4be0
 EBUILD jwt-2.2.0.ebuild 719 BLAKE2B 903dd40cd20dd28355a1bec57146b70460bc8dd48a6ff8f18f4c25ec15fc90373b10cd5bacfa5904b6b947a9e966e0adf9703f9fd97277b55adf904c9f6c64d6 SHA512 9ebc0f372b4464ff435ec080fb7395f63dbb49c9a3704888451a3ac88a4c8d5e11220e944c7f391a4d714b27dcbe5f71bc200ec13c054def1a6a74b63a93c8e9
-EBUILD jwt-2.2.1.ebuild 772 BLAKE2B c015525b50c38f7560cc57d3161b16a09d0d877cbcad2b18455c4b26097568fce26b37c14fa209b09eb9aa0e196a69272899f28ec4713cc5d432853d703de1c6 SHA512 1032dc1d6128c6acd7888e6d099136fd79457ce641cbae4c2c83f181d83294b2125a9e0d6d65a8e1bc390117c0ab7ec233d0a80f73583ace6826d45d2a4b1c39
+EBUILD jwt-2.2.1.ebuild 777 BLAKE2B 392b81dba214db80fea2276c86d8a8ea2c92f55e4f96a138c1b1abc38cb84af81b11be686e3c5de33563f5fc84bda7e467bc3c4815b01ebad3d1fff5b0cd6281 SHA512 305b51f60e0f496771402a401d2ad2207fdbf4ce9e64aeed8fe7e4089e465a7cef9a2d3a25408a93388ba32b20ec7d92d35817ff66a649d7af4ec03f227732e0
 MISC metadata.xml 338 BLAKE2B 685874339b4dce29aaee7a4ff92e7df63ebced85bf94bd9011e0f4b6e1ba3fafc0fa0e701bf25fa8c1dec357ebf27f373742d45b12320ff28a496405982860f2 SHA512 700a3cfc122774c85bb6047a68539139d53dd6abe814b20bad12fb65233280e9aeba45bce0551920b0de550adb2744f4ee7e2eb0ba39e98efeea7a23c63e4428
diff --git a/dev-ruby/jwt/jwt-2.2.1.ebuild b/dev-ruby/jwt/jwt-2.2.1.ebuild
index 1f2bda08e687..36bd96cb600e 100644
--- a/dev-ruby/jwt/jwt-2.2.1.ebuild
+++ b/dev-ruby/jwt/jwt-2.2.1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jwt/ruby-jwt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RUBY_S="ruby-jwt-${PV}"
diff --git a/dev-ruby/octokit/Manifest b/dev-ruby/octokit/Manifest
index d2961163fab4..dedc97d1887e 100644
--- a/dev-ruby/octokit/Manifest
+++ b/dev-ruby/octokit/Manifest
@@ -1,6 +1,6 @@
 DIST octokit-4.17.0.tar.gz 3090364 BLAKE2B 42545bdaca8ecbbc3a3e78e70d535c634f20741651d41dfec254dd68254acbc82a992c93314b871d6bae7b4ca8321339b888fe7b5b7349fe9b48dbf6904f4524 SHA512 da6a90e77991d17697424da22c9481027f23f5ecb52e294748fe62c3a7c228412a276a01e6816b201e597b73f271b83e70c4d86ff9ea40c0204dae5c30df929a
 DIST octokit-4.18.0.tar.gz 3091587 BLAKE2B b48ccfa35f53b686e61a0f79c09bf20f063843c98f75a0896e71739a33cf9b770c8b5e5c27cda2c8a25ca6255cfa7c4e389b372ca269d4c46b499abf1838a4ad SHA512 e749afc4303f987b502f8c79ff60e33c6f49ff84d25f16cdb3d9165c7089912570a7b77af3716341cd5216e5c8e3534a805e4347081ec7765a4e4f54fc432ce3
 EBUILD octokit-4.17.0.ebuild 892 BLAKE2B 1d6b9c1f92a4e1c36c9bd7ad061b8b27bf06d4e8718d53f2fb0e7c7067b05de8c15da808a9249ec1e182468013eeccf54ba0c9d2020e2df394af932fabfaa897 SHA512 d8d8f441ddd10af5be514ab2add237dd29c78c3410fa499212bfa4b1e3c9a6ac0388d284c22b2041a227ea9aeb0b21483dc0f73ac34650ad35d269f310567950
-EBUILD octokit-4.18.0-r1.ebuild 932 BLAKE2B 6ef3040c27ac06c24042e13eea67ef3bf3adc4527822dbb1454e79519245cea8ec520f071c2c4c73a925b72a1b4af84e85083cc2aee105740ebc8565b6119494 SHA512 8a29e13202aba540a829d30cf28706b5b33947331ef418b1fd93c7c0b982e244f6e7541d5d970b850364f538f5f8c5d782341258a35100bd1f8bc0b803b2d0cd
+EBUILD octokit-4.18.0-r1.ebuild 937 BLAKE2B e0fd6ba0cee38c22e4e520b83cec1ae4f35c90cc9bee3064e0e954f5c01f9bfe97a90c3a7981878796f240cec15086291ccf53bd7751d344418e173f0395ffaa SHA512 3ea459d955bec294bc05535b004dee8fa929e43187c3ff1304eab82861fec30eb9a9f5dcfe8a1d4dd93185069680633c9208b565e45fb74b35a0023097320b6f
 EBUILD octokit-4.18.0.ebuild 916 BLAKE2B f31fe1ecb2508b059ade36e017a53e3d4e62f126a14a30fe69939160f49c93d54c4c15b30027f51132bbbc0cccf0d4814500c49a017faebcf4069c15a9b62a03 SHA512 e87ef4c75d0150b41f38e58ef979d229c0d68181c6c8352f16c69f99b8196f11219e1b74bcaeeb35e6599a238261038359ec5f346963e7ccd8d634176b9dd9a8
 MISC metadata.xml 344 BLAKE2B a2013bc4988a44c7d4b2e9dd6005d30390a7fdaf39f37a4adf8b539825b43f5d0eec457dae147b782f90f15d77fa5f485a6bada65be086f67b7350603945cf64 SHA512 3866d3979a8749d780367b56ae524d8f78286d2174602452ba272d26a4fb49cbbe8945183e4a64e70400b758fba4fc6bf88bcdf24908e474a378b628a1263457
diff --git a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
index 6749ed154883..52e084a9cba4 100644
--- a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
+++ b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/octokit/octokit.rb/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RUBY_S=octokit.rb-${PV}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bda5ee302969..1e227e678981 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index f2488da5745c..4079d36d88a6 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,5 +1,7 @@
 DIST conan-1.23.0.tar.gz 1024905 BLAKE2B cfa3e130be13ee175b1dc167b6d61666eddaf588b5954d9889c2d167806e8fb115290257ca839f6de407c87079472dba912b730e01a232d70375f2fe63ce7c28 SHA512 fa2b1b726e29ef553774267b50b0ace4f39a30bdf0a6d0e051576bc9b0e6cd1ed6cb166101c446d15734ebef9e89e17a101c10c0ead91c15de5aa1ebb102d0a8
 DIST conan-1.24.1.tar.gz 1043698 BLAKE2B 33e5aaa975a9819d0808c90ad97260b00aab6f4ae8ba6feb7d2c53622f0e72b87cc469c7c21994e2c228819bd364dc9b20822134c10665978bf996b653c014b9 SHA512 ab6e15c4291862d9d68661682ec9da8c126193ddb00b800e3d8f9dba07a516db307d22e590324ae3f059e39e897bc6bf590e53cc82d69431ce287031be7fe820
+DIST conan-1.26.1.tar.gz 1089182 BLAKE2B 2f10ab74116748c622f732d2ec15d01e2c859d6618a513621ec35149155303ca6b5109c3776786014237523bdfda44dde9d7d60c007084a36fb99149b473cc39 SHA512 4a5fcc7306939594afce3596bf274cc32888891324f994f7ba71254bdd0b8dbb9a88e0ab29598acc02cfc7cab0159d45257974986d191ef5c09e0d57c3a06c5f
 EBUILD conan-1.23.0.ebuild 2405 BLAKE2B 0920cba1e65a77f711bb0b6f3476fb9e385b814a9dfc730a051a8679ceac398d86e95c44b3c83d4346e1918d41261f56ebab0b4d9f4c715b549452a1b6977400 SHA512 24e0e52584af9f7e1cffb1674bf55c944780e9091fd07beac9078e2532dbe5999eadc78e8bc486db9e63de1d944614c261debcbbf3c7b1a1d52eaceb0f8eb676
 EBUILD conan-1.24.1.ebuild 2347 BLAKE2B d1de907aec75daae75f3b5f06b227a6ba4983ff632c23551bead61caecac0a5f5b45e03451cae278d2e9202b785e7e0780e67d1755a9cced494928f92f8b8095 SHA512 331d6ee2a7d3fc563d9d3a4eb17392a46863164b57562b28f881616b78cea9a20e979e958c242226a95283baf1b5145d0affd20024be693ee04c06b93e98c3cd
+EBUILD conan-1.26.1.ebuild 2466 BLAKE2B aa3c1ba9dac3da571475e6d6fe026220eb790e6b915a6242637b612e68389e15e70229ee507d2ba4551dd7c8b743396e8d8fc566c8456a687683b0de9cd3b8fb SHA512 ef586a1008891b7fdc9e9e1ee3d5b372ee63fd1225bc6335d17c08e749b268b2ac8b046189617993e7d04900809f6f78dae9d084d41445d551d8faf4a9347792
 MISC metadata.xml 739 BLAKE2B 475521b92c84335a4ebda1d68dac1905a99f96b0fbecc8f06b6918e0c075648024ba3bebeaf85cb11ef0b96b917a2ebcf2a0146bd5b37c976d90cee08365c595 SHA512 27c7a3cea74ef2e22fd3dd238fa736efd1786fea4eaf01b9b51e07f7276101ddd7022ad7aedf767d1dbcdba2c29ddf48c07581e4fe5ec089d5e10c5b880c9970
diff --git a/dev-util/conan/conan-1.26.1.ebuild b/dev-util/conan/conan-1.26.1.ebuild
new file mode 100644
index 000000000000..61652830c13c
--- /dev/null
+++ b/dev-util/conan/conan-1.26.1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Distributed C/C++ package manager"
+HOMEPAGE="https://conan.io/"
+SRC_URI="https://github.com/conan-io/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# overly strict requirements?
+# https://github.com/conan-io/conan/blob/develop/conans/requirements.txt
+# https://github.com/conan-io/conan/blob/develop/conans/requirements_server.txt
+RDEPEND="
+	>=dev-python/bottle-0.12.8[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/deprecation-2.0[${PYTHON_USEDEP}]
+	>=dev-python/distro-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/fasteners-0.14.1[${PYTHON_USEDEP}]
+	>=dev-python/future-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/node-semver-0.6.1[${PYTHON_USEDEP}]
+	>=dev-python/patch-ng-1.17.4[${PYTHON_USEDEP}]
+	>=dev-python/pluginbase-0.5[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyjwt-1.4[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.8.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.12.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.28.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+DEPEND+="
+	test? (
+		dev-lang/go
+		dev-vcs/git
+		dev-vcs/subversion
+		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
+		>=dev-python/nose-1.3.7[${PYTHON_USEDEP}]
+		>=dev-python/parameterized-0.6.3[${PYTHON_USEDEP}]
+		>=dev-python/webtest-2.0.18[${PYTHON_USEDEP}]
+		dev-util/cmake
+	)
+"
+
+src_prepare() {
+	default
+	# Fix strict dependencies
+	sed -i \
+		-e "s:six>=1.10.0,<1.14.0:six>=1.12.0:g" \
+		-e "s:node-semver==0.6.1:node-semver>=0.6.1:g" \
+		-e "s:distro>=1.0.2, <1.2.0:distro>=1.0.2:g" \
+		conans/requirements.txt || die
+}
+
+python_test() {
+	nosetests -v conans.test \
+		-e test_ftp.* -e modify_values_test.* -e test_pkg_config_path.* \
+		-e rpath_optin_test -e test_variables -e system_package_tool_installed_test \
+		-e virtualbuildenv_test -e scm_test -e test_git_shallow -e tools_test \
+		-e test_environment_nested -e devflow_test -e shared_chain_test \
+		-e test_toolchain_linux_0_Debug -e test_toolchain_linux_1_Release \
+		-e virtualenv_test \
+		-A "not rest_api and not local_bottle" || die
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 9de1746b3a6b..dbd486de7af6 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -4,5 +4,5 @@ DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41
 DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
 DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
 EBUILD idea-community-2020.1.2.201.7846.76.ebuild 4689 BLAKE2B 76ebcb168c22aa99bb66c9dea40ee73827457174ccd522fa9783e7ad2464f309813ac584734ad3910fb430a6ddc96896d53c750aa492bf921e5f4b4e41595d7d SHA512 50b38ae228d237ff975ecb824c585f8b97a024952d2cc5bdc02e2b45a7421831bcaa41c35472ac168151b4dedad9833eb25c6aedaa2169ef037ba1c6e5036f88
-EBUILD idea-community-2020.1.3.201.8538.31.ebuild 4680 BLAKE2B b4f8da2b8123efc110617da8482bc52b2406d4cca6a7839fabfdb44300eaa0a7ceea9bdcfae38502a2c6a009dae0bc1917c09aa33f8b4db4b4276ff4927490c3 SHA512 3be6b706d823ec989e1420a4f41863065b20c8ff57f5cd2538be9572b2ed477fa79440a6450c45a03b158ee5c658b21834a2147bab06f81b2cc2e939e66a7311
+EBUILD idea-community-2020.1.3.201.8538.31.ebuild 4693 BLAKE2B ac564614a230e6539459a2122d5ca9b9ce842697a06c44b4b10eef9cdab283a5e8967d39a40cf24c1ec2e1252f97d6569806aa3807aaca8c3a9f686aedf372e5 SHA512 e07f7c5957113f18a57281cfbe75c136b141c82d1ec6487cc0a1eb47f2b87c181f203111ae86505df7d5f2c73791ce03c68e48ae09916caf87188aa121656f7c
 MISC metadata.xml 758 BLAKE2B ab45d0a8508bed2b64d02ca83d0aaffab9dfceb13a6a188accbb18f0648593ef1a9cfa03f375292b9858c05b17f003f4c6c2261b9d962ddaf679eebe7cea2eda SHA512 15ad0429ec342e939f3406e83b736ec9a273cb4ba33998a83584cee7af4ad0433a5a4758c8d01feb24efef51e4a4d9761db18d0bfc054bf9a0980ac8806eb459
diff --git a/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild b/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
index 7c374ac31a95..97ec35a8801d 100644
--- a/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
+++ b/dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
@@ -20,11 +20,11 @@ JRE_VER="1483.37"
 if [[ "$(ver_cut 7)"x = "prex" ]]
 then
 	# upstream EAP
-	KEYWORDS=""
+	KEYWORDS="~arm64"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
 else
 	# upstream stable
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
 		jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
 		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 06c8c7832045..781354af29a2 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,6 +1,6 @@
 DIST pkgcheck-0.7.6.tar.gz 234637 BLAKE2B 31c31d987aed03e4a61f58a3dc3074985a4f436e3598f11257d602a668525f24e45c540d56e5779237cd36299b0ab73b9a59e3482099cb5accbb3ea8437cd7c5 SHA512 cfded3a5a0249ee9279fe93156ef524cafe7302915dfbbb01acd0bdc3acefcd1e90c6bcfbf3dc40bd5cb71680cc6453b1de045878d75a9ade00c432e663fd136
 DIST pkgcheck-0.7.7.tar.gz 236359 BLAKE2B 46628e6fe1ab711773209785f3160ad5521f7173a676363a44102bd26b443eafe4f88829d9a6c9cf10538ebfa7ca8b28cb8c27f9719f98217ff626d1b5a9a0b3 SHA512 ac88a3aa689983bfac0efa85240e3a02c822a075095ff9940fac0cdc188428126e7612807e57a7582f21fcf1d668dba29d4785d062d757f6444fa024d0437751
-EBUILD pkgcheck-0.7.6-r1.ebuild 1404 BLAKE2B 963c2e8f9c6daf39e14c5e0bfc998e813897731ad2bc7a4f75d1c686f9a5131ad46af420211ab70e9af01db1de6a4788806d1ab7828b8929cfcdeec99d489bcd SHA512 e999a819d7f71acc5efcf841c5b58b0709d3ef7df66a9f1b9d7ac25e45991d0ad9452c257e555489ae33bc91608fe8884a0e9a8ba2a0c2f5925eaeb8c113435a
+EBUILD pkgcheck-0.7.6-r1.ebuild 1403 BLAKE2B ff59f3bd139cd02a5f39510c62f4a76e364e6e76b13d93c6f8a40938dd68ae1a8631b4b1369d829e5123951d42fb1d361ebd6fadddfc9a5432b08bbd75ee2ea1 SHA512 78d3fa064184d94b1bf6a026289b6595ca7f7262972f44c07a9e85b2900d6267dfde9c8fb304778f2be010411ac7652da7185d47df0ff2368d3e478a40d705e9
 EBUILD pkgcheck-0.7.7.ebuild 1407 BLAKE2B bc83dcd07125125157e16576be2e4e6e34e46932b35a91dcaa7cb5fcbd2bfb2409e7bc4c8a5bee8625585b5f675255fd616e1824e2fe4f48e4d17d8f4832f58f SHA512 e2bb02ed14cc6edf66ca20b473bcd90e24e5c5582717fc4a6abadf42fc91fb93f8003ddd19d75b53e7d9151a5cd6bb7f95580594f92d5b95e5329126638585d2
 EBUILD pkgcheck-9999.ebuild 1407 BLAKE2B bc83dcd07125125157e16576be2e4e6e34e46932b35a91dcaa7cb5fcbd2bfb2409e7bc4c8a5bee8625585b5f675255fd616e1824e2fe4f48e4d17d8f4832f58f SHA512 e2bb02ed14cc6edf66ca20b473bcd90e24e5c5582717fc4a6abadf42fc91fb93f8003ddd19d75b53e7d9151a5cd6bb7f95580594f92d5b95e5329126638585d2
 MISC metadata.xml 328 BLAKE2B b84dba717460e84f7ee3163fd8d6a5f13eb3b15dd1bb749f6ece81f062e3530988dacefadb24c1395eb36593a7ab6d868b06c8c4ee8f620a17c85faf04283b24 SHA512 5696505214a737ad495b23bfac2a51fbbc5b1e815eb6fcbabb3c6674325f05e3f6f418de05257c08935e389e47879e8a2d1b3723ec86aeb5ad97c6110fd2ec75
diff --git a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
index a10c633b3513..c9a7b19354f0 100644
--- a/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index a7ced08d628a..8fc1ca6c9acf 100644
Binary files a/gnome-base/Manifest.gz and b/gnome-base/Manifest.gz differ
diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest
index 2943bd9e2c36..9c3cd9d2c414 100644
--- a/gnome-base/gnome-shell/Manifest
+++ b/gnome-base/gnome-shell/Manifest
@@ -4,8 +4,10 @@ AUX 3.34.4-custom_stylesheet_crash.patch 17904 BLAKE2B cff95bf20f9b2e35daa885cbf
 AUX 3.36-defaults.patch 1463 BLAKE2B c529ac85d19699d0837f4060011b8b7dd03773af4425ea27f4b87841ee6a77f222ee242e34550ca3807dc7330e0c411576f3e4e8dbbaacf684b7ca706133cc81 SHA512 f6656b0baaf53d919ee8ad54550909aed9b86280de3f6ac3667d6a3506834476024cf42087860a4ee431d74dbcfa1c066e37d6d012450d76dbfd498fe0f1fb46
 DIST gnome-shell-3.34.5.tar.xz 1558672 BLAKE2B 7b786a35b6b79a4532d9bbb761ee0629cfb18b8c4c151f5958bb9169cae01ddb489a31c9d1a0cfef3ab6dd1f29c449600c1ad9bb11adbae284e86035bec15234 SHA512 ef6a70b0b3bb14fedb07c465742fe0d78c96ddd24352fd0babf871336ee404f9823cadea5bd522e388f5b714d33b219c8ff2badaed379b7135dd90de9fca9bc4
 DIST gnome-shell-3.36.4-patchset.tar.xz 26296 BLAKE2B 8310ea9dc6b4b738abd274c6ccb274ed59e840b37292f554f8217cef5cad979d2a54b15cffcd1cc62b00bfbb3555215c193a02f98f324969eff53df91fbd523a SHA512 ffdafe7eb3f7c5c67663c7e0c5fc1cf3f756d35fa3aafc1a5765872362c4d0caf9e50c1733411b1a156a30c8433dff04cd3e1cc2cc2d507c386deaabbf315f22
+DIST gnome-shell-3.36.4-r2-patchset.tar.xz 26900 BLAKE2B a230634e02c99b666fe283b20c84831b5e607431693f807ab9f3daf0b9be1c833b05755536faf860c8157e9dcfa9dd4d0942c0b042c130f83966f051a8998b5c SHA512 86a4e0bd448666022d4e9d036ecfc095b85ba368a4f1d1bda94e37565c1910039fa60032e687f80b68b4784264f6aaca2e382d775534b987fa3520f17be4ea16
 DIST gnome-shell-3.36.4.tar.xz 1774584 BLAKE2B 92fe544ae743235c673628f2ad82a75f58eaed94547fc3e0728a492cfee22783cb9d820ac55e1e125bf2ce83dadbddece7222eef9bad0891bfc5a7097ddde4bb SHA512 879b1590d516e7e9e1ad066c870023d59cbaaca13e1e77d8b14de302574b3138451c4b8ab0ba1b43aec3e6e03bd147304e8e0e995359b181522a790afc97d450
 EBUILD gnome-shell-3.34.5.ebuild 6768 BLAKE2B 72b4934d79160c38f7868b4afddd6490cc936a0dbe73af07fcecd9f7c1434d4b96afcc036d53ac2b4d746429c9bd910c9333a97a994f64f757a1760136928302 SHA512 3a2cb1659aabe6995d27646fb5c1d5576335a96cc9b62f00e488b39694c4470f3f16185e92c71ea105449f2af6667511fff3fabfeb7d3a7b2a370412872d7357
 EBUILD gnome-shell-3.36.4-r1.ebuild 6659 BLAKE2B 8ca0794658905200f5fc59611fa492d3b695761cd2d8a39cb838668b9fda13be7e087cfd1f6162232898c674534af19674a166b1266be304074757eb0cbd2b2c SHA512 e8b84c9bf8813d241e9c5d2e14d52c572027268afd83cc4346123680a0ecd1d313e4a2d7dba654f7c922803a902557c8ee9b312d0aa94fc18872832d4f0ce48d
+EBUILD gnome-shell-3.36.4-r2.ebuild 6663 BLAKE2B a8539a191513d9f6d920c0c5ac77d8309a966bb77f1f145cb812c9db8043e991ead42b3e1731373986b672f2cc88ac7f1667cd29400c6fee80aee6b58af92f4a SHA512 6c2ae4013a23164b2a2d2f921c3481a48f37ad34b4afc693e12c3e8225014d4609a46d97560a7707c1908e88f7e1b25c2528f54ca59d4f17ace040c780fee23c
 EBUILD gnome-shell-3.36.4.ebuild 6269 BLAKE2B 06d4534f16b3b2f37ba01f8f2c8059296c990f1e7ee13f8b344eb6b349e051b9f1d5ac1f3aca516bae3a14634242bba3af87c773a2ad9b63fdd483754bed8831 SHA512 1ea6d81aef9e70137324d94b910193d7dc8ab6032188cc262d6f0c99d8adfd775f501f93fa185c088ab8232b14ef24a1d137e80dd6bc108344c430f9a505437c
 MISC metadata.xml 1050 BLAKE2B cf97e536a47f3b023e118a818bbc34af63500d2ea94bbc71201d2ce18aa6e473673cb28a47245de24b7bad9a174a6dda6b46c300518521c8ea0662e88e95627d SHA512 50c1d4c3eacb89b77bc49b4f236bba9d9041ef047392d5bda19e85b0c935709a095a388b1625a2c77c66145758e9b4ab77a202aa6cdd2b86f262c5b56e428b06
diff --git a/gnome-base/gnome-shell/gnome-shell-3.36.4-r2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.36.4-r2.ebuild
new file mode 100644
index 000000000000..106118412d64
--- /dev/null
+++ b/gnome-base/gnome-shell/gnome-shell-3.36.4-r2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 virtualx xdg
+
+DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${PF}-patchset.tar.xz"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+IUSE="+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( elogind systemd )"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+# libXfixes-5.0 needed for pointer barriers and #include <X11/extensions/Xfixes.h>
+# FIXME:
+#  * gstreamer support is currently automagic
+DEPEND="
+	>=gnome-extra/evolution-data-server-3.33.1:=
+	>=app-crypt/gcr-3.7.5[introspection]
+	>=dev-libs/glib-2.57.2:2
+	>=dev-libs/gobject-introspection-1.49.1:=
+	>=dev-libs/gjs-1.63.2
+	>=x11-libs/gtk+-3.15.0:3[introspection]
+	>=x11-wm/mutter-3.36.0:0/6[introspection]
+	>=sys-auth/polkit-0.100[introspection]
+	>=gnome-base/gsettings-desktop-schemas-3.33.1
+	>=x11-libs/startup-notification-0.11
+	>=app-i18n/ibus-1.5.2
+	>=gnome-base/gnome-desktop-3.35.90:3=[introspection]
+	bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
+	>=media-libs/gstreamer-0.11.92:1.0
+	media-libs/gst-plugins-base:1.0
+	networkmanager? (
+		>=net-misc/networkmanager-1.10.4:=[introspection]
+		net-libs/libnma[introspection]
+		>=app-crypt/libsecret-0.18
+		dev-libs/dbus-glib )
+	systemd? ( >=sys-apps/systemd-31
+		>=gnome-base/gnome-desktop-3.34.2:3=[systemd] )
+	elogind? ( >=sys-auth/elogind-237 )
+	app-arch/gnome-autoar
+	dev-libs/json-glib
+
+	>=app-accessibility/at-spi2-atk-2.5.3
+	x11-libs/gdk-pixbuf:2[introspection]
+	dev-libs/libxml2:2
+	x11-libs/libX11
+
+	>=media-sound/pulseaudio-2[glib]
+	>=dev-libs/atk-2[introspection]
+	dev-libs/libical:=
+	>=x11-libs/libXfixes-5.0
+
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	media-libs/mesa[X(+)]
+"
+# Runtime-only deps are probably incomplete and approximate.
+# Introspection deps generated using:
+#  grep -roe "imports.gi.*" gnome-shell-* | cut -f2 -d: | sort | uniq
+# Each block:
+# 1. Introspection stuff needed via imports.gi.*
+# 2. gnome-session needed for shutdown/reboot/inhibitors/etc
+# 3. Control shell settings
+# 4. logind interface needed for suspending support
+# 5. xdg-utils needed for xdg-open, used by extension tool
+# 6. adwaita-icon-theme needed for various icons & arrows (3.26 for new video-joined-displays-symbolic and co icons; review for 3.28+)
+# 7. mobile-broadband-provider-info, timezone-data for shell-mobile-providers.c  # TODO: Review
+# 8. IBus is needed for nls integration
+# 9. Optional telepathy chat integration
+# 10. Cantarell font used in gnome-shell global CSS (if removing this for some reason, make sure it's pulled in somehow for non-meta users still too)
+# 11. TODO: semi-optional webkit-gtk[introspection] for captive portal helper
+RDEPEND="${DEPEND}
+	>=sys-apps/accountsservice-0.6.14[introspection]
+	app-accessibility/at-spi2-core:2[introspection]
+	app-misc/geoclue[introspection]
+	>=dev-libs/libgweather-3.26:2[introspection]
+	>=sys-power/upower-0.99:=[introspection]
+	x11-libs/pango[introspection]
+	gnome-base/librsvg:2[introspection]
+
+	>=gnome-base/gnome-session-2.91.91
+	>=gnome-base/gnome-settings-daemon-3.8.3
+
+	x11-misc/xdg-utils
+
+	>=x11-themes/adwaita-icon-theme-3.26
+
+	networkmanager? (
+		net-misc/mobile-broadband-provider-info
+		sys-libs/timezone-data )
+	ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] )
+	telepathy? (
+		>=net-im/telepathy-logger-0.2.4[introspection]
+		>=net-libs/telepathy-glib-0.19[introspection] )
+	media-fonts/cantarell
+"
+# avoid circular dependency, see bug #546134
+PDEPEND="
+	>=gnome-base/gdm-3.5[introspection]
+	>=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?]
+	browser-extension? ( gnome-extra/chrome-gnome-shell )
+"
+BDEPEND="
+	dev-lang/sassc
+	dev-libs/libxslt
+	app-text/asciidoc
+	>=dev-util/gdbus-codegen-2.45.3
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.17
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# origin/gnome-3-36@03062d0d9d9f + try to fix crashes related to custom stylesheet; triggered often by package installs (probably desktop database update), screen unlock, etc
+	# https://gitlab.gnome.org/GNOME/gnome-shell/issues/1265
+	# https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/536
+	"${WORKDIR}"/patches
+	# Fix automagic gnome-bluetooth dep, bug #398145
+	"${FILESDIR}"/3.34-optional-bluetooth.patch
+	# Change favorites defaults, bug #479918
+	"${FILESDIR}"/3.36-defaults.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	# Hack in correct python shebang
+	sed -e "s:python\.path():'/usr/bin/env ${EPYTHON}':" -i src/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth)
+		-Dextensions_tool=true
+		-Dextensions_app=true
+		$(meson_use gtk-doc gtk_doc)
+		-Dman=true
+		$(meson_use networkmanager)
+		$(meson_use systemd) # this controls journald integration and desktop file user services related property only as of 3.34.4
+		# (structured logging and having gnome-shell launched apps use its own identifier instead of gnome-session)
+		# suspend support is runtime optional via /run/systemd/seats presence and org.freedesktop.login1.Manager dbus interface; elogind should provide what's necessary
+	)
+	meson_src_configure
+}
+
+src_test() {
+	virtx meson_src_test
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
+	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
+		ewarn "To make use of GNOME Shell's built-in screen recording utility,"
+		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
+		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
+		ewarn "apps.gnome-shell.recorder/pipeline to what you want to use."
+	fi
+
+	if ! has_version "media-libs/mesa[llvm]"; then
+		elog "llvmpipe is used as fallback when no 3D acceleration"
+		elog "is available. You will need to enable llvm USE for"
+		elog "media-libs/mesa if you do not have hardware 3D setup."
+	fi
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=563084
+	# TODO: Is this still the case after various fixed in 3.28 for detecting non-working KMS for wayland (to fall back to X)?
+	if has_version "x11-drivers/nvidia-drivers[-kms]"; then
+		ewarn "You will need to enable kms support in x11-drivers/nvidia-drivers,"
+		ewarn "otherwise Gnome will fail to start"
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 2c8602eb0aca..b837bb9cbd52 100644
Binary files a/gui-apps/Manifest.gz and b/gui-apps/Manifest.gz differ
diff --git a/gui-apps/grim/Manifest b/gui-apps/grim/Manifest
index b6475db858f5..a944658e078b 100644
--- a/gui-apps/grim/Manifest
+++ b/gui-apps/grim/Manifest
@@ -1,4 +1,6 @@
 DIST grim-1.2.0.tar.gz 14445 BLAKE2B e833afe5e57768e269ece0d7f99653810424449840867a37f02db4645a0dedd7829241d24a39ca00e844505ab5d2408891aac325e7f6ddd2011884fee240b44b SHA512 d58e392f00b93e031fd46a9e0175aaa5c3ce4fafb2afa3cc97ff28a9f77fc5583774f6ddf86295262749c00dd7c4e98c6041588bfa6fd70319ddfce6b903414e
+DIST grim-1.3.0.tar.gz 15103 BLAKE2B 3a0ad4370b2a074945b1412ded14b90155a0138337314a1834dc25217e2ce13b2ca5c925fd164c9363dff059def4caab036d01b5b68c21211af4ace11e558c02 SHA512 de56046375da1a0c4d787a39d97e18af964dbf40b0d18c6f99c68b4bf054cf6712ba653d69711d3bc6f50870a23649959d67c0b150ac5c637e8c9e74b0eba2e6
 EBUILD grim-1.2.0.ebuild 865 BLAKE2B 1c444c860c77a34c402170ae6e11d3842892771acb8edef033ffb555174a3d23e6d52eebc4213fbed2180d69ef44ca4f2dc1e22b5327bb745be27c179c764f5d SHA512 a4edacbae42d0193a0b33f469ef905d078b2aa60ae1b267ac4614965bae7d6c91d0af174e8e5678b7debc6026fa42a301ff10127a5843f232f86a789804b400b
+EBUILD grim-1.3.0.ebuild 865 BLAKE2B 9925649fca5f87f9fe358314234267f6fb5c42d27233ebf1f2196de3f69da78027f71513334513ddab62b0c9494a0968d6302c97e75cc2b4e31e75962add309f SHA512 156ae9ec3edd284dc3f1d4b8a9ff36e0acf0d0a764f3a4d53d8f3053d1c2183ae45084e35c1d4be92fa80f9b243b48a6884ffc5706f13390b345c7b188d4498d
 EBUILD grim-9999.ebuild 865 BLAKE2B 1c444c860c77a34c402170ae6e11d3842892771acb8edef033ffb555174a3d23e6d52eebc4213fbed2180d69ef44ca4f2dc1e22b5327bb745be27c179c764f5d SHA512 a4edacbae42d0193a0b33f469ef905d078b2aa60ae1b267ac4614965bae7d6c91d0af174e8e5678b7debc6026fa42a301ff10127a5843f232f86a789804b400b
 MISC metadata.xml 630 BLAKE2B ce32a102600df756ba3996da891e43b505b7d06d3023707c28bf0d5b747a35e56e493e839b099b7fe52e7baec780de857e4df8c9c7280da960de56932e3dbd18 SHA512 1ab3eae93d0c5f1f060d06488d9200e2c7228c72ca71763b12e9dd2f8555f38efb149f7641dccf9ed86168220f9193f7124616f69e6790784594a59ed9f92547
diff --git a/gui-apps/grim/grim-1.3.0.ebuild b/gui-apps/grim/grim-1.3.0.ebuild
new file mode 100644
index 000000000000..314e4d76d166
--- /dev/null
+++ b/gui-apps/grim/grim-1.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Grab images from a Wayland compositor."
+HOMEPAGE="https://github.com/emersion/grim"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+else
+	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man jpeg"
+
+DEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	dev-libs/wayland
+	jpeg? ( virtual/jpeg )
+	x11-libs/cairo"
+
+RDEPEND="${DEPEND}"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( app-text/scdoc )"
+fi
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature jpeg)
+		$(meson_feature man man-pages)
+		"-Dwerror=false"
+	)
+	meson_src_configure
+}
diff --git a/gui-apps/slurp/Manifest b/gui-apps/slurp/Manifest
index 56b21d2ca877..bea7614e9b9a 100644
--- a/gui-apps/slurp/Manifest
+++ b/gui-apps/slurp/Manifest
@@ -1,4 +1,4 @@
 DIST slurp-1.2.0.tar.gz 15317 BLAKE2B 92de74abb54b2d53334e0f0c5d08b0b50e9c4583eb192226e38fcefa07cce2265f808ce81c04170e65d3c1209fa263352e3d70cc0a7cf745ed5e18d57c4d3af6 SHA512 443cd497049a5128e80a48c7b2afcc555a8d58a5eacc2dc6207058a9a399bc9e9804c7bca8b010af63f8be99000c05245720bd3e8cca248a74d5aa63a7faf4f9
 EBUILD slurp-1.2.0.ebuild 851 BLAKE2B a800a162e24f187d6034e55c84be3819edfc53d810282c59d864324c7912fc3b68ce05b3a2d25e62cb73ff13b8e2974079fa452b66d8227d6569f2aa0f776781 SHA512 643157353085abab70748739e4fa9f7f1d6abde60fa504fc405904170559d453fc829700fb45be423c3a9a7807feaa3a1ba531439763e8ad2d16817e02f64631
-EBUILD slurp-9999.ebuild 776 BLAKE2B 21ef37528c843b14519c19914f61da5e98e7e9428a5e1db06b0fec8696327cdc46b787bf9f968802ca13e96050d44cbff541eb2ad3a2f62010bd267a7a8c7523 SHA512 04ae9dff0514afb268ff4576f847b345917787a374b2624bb74525ab414c83db8543e9c87189026bb8d53f866f1672ef0c2bb950d6101cf4a0eda6c05fda5800
+EBUILD slurp-9999.ebuild 793 BLAKE2B 7f071a9a0247b4c77a4ab1eafc3ccf9ad2c02e394a9a9ac746406481d268a2a393595751bc33a5e7e1ed361deee94a11a06386ba8b5cc80a818611e3d1f1e59c SHA512 9032523746be0c4d4d42d93acdc24555a14f4878baf0ff4cf5ef03a643d14524d8cd4d2dc5aa31fedd80a9dbcfb3a9e7f76faf768165ac3ff4d2a36ffdf573a9
 MISC metadata.xml 579 BLAKE2B a9785dbcd765e212d183bca9d1cb4cf6fd37ba4d2d7cdee38aedf75951712fc6fad1f0f94242244b3263de058ad10c42a31a5c1400a3c237b5c21df37d3ae69b SHA512 a59c2a0ba5ab75d1355e14c6b6db241cc0a45fedfa52a4195aa1b77c6568bc3584d40c64777b7f342ab28cec4595ee1c176f25a4e1f04ecca6e5b71c1ea0d004
diff --git a/gui-apps/slurp/slurp-9999.ebuild b/gui-apps/slurp/slurp-9999.ebuild
index 5c6fe52e5b6b..fb2c435d74cb 100644
--- a/gui-apps/slurp/slurp-9999.ebuild
+++ b/gui-apps/slurp/slurp-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,8 @@ IUSE="+man"
 DEPEND="
 	>=dev-libs/wayland-protocols-1.14
 	dev-libs/wayland
-	x11-libs/cairo"
+	x11-libs/cairo
+	x11-libs/libxcb"
 
 RDEPEND="${DEPEND}"
 
diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index eb97290015d3..e837abded5f6 100644
Binary files a/gui-libs/Manifest.gz and b/gui-libs/Manifest.gz differ
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index d3075bdfdeb2..c6b28f4e7113 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,7 +1,9 @@
 AUX wlroots-gcc-10.patch 1020 BLAKE2B a3548355bd2374e590c83b873d1381f76857891aca5372190cf11e5e58bbd5d6909ea204674537bd3c5955cd2ef19d6cc3589dad5520a989dcdcf3ea4a694d07 SHA512 e09695602898104e03a6fa4d05fde2b617ef536460ae0ea1c9a5d35f704fe4d114bc405652f499570593a1b8cc61c5d0bd219bab5529d254f519e73ee23852a1
 DIST wlroots-0.10.0.tar.gz 454540 BLAKE2B 0d2326a62267019001be5f0d79c7b5c937ed20b952c92f0dd8cb04c3a0c06f3ef58723f552b1da1b947ea50ad91df46a543ec9705dad588db800bfa944743d11 SHA512 0e8e0c37f1afb1d99f0ecb3c2282992ffd06381aaa396c7234ead9f3ff2d5c599e766b677680ebaecf68e792054c3e42657d24f32d08bc8bcf35f9eb4bdaa876
 DIST wlroots-0.10.1.tar.gz 455232 BLAKE2B 0f4def61d8501b7746ccc589d59586b3641340fb7633b0c4a7b518f1b1b5285c1ee71fb629aa0a0e649c15a4ae69b5cfbc7a034c96e545765a96ddda35f10609 SHA512 e1af5a5b6484b5f4060090e13d22d699d5aaa6926e1a6b1043d2b900f88a002ed67dacf8498f23ed3008bf8a35500f415f95b3dbcf50de5da354f309f9161d58
+DIST wlroots-0.11.0.tar.gz 481126 BLAKE2B d2262298f24948293643b02c823851b4643289f776bc087d7b67240f4c9c76a7aca03c7dc7e13a65b3d0d3a7c8a5f5246a0e282d2cb3b88bbae0ef94b906f18a SHA512 a8a0c498d10664ff0a5aab8ad1a4fd034179542eff38b058e1da7e4653c42136e4a3586634f3d0a25a985aa7f4c5d17260117d9f4a70a7f8060494c04456f575
 EBUILD wlroots-0.10.0.ebuild 1882 BLAKE2B c438d4d1e895ad8c539ccfd69f32a80ceb609b139e2b14929f6e5d173184e01026978531919805b3602530813ecbbc5abe5393933b1fe34bf374b86f830129f5 SHA512 269a1ec002a5e80bc5384833025135eadba865e106009d214fa24271066344d1a8876d7b1832483a78ffdd59f1b2e2d009c26eeee1370027132ddc16bd12ba7b
 EBUILD wlroots-0.10.1.ebuild 1949 BLAKE2B 3e7e878846b1d2911b3fe2f34483757e48c918fe33ecf7b84cd664992b070bbb96a2e1495a85c7e58631231708384116b251ebf4f5c41f1f1820c6090732ae05 SHA512 28a91c1e0c5ed36e4b6f4c47d8f8609b8762936172b5ad22dd464e76041690930b80dbee5af01d4680ad6215af8ef55aa69cea3fc9e2d98b2e2fbbc58859c29e
-EBUILD wlroots-9999.ebuild 1868 BLAKE2B 0a3ec528911987688a69ac334fc9a4d9c50306e1bfd4df5c7a7a4df6c8bc057f2ff4454e8d3aa21b3217e9b6b8b08620cec6c69d9c7a6e8bcf12ceb46e1f14e6 SHA512 7b00c440de3dea8082e82c52975afefc209495e294bb905be8bce0ea2b42f1546fe5f837c01c456ebeb1d7d7da17c8f3eae5dd2c74ab361721b026126d966f66
+EBUILD wlroots-0.11.0.ebuild 1860 BLAKE2B 620db003337167d00ef9126e5e12b9f391280008d7e1c508d24e5cc46452a68b15d324e2d45e37c9114f41dfa46a86ca2d53fe2932e82352e7aec6f69e4f0288 SHA512 a635e1eb74699bee9827f5cecce4b51a7dec44a4910f001396beea531041ca918c72af92ba28f9ed6ad8fbb100186dcb67d589c695b70a8d930c9c980b08bcae
+EBUILD wlroots-9999.ebuild 1860 BLAKE2B 620db003337167d00ef9126e5e12b9f391280008d7e1c508d24e5cc46452a68b15d324e2d45e37c9114f41dfa46a86ca2d53fe2932e82352e7aec6f69e4f0288 SHA512 a635e1eb74699bee9827f5cecce4b51a7dec44a4910f001396beea531041ca918c72af92ba28f9ed6ad8fbb100186dcb67d589c695b70a8d930c9c980b08bcae
 MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99
diff --git a/gui-libs/wlroots/wlroots-0.11.0.ebuild b/gui-libs/wlroots/wlroots-0.11.0.ebuild
new file mode 100644
index 000000000000..6496ad0a75a2
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.11.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/9999"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.17.0
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	>=dev-util/meson-0.54.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
+	local emesonargs=(
+		"-Dxcb-errors=disabled"
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index 35d3047c671d..6496ad0a75a2 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -23,7 +23,8 @@ REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
 	>=dev-libs/libinput-1.9.0:0=
-	>=dev-libs/wayland-1.17.0
+	>=dev-libs/wayland-1.18.0
+	>=dev-libs/wayland-protocols-1.17.0
 	media-libs/mesa[egl,gles2,gbm]
 	virtual/libudev
 	x11-libs/libdrm
@@ -52,7 +53,6 @@ src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
 		"-Dxcb-errors=disabled"
-		-Dlibcap=$(usex filecaps enabled disabled)
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 3b31734a97be..31fd7f20e09a 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 746523c13b2f..51fccbc0eb82 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,7 +1,7 @@
 AUX sway-1.4-gcc-10.patch 1147 BLAKE2B 5ccd4d4b5320389f0b0f521bf40c1d68016098951b2196f5045b6323eb622ea865390d82c01b4a12ce3e77779fbde60a5ff452a58a3121bf83284af961bdf7b4 SHA512 1aaa87327c4f2b83325de3eb33d5976a62e60fab0d95e78bee7697f1293e326b039bbb135d2b0dce17328fe95705b87b4e206b4605cd212d914cb5714f03bb69
 DIST sway-1.4.tar.gz 5514489 BLAKE2B 31eb1aee32079e643cc7a0263a097000c089e36916ea2a681e1ec696f8329e7ecfe3c8a981ec3b6d4e3dd99c8e263b2c208dbe602308d6bdaf4cdabbb3c10971 SHA512 3b280bdfdbdae8fb9b4f555bc630c64e7c1d09f7b2c783b99413863a6b620d50cd2b6d10d63e11fdfb9c678fce9a403228ac52fa69fb52561ffbd06790505a71
-DIST sway-1.5_rc1.tar.gz 5535472 BLAKE2B 54ecad147a7ce262231196afd8853bef2093e43516b89397d3fdaeb891beafeab29ca23aa12de02801b875330864261454a63593c881a25a12f85c0dedecd200 SHA512 0841122414d719ba183caf4c4ecb314d8a262a091e674f6884ed2f4f37f1e922f1415ecf985e81c785d5646481628f14c684523087a2dd7664628120be423a28
+DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4
 EBUILD sway-1.4-r2.ebuild 3130 BLAKE2B 693a483255dcc93f975cf8ed229499fa944cf094fa18372d095141e3757438fd0788d9082999700b34f3a020d641e3e0c694da652c228b4dc3788df1eec7fefe SHA512 5a5a0de6261f2be9f35357c84c893290e63e7234bd1e474a3e418f07bad344b3a4f9cec6d9cc2076e1f526df920a3f46eb8f21a19e567608bd42fd5f59d875c5
-EBUILD sway-1.5_rc1.ebuild 3046 BLAKE2B 0e73428d39e84d4ddb6b8b5bbd5704820c38485144933864a9e332fd7287b78533bdd431a3ca3e64126198f185cfcda7184aed91a6d73105012c397d03bbe257 SHA512 7f8a97b261e970488f34d9e9cd1c3b0bdf6e3274272b6fc024ce243975791666a9ccd072d5ab403460ea61a4ce99e802c3cccd600c968de182b5cf0ddb94d543
-EBUILD sway-9999.ebuild 3099 BLAKE2B d0c795d635b4c5f449972597906f82bdc9f3fc04324071a5b74989a6496d8b93f686a3308535a81b0c420291d3b2ac0d9a9a86386911a208bc76975e2e560fd7 SHA512 feb93d35d39d6558aeb614af0008e0c4b1a2426250013998ab72784fee2144865966342a64c973eb7a41333da23133b3411b93cf9c1330259389749df5515aff
+EBUILD sway-1.5.ebuild 3124 BLAKE2B ab46472c87e47763615ba86ac40a4b79c010c4565c3e11546ed56de119758c54914c43fad9d39199eccc6c5ca8b43a270308958bb1d68cd147a418970cbf4b93 SHA512 90442f48633fbd3358449b6b2eab95055f496d1d2bc6ddca3810ba8e9ea6d5ec1f9dc2a16adf52705fd277bffef166ebe0c772dc8ae19b2c018d46c16e348e84
+EBUILD sway-9999.ebuild 3124 BLAKE2B ab46472c87e47763615ba86ac40a4b79c010c4565c3e11546ed56de119758c54914c43fad9d39199eccc6c5ca8b43a270308958bb1d68cd147a418970cbf4b93 SHA512 90442f48633fbd3358449b6b2eab95055f496d1d2bc6ddca3810ba8e9ea6d5ec1f9dc2a16adf52705fd277bffef166ebe0c772dc8ae19b2c018d46c16e348e84
 MISC metadata.xml 2374 BLAKE2B e17f6ebbeca77d00043359eb5eec3cf6070c8b3ef1c852dbcbf9ef69e2ae558b78eebf37485e21d475d45f33015a97bc6a61740e158d2aafd1695b842262b5bd SHA512 e232fe896f8fd0c8e7293093fba00c03604771740e5984978f32605f62e86f5d97d5ba95a10488b354d30d65a94bb33a051e21196bba1b0693ee13cef09ce33d
diff --git a/gui-wm/sway/sway-1.5_rc1.ebuild b/gui-wm/sway/sway-1.5.ebuild
similarity index 94%
rename from gui-wm/sway/sway-1.5_rc1.ebuild
rename to gui-wm/sway/sway-1.5.ebuild
index 86f96883dab7..08f025b76e3f 100644
--- a/gui-wm/sway/sway-1.5_rc1.ebuild
+++ b/gui-wm/sway/sway-1.5.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_PV=${PV/_rc/-rc}
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	#KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
@@ -47,7 +47,8 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
 else
 	DEPEND+="
-		~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+		>=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+		<gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
 	"
 fi
 RDEPEND="
@@ -56,6 +57,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
 	virtual/pkgconfig
 "
 if [[ ${PV} == 9999 ]]; then
diff --git a/gui-wm/sway/sway-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index bf84713b3e9a..08f025b76e3f 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -47,8 +47,8 @@ if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]"
 else
 	DEPEND+="
-		>=gui-libs/wlroots-0.10.0:=[elogind=,systemd=,X=]
-		<gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+		>=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=]
+		<gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
 	"
 fi
 RDEPEND="
@@ -57,6 +57,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
 	virtual/pkgconfig
 "
 if [[ ${PV} == 9999 ]]; then
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d048b9915b9c..663370102a98 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/flameshot/Manifest b/media-gfx/flameshot/Manifest
index b14bc881d9ca..2787b3eaba50 100644
--- a/media-gfx/flameshot/Manifest
+++ b/media-gfx/flameshot/Manifest
@@ -1,5 +1,5 @@
 AUX flameshot-0.6.0-missing-include-fix.patch 869 BLAKE2B edccee0ef880470652535d65797800dc675e40556e4cdf560e257e60e649924316e5a0fdc271507763d90734fc60290e1ddecab417148542e8b318041ca9690c SHA512 852a3c12e1fee4a90e6a31c5c17a371a2b44fe1a399a6e11f8a760d5436ea73fa7aed9ebb906f67f7efbd4315e9c092c7cdf76a464f916df6893cc13bd361f7c
 AUX flameshot-0.6.0-unbundle-qtsingleapplication.patch 1505 BLAKE2B 51b8c59945f580d7777d4f9aeb954196bbd7e473301153053d451e0e07f08abb50a21fb993f940ab6ab40bfbbc6a14e04852d8e6a54e7ce4047ab64feb8cc2b5 SHA512 7543862bdead4f58435be97d09e4045ec1a9e77f90947c55076510da891627e189dc052cbd4ec8947203d5fa2c985220c2cd3fbb6cb9470222b3f5d42c61cf14
 DIST flameshot-0.6.0.tar.gz 641561 BLAKE2B f9e87373d84c1a841f70cd9c13b504865a0ef23d0fb29848f2270171459afe9c6852e12c712ebdc7cf3cfc62214d7b7507b85cf21838d0ebed33bee1e39f4aad SHA512 194127032ab0f62a6ba2698688e11b2d4e6f0e04a282144f5fbb6c232eeebc71371af2d55abbb6e98b8649dee036e6f0a6ef55710e4321a60fd5ac6e453ab975
-EBUILD flameshot-0.6.0.ebuild 1091 BLAKE2B ce6e09d94b1e634f32f8bb2fb59cdad200201aa81845dce1067046c7c86d1ef78a856960c91b16263eb80e6ac8849826dced4a25bb70c517d614cbf7fff05db9 SHA512 97d3a629128bfd55e378147590964e17646e86630e862e9b8720ecf7b271b9e55ff33d9dd06cae1bb13f735a016b6a706fc555163ea9ec882790915dee5b07ba
+EBUILD flameshot-0.6.0.ebuild 1128 BLAKE2B b6a122c46a3f69e662ef2ef9e12b5d7d82a032f6da62db2b833039acdd6f1991a7bea39e4ee90298a37ea341d9e78f0189e515f8769bd861ed9e8b56899a3bee SHA512 ab7825e1ef995c7df8896a7f682df8f719835f1a65f28c8dc92ce26b00c80b17eaed7e32de16cabb1b163bc1f950ee7e01f3eb92a4af002f00082e50000e0ce2
 MISC metadata.xml 366 BLAKE2B d8c8e83d8fb96199510eb45285312ca146aed73d76fd29ef52cd12cedd3b792621206b8ef064694ee60e12f73b932c6466051c85d0e1e2d8782aa2c00cb0bca4 SHA512 1bf8b212a62d64e14786dcf7ba6f97db414e04655fe0625d5ddc5b86d0e36f0c285f9722cdc1fedd39284e1331b167b947546c37b8a3a5441d59dcdf792a2506
diff --git a/media-gfx/flameshot/flameshot-0.6.0.ebuild b/media-gfx/flameshot/flameshot-0.6.0.ebuild
index 08fa91211c6b..7c9bcc840ba2 100644
--- a/media-gfx/flameshot/flameshot-0.6.0.ebuild
+++ b/media-gfx/flameshot/flameshot-0.6.0.ebuild
@@ -24,6 +24,9 @@ DEPEND="
 	dev-qt/qtdbus:5
 	sys-apps/dbus
 "
+BDEPEND="
+	dev-qt/linguist-tools:5
+"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}/${P}-unbundle-qtsingleapplication.patch"
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index c184f5396aa8..068a76fcb393 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -16,7 +16,7 @@ DIST gimp-2.10.20.tar.bz2 33108938 BLAKE2B 060c0e46e6f4ac861de265842d545285c2fa4
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
 EBUILD gimp-2.10.14-r1.ebuild 6140 BLAKE2B df34bd1bc35873d51aaec12fba454170ce08b2b10f183d00eb56adba4cc40f56877481831b319c11fa8cbbe6fe17929c60341c918610c20fca2355607b876c22 SHA512 3f86c2237be7978066780679326395666d96bd22d4e389aac60f2a0989939e809ad51f2f12018b5a4fbd7d1bbe1469b034c74c86e4321ae6fb8f8caacca9a7b1
-EBUILD gimp-2.10.18-r1.ebuild 6157 BLAKE2B d877545e911f0d707447d885bb83b83dd1bd37cb3db79ee3afd23c52949d91e321ca748f7e632146b5b56264589f633a235b9b4fd9cea3783d29d2c6b5a2d503 SHA512 564dd35735219c97cb9b8caba0aa1aaf782231a6a1cc578596e06c5972bbaacbb0599bce9d8b1cb03ca95403db36bc3caa40cb934c957b2dd399b6d394857448
+EBUILD gimp-2.10.18-r1.ebuild 6162 BLAKE2B b71e6d69b8071f3e3b3f1969f8050d4b4804aab04949cd32dab1d722f6e44ad9955f3b41473063b8cb6d691109a496f28a9511a696c1b114427ed5520f70c6a3 SHA512 52c4da515c70122388d30cc714b751ea89e64237dc3efc67774f21a146da999d4fc74d3e6cead9593dd9eaa471b8b40941ced76e0f477c73875fd9801b53bb87
 EBUILD gimp-2.10.20.ebuild 5865 BLAKE2B 1a5a4fb52b6f63e44c6f98134ba568ad2aecd0a5512198fc9f061ea423c73c8a5218f5ae9a064ed9e1f93b158640a1621384b62bcb7cdd25d31c0935b7241aec SHA512 0ea9e1a6626ef9e48bfa5351029deff64bb2b349ad64367611ec2c81e9efe7775d7b729b9b947e0b6d75103f355efe64f0947c13195463dfb276d55d1a23e870
 EBUILD gimp-2.8.22-r2.ebuild 5139 BLAKE2B 7e659b356107042884fddaff1622c20f1b1d627840556cdba0293fc80c43832fe02883d65ef6b338847b80d0cc041d95f6cce02ea230d071aa5545d89f55e8f8 SHA512 5b32326f52e21dd544c1f92e0f51612fb8a662ac6fa0addce482d3a3e1e9516a55b0c6a9e679407afee94b77c60a0224719ff37cd5aabcc7936a949629d4f189
 EBUILD gimp-2.9.8-r1.ebuild 6068 BLAKE2B 86c853189f8a7aa5e6247d1f973337e3149ea44e13f4adc022b2e6f15eb51ecd4473e862721fd3ee841f5f36108230b2444039e5cb21898c274c97506a285800 SHA512 da7b01a4dafbd9d991ce050b3c8c5d1ce6b1f2d9cc8c4bde6463d5ebfcba2a8399c1f8f61062f1fb564c530acfea5036b6f8d5c3b4b1a291cd575a00df9deb28
diff --git a/media-gfx/gimp/gimp-2.10.18-r1.ebuild b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
index 0b0909f7b22d..8eefcb21a27c 100644
--- a/media-gfx/gimp/gimp-2.10.18-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.10.18-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v2.10/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86"
 
 IUSE="aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-gfx/iscan/Manifest b/media-gfx/iscan/Manifest
index 940d6b363f7c..bd2b83e8fb8e 100644
--- a/media-gfx/iscan/Manifest
+++ b/media-gfx/iscan/Manifest
@@ -14,5 +14,5 @@ DIST iscan_2.30.4-2.tar.gz 1236167 BLAKE2B 598e55aa7099f7973b38f5c3227415c8ddfa7
 DIST userg_revQ_e.pdf 627189 BLAKE2B ff57871c58dc541e30d65127bd8f4cc2a20ec5341c1d0914116f7ec4ae002d896853b99488eec71e5f8cb150e6b63d353efb9be11977de26d017701bc051014a SHA512 b09d5143855a759e0fa3e74794762566b6fbf734642f9d7f712e5f2f20e3dce6b830465fd65f83f9cc368292ce7a2c0cec709b0eba6356d95e1ba5114b3348fc
 DIST userg_revQ_j.pdf 734920 BLAKE2B ed2cffdc2dbf0a2403dcbd93cef3349b9e35afb305f9b36f92b8f11bd42b5281fc7bfbec108703f327fb538868c530418406d37505e6eb6afa621d2d49d007ba SHA512 d5cb0cebaae0ac36951379cad516f0575e85e0bb509cf88549239e300c7d6c6a4996497145acaa9e9783de6b08c6e352c7ffbedb23ed04c15eefbe9c3cf0bc90
 EBUILD iscan-2.30.4.2.ebuild 3958 BLAKE2B 3e1284c43d52dd91a6b9e88c2c8d5aef7ee76ed2c7b7a1e0d35781db6f5882efe1ea6c1b1152df86bf0b831941a271bf8c5a9c75fb2fe26646e99d2f73d17da8 SHA512 9b23f93cc94371c33036fec992c96baec8e94b743e732c8579755eec94cfc35ec79c95b879df664783818e03cff648c932e23217b856537a3875bab9c38a228a
-EBUILD iscan-3.62.0.ebuild 2273 BLAKE2B 4a02fac7387177a601987b9a95d1aa9a43ce2fad8d78ea0ddb1b24b66ba6f5f011eea84bd9f3ce3ae7d5c6342276f67d407acb95e1bfb9ad4c65dec87aeb5caf SHA512 8894b992db9e4edbc35621384443f329df1d28be28576cb495d3877df6e9e307d220c33f5529db6dfb5bb43fc6a3f57a96dd164e825df6875070ba2866449183
+EBUILD iscan-3.62.0.ebuild 2332 BLAKE2B efe846efa66cc80dc3675dc4e1cff7c20eb7902a8523e251bff906c694c0585f34a8f0779235339bdb58442deb8c3e03ae0fef425ca7c6b90ca0d56113da6ca0 SHA512 53ae2081a1956a68deb8dfa3f7b4312ff6b2239300a5cecb3d9aaf8e170906097ca056bf8e7c3c4e5cf566bd0336500305f1dcb85cf429513ecb50cd45a80049
 MISC metadata.xml 930 BLAKE2B d2cf4fae5cdcb660357ffe5566ad8d99eef6287f565a45f1824c810b3979e9d2930f458766ff524b231ef8dfd793062ff23cf4bfc2a78a36c5393a6c4224feea SHA512 d609a5cd8f8bbc7653e784d153757849eafb9c772355d0928325a6ecf673e8aa055623601d957f912709f9f16acfde5ca0b0480a1f2a17bfc24825895d861fc0
diff --git a/media-gfx/iscan/iscan-3.62.0.ebuild b/media-gfx/iscan/iscan-3.62.0.ebuild
index 7f8e4fae37b8..92b606786000 100644
--- a/media-gfx/iscan/iscan-3.62.0.ebuild
+++ b/media-gfx/iscan/iscan-3.62.0.ebuild
@@ -51,6 +51,8 @@ src_configure() {
 	# Workaround for:
 	# /usr/lib64/utsushi/libutsushi.so.0: undefined symbol: libcnx_usb_LTX_factory
 	append-ldflags $(no-as-needed)
+	# https://bugs.gentoo.org/720994
+	append-ldflags -pthread
 	local myconf=(
 		$(use_with gui gtkmm)
 		--enable-sane-config
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 796eca561631..d1aadd5864dc 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -7,5 +7,5 @@ DIST jhead-3.04.tar.gz 67754 BLAKE2B 4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152
 EBUILD jhead-2.97.ebuild 744 BLAKE2B 9ccad5df68d98ad6003a3b69a18661fb600de10f7326199ab7784cfb9bfc16b554bef37c5e555083503e09bcfbcc053cf8b018059b3995995ee2fe8d19c3bfd7 SHA512 39f2a2b352dfbdbe74bc4c188a688aa12623e33132a9afe487271e060c0e4eba7063ef28216796f026092449f1e87702becdadc07a7729108f97df6a725e96cf
 EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 5ab22c7fb0d1137d7a18f4020737dd30934eea11c00509288255205ee574e255af1b0de1092f8f3822d0dd7b86e3a9dc8b5b50fb327df7fccb5b83add9353464 SHA512 1c44c47e0a404a8a0aff91f4e0e97e0d0edbc1e120361fb068bdfa2d9a74e31ed3420d82f006d4d86cdc1bf218904d40a13f45d5ddb46ac66f91694a098728df
 EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
-EBUILD jhead-3.04.ebuild 565 BLAKE2B 2bef4d44a9cc23e1ed2b5cc5945e9781e3b8ca0bd80e0e5d61de29e238d1363aac947293dc010cf999ef27915bae2382705f7a0f1e150a74f4a60767caaea2c4 SHA512 b894cb64a8944ee3053b021d1c1f66293e8add789025a931b556527ad51baee71996e1cd80230352c09587b823b64578770d523cb2a4d05ea108177e6cd2c047
+EBUILD jhead-3.04.ebuild 563 BLAKE2B 7e70728cd7b5dababbb35dfd5206798335d9f715ea021a00c253ddc41ab256ed035c97a619070f0d018de69254f515f9446b1266d8bbc70b1af56abeb3837ae7 SHA512 2666d7bfceda278f1bef7fcc6c3de0775b40f85362d1c47854f2c4585a2d22c5c2ec4488cc235eba3dffc78243dc93c0ae791d3df0271e2e82f40880e51db884
 MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/jhead/jhead-3.04.ebuild b/media-gfx/jhead/jhead-3.04.ebuild
index 52ccde1773de..054679e94296 100644
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86"
 
 PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
 
diff --git a/media-gfx/mypaint-brushes/Manifest b/media-gfx/mypaint-brushes/Manifest
index ee3c9876b08b..245bc1d61eaf 100644
--- a/media-gfx/mypaint-brushes/Manifest
+++ b/media-gfx/mypaint-brushes/Manifest
@@ -1,3 +1,3 @@
 DIST mypaint-brushes-1.3.0.tar.gz 2447093 BLAKE2B 26fc22ef7669f5d88b1cb2bbc4562baffe257c112baf4a782f5045becd17a0bea577f79f290ae51b38cb3030478ea9d2e251033cc95101caacc823d139fe4ce1 SHA512 f8e0050cd700358d75cd25e40acd73905e2a53f21c6177cf67e8012aa4fbba8dc445109f07601c3846f95532a40feff4441081c0aa4e958049fc0ed8008fb414
-EBUILD mypaint-brushes-1.3.0-r1.ebuild 548 BLAKE2B f216508dd44e7d4a657e8dd30a0b136ad895b326cedaf0bc68c3c19537c22907d253ea0390a7c18363d2e097f7f348d8dc751400849cf21da5fe9b882fa34c55 SHA512 80d06275b8428302f71d29626847ec3b69cfa87f12fcac34a8e3d91d57119ba7a85eff76dbdbac8aec580fa28713ebe15def07259aff98898279483b9a851dda
+EBUILD mypaint-brushes-1.3.0-r1.ebuild 553 BLAKE2B f3c2e6d85f4613bb1ceb7889d315100b42e91c7fb2536cf37849f7f000ddea7912502a1ae2f594d716ee2c7cf292aa4d8f6117b27ae193a034c7841379c291f5 SHA512 ad147e0b415a6491b815d1142f2c9a4a0aaa001313692648e887086c6dc4f1f961b69426063223cff51afe1177362672ec5d467d6803eb96e4afc5928a225b05
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
index fa662603aa5c..024417f26645 100644
--- a/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+++ b/media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mypaint/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="1.0"  # due to pkgconfig name "mypaint-brushes-1.0"
-KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86"
 IUSE=""
 
 DOCS=( AUTHORS NEWS README.md )  # to exclude README symlink
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index dd17e321cc33..fe4af30ea643 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/bcg729/Manifest b/media-libs/bcg729/Manifest
index 801095346719..c82aa0dc127c 100644
--- a/media-libs/bcg729/Manifest
+++ b/media-libs/bcg729/Manifest
@@ -1,6 +1,6 @@
 AUX bcg729-4.3.0_beta-cmake-build.patch 135 BLAKE2B c3379f4327ab4f1d2a12ec31f3f0c0a3a15b0c2945da0d707d2d1b308c1860d52914b875504c0967c4b75ae42a4f7766611563c150cd0afb0acfe1369cc72116 SHA512 97fa2a52456809b2c4bac66c4c309b0d95a7a12d43eb102857339e729ede84f9a2cef9050a7232090e7b4e2f3817890d94e565051553f4cec3b7e83e69b2481c
 DIST bcg729-1.0.4.tar.gz 115641 BLAKE2B 5240fc10f8c4c32d9c9a6fc527a198fc896a8ff5ea12aa8a692808877582ac25b3fee122799cb7f6cea58db2f07cc07348da36d9f526e62f0bf62d61ef33bcfa SHA512 fdbbd2c9a807ed832ac3976301843bae854368ab281d16f792550bbda921d226fc6003c0a499561529f22eae08bc0d78b8826c2d06c859ab706d999a96967ffb
-EBUILD bcg729-1.0.4-r1.ebuild 766 BLAKE2B 6e3b1e2620e6e9e1e2c06cd8180fca64105fd25fb963dfc942aa2fdaebe07f2b9177db67d6bde5a117589bd6c8e8c96882e6348a8aab17eb2b0d3384c3923095 SHA512 cb7e64fa01684d97db56ba1e83f595f5610f5a6893b57f5226659e4807afe8bae80e7124226e906c38441e036c855f2aa02560b893f5bd4d27da8e1d25c341cd
+EBUILD bcg729-1.0.4-r1.ebuild 773 BLAKE2B d8d5d5ac55f924192269f470ae39b71b31888cae3d78e4b3a6d8500c5d446407b30b2202291d05157ad69aadd07e009cfc908349ee8e34f8c56c692490202989 SHA512 6dc3b6890266d7a956a852c848d5cf966a3262666eedae64f4e2c0cd493eb8bd4d891ca34e687bf265d6393c2d2cd607bcfff2edcf382e34a2b7458275105e59
 EBUILD bcg729-1.0.4.ebuild 665 BLAKE2B 61e259c0e136f52ca45d6676e3c13acfb34d27028140ed2e4a487b8fa589985101679df5f5de4664d565fef354f09a1a66d5ce32ee693a817adedbfa48bb7c03 SHA512 cab46d07da0a5c27c2e3d1362701835b9cc970d01b6a069ca908d6194999706d1e04a44775a1468558d3a3dc3534f26ac63290fa39258e474b86de527676a1eb
 EBUILD bcg729-999999.ebuild 722 BLAKE2B b25c170cab5975861a9b8caae9922efda53869c39a74094a5092be074db3c5b4da37f0fcedeb776ed34a154c5e9dbf74cd796d1eb7fb83ca8eec358fc86d97a7 SHA512 9f3d10de5a4010848e067fc21fcabe64fa0de7797e61521be5c8779e55ae676f7d7fc7c72d54d3d134eb978adeb2fc23b95b7129324bbd77f0a8bc196eab84a9
 MISC metadata.xml 214 BLAKE2B 4446a18615c9ae6446000d6d87c369372cf676ce6d21f6ac5e11932fc97833478c6d42f7469ac5a0cccb3aecbda03850590c3fed13b1395c9272d366e13e08c1 SHA512 7a44c566c4d93dfca459487b5ccf51b49f02d11f56e766442953c12db49cf45fdf6aa12089e0a52b6942ea7adadcc90fc7814fc02f6ada5a0e91831e1a44149e
diff --git a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
index 3664c1d80e52..63f450ccdac4 100644
--- a/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+++ b/media-libs/bcg729/bcg729-1.0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/BelledonneCommunications/bcg729/archive/${PV/_/-}.ta
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/media-libs/liblo/Manifest b/media-libs/liblo/Manifest
index bff9a804e331..1ad4a6e132f8 100644
--- a/media-libs/liblo/Manifest
+++ b/media-libs/liblo/Manifest
@@ -1,5 +1,5 @@
 DIST liblo-0.30.tar.gz 641498 BLAKE2B d884cc723d770f45414e838b6f2520c1f3b2a11972a9977d19b20ba68bc653f895eeb21ba0182a09fde1f096c9be084def1572f747463cd71e96bf0022ef7549 SHA512 51132933cc23237b70ed08fa7986a4a9f838529b83807746b358bcc171f8bbce7f37115b7c855520c9219bae93c74e502aebfb90e44dabdc6d0a00b8335336e3
 DIST liblo-0.31.tar.gz 643928 BLAKE2B 724a6369856b5f2ccd50edb8eacbf309760548b1f855d8b4f343cbfc3257ab3ceffc5f4e40d594ecb20050fcea11b7a6bc26f8e4a6ea72969628ebef05209fd5 SHA512 97f9561296c2e53f92db0cfee625687208b490f8bc229b6cffe88b43ca2a8da1ed3217aaa2151245ea483e54ad6c5e92b9cf10a20661766fa6d3bedb5a8cdd01
 EBUILD liblo-0.30.ebuild 916 BLAKE2B 2f92abf52d3aaedf60ecf0916bd454ce9678f9aebef4c87708170ab50545f748ad7da596c0fbd9843595b4d060cda3eaa9b6fb0f5d83e18e621f5fc29d68fff6 SHA512 0e1c6be66f68f6446e20873a3ec4becfda57ec4e52d3b5d9c660574b3c994a371e4702166fc36264862baaab2111c09d6886752032a81321346464c70219a055
-EBUILD liblo-0.31.ebuild 928 BLAKE2B 49e956416bea33e8a8df9fc6384904b918e42b2bf47685a774b8c403b2f4b6e52193c906ae22479b149c0f7f9b9a5d3b6e0aa6f79d31cf83442a578c6a0a7312 SHA512 639f22c532311205d894a575df38d369f22d1253bdd5ce28b999b65f61416c1f5ed3dc5d299caa35756c3db171b3b29bc21ec9ad0897a6cb4e4603175e05cf63
+EBUILD liblo-0.31.ebuild 933 BLAKE2B dfa8a1e8d790e69f52cc67fd490688347f73c7813d78119643510c0d6620f8888d998efdf088f8ffebc23d29456027b966c4cb5761136a2cd0a75457f28ec3fe SHA512 73dfa5dcf7be7a38d207afb92384d39655a2ca06467556ad2291c03f0ae9f751f41139d36f3625081e09b1f480712d75f42f597e9ecdd39624121c568026e24e
 MISC metadata.xml 470 BLAKE2B 1402a4921f55313ebaa73a1b4733f9e850943fe23033fdd0980df892665ed42355762d27c64f2091a23d4d72e991498628dcca0a26df55603b086ed3c87ab6f5 SHA512 2604ac7fbd125c9f45faeefcad35a40bcd65d4034311cda5a95ceaaa3904b7e46b6e449f0373ad6f0ffca66ff9bd23d785a035a63888adc754939e19fb93eb56
diff --git a/media-libs/liblo/liblo-0.31.ebuild b/media-libs/liblo/liblo-0.31.ebuild
index 2a9f890560a6..50c9d67b4c22 100644
--- a/media-libs/liblo/liblo-0.31.ebuild
+++ b/media-libs/liblo/liblo-0.31.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="doc ipv6 static-libs"
 
 RESTRICT="test"
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e04063890c0b..28dea7b8a38d 100644
Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1cf40056c016..55c555a5e0d1 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -10,7 +10,7 @@ DIST ffmpeg-4.2.4.tar.bz2 10959430 BLAKE2B 932bc0046edab5587063bbc04d6ef0149876b
 DIST ffmpeg-4.3.tar.bz2 11297005 BLAKE2B 41b4752aa2c1a937e4e82ec76ca38f48c1dcca633cb77f100aeb6c56f0acc218a39621d8b1046d38f65b3fa5b0871fea7ace16348266ca1244dd889620bc73ab SHA512 fdccd281407d5bed0f673ad01ddc9134cd9a31f040b55e30f3b27913b877732b9d19c6ceeda96afb360e1ff49f4930f6c320747b240cf38d541df81a8ef4272f
 EBUILD ffmpeg-3.4.6-r1.ebuild 15625 BLAKE2B e601c17dff906ef3b5d1edd782871f01079cca887c76e59a9a99850a1a3dea8b56d54a5ddcb59c02318397f5578065aec967a09e0bcbc56a545f16c6757affb9 SHA512 5def3a44df2b619cf6d392a38ec192f4a29b536246e147c62afefb102f82667406c86c84957bed7f7703ba82c1b102400e2bd1ac532c2e414e99028a9f82c948
 EBUILD ffmpeg-4.2.3.ebuild 18228 BLAKE2B a2a8fd0e426057e6fc323377e908e76b1c03756eeee0436fcdfd13c7f89fc5c4d5662ca6c375edb9455600a95efa3e8ad1ccc16dd56fe58b65bc3d14c594986d SHA512 238a665896f43885a9ab1b0e708489dab89e928300a216958f8e6e5e89a0956379fc8d85a7dfabc89c1f33df7a4975d01a79c69711f8017d4e454f7ca281e992
-EBUILD ffmpeg-4.2.4.ebuild 18235 BLAKE2B 3637969ad82fc9c1752ea11f7e1627ce6f92317f91c29caf65cbdb9b8060ce5f2cb30892b195644a923d37efd2a6b19d4e8720e6588086473df84d38202c7299 SHA512 859b12a4b90d883c1a595b6580dc49a454207a01ed3da94106be6a4a323227224560c11b2366730e55d15a7be1f89d3f83f454114823d24b58fae52459326de7
+EBUILD ffmpeg-4.2.4.ebuild 18232 BLAKE2B f6af017d12d2c4f4f48697201f9d15430c1c2d80bb0a0a93375de9f9d375abdd45772edebb0fd659dda3d31b95d8a424bfee58efb0563dd5c4aaa3f4873c21a8 SHA512 0caee8823660f5cf90ae6b2330bf5f0e145d46f40bd758172348681afe63fcf8cda22c7f8b4cb68b3904726570372c792ae88a373821529cf8deaf57ca7089a9
 EBUILD ffmpeg-4.3-r1.ebuild 18169 BLAKE2B f3bd3b49be79278fc4efeb47750c178202e1847d3208841f3e525791ce33d6dc274e3960c60e4ab62f98250833a295bcd2e8b3f66b302d43a7ecb13239ac212b SHA512 015dfba32e05b04f26cb86c0a8ef36343cc491ad2ecfc38c88867bea1b95756ed8e3dee333b5e8f806d89187b28b98cf1e0e7cf70cc9bff20561163296488347
 EBUILD ffmpeg-4.3.ebuild 18093 BLAKE2B 5e6fca36a8ba7ae2c0fbc71d00c66e1a6919360a107ac92cc8c66f67a8b40692046b099c59367d05cf293e85dbc895aeabf6396d66abd9ce8a6bbce7f26c55f5 SHA512 27f867d5fd4307a282c1b126cde48b94dccbd92e693ce62b16257a7ef32c7ae82b848d66dd9e5ad0af36d5559bbf24735ac0f0ac6c7c36c86ebcfd0d9b540c26
 EBUILD ffmpeg-9999.ebuild 18137 BLAKE2B 18a955231b9661570a05c4806fd380f30241fb72b855e4b02e0c157158e6fcf5d3de62775a48feec16d51acffb7eeea9f764012c633f5aed2320b7b9de2b70b4 SHA512 ab8f7e373305002daeb447cbf289131f6afcd8e9f7cad916e77889929ebd462f428a3580935ecd2fd9d59c739ac858b40d30745eba233087084ae781367e8146
diff --git a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
index 98423c95fb20..b4ba9f045b8f 100644
--- a/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.2.4.ebuild
@@ -62,7 +62,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9c4bf32bf45e..6a0abdfcf333 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 516d00e727ad..345ee6956a2c 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Jul 2020 10:08:20 +0000
+Fri, 17 Jul 2020 06:08:26 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 58420e781e6c..c9a8e95f0135 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 469226 BLAKE2B 7802023c2e2f34c26e4ab80c5dc66d82df62eae23b930c29c3bebb5b4ded87a3a117438be8d0fe26990389a3a2947f4151a8aecdd768fcd1388a595c78cd7d73 SHA512 c8862da9c01fac7f061d6ed989c78046fca0143f6f6c82ce4d8c8662fe53725e542bc7eb68e3936d66230eedcea6132083a3412ca73bd3a83c42808079029d0e
-TIMESTAMP 2020-07-16T10:08:23Z
+TIMESTAMP 2020-07-17T06:08:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8QJxdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8RQF1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCKEQ//flaEmZ9gIzHsfwk52AxCYvbsSMfQvm82XDijue+LnkF/ths9NM0S80Eu
-3finU440QRAZScV5gVqmZM8KRrQgxHh2RzMf1Xj0Or5LaOzvN9mal9kcL/LAcUnc
-qUIymWAb0p1HAEAsZN1ouuDZwqWrQIVYT4VSaaXvknpRXjpJSQ8gV/mq6evHE1eJ
-GtofG55dJQuz3Pp1IU2gpQeJRqOeI15A2lWYCmNn41FxpfmvkGBM2U9+ECMgQX/a
-CpcV9OOvvfc11Axlc+DIxMkk65WyGPS63S6bmkWai+Ms27/iE888oxTwAOpbYoP3
-hhQ4nZ8JMyAoLEgIp+iOAqT8QanbtEzc7RM9PRITcWX2cPYrvjVpWimZy4EOFRzw
-+2ZQoj8q2mQ8oZCVYBlGh14zO2PMe+XmPEnz5hPKw3z3yZuw0t4HLNILpjhCUFPu
-9Wktk1D/s+eDB2eGFi6I9Va+CXkb+Wwy72XHk7WgO0tWjv85AM9yGJ1futGUd/oj
-tUGsaIyft8PurvUA/1XG6q2vClr2GyMS/e4ZPWziKimj3aAZ5IcWYpKzFGA4T5y2
-X6IkmNHCHX3GwxZuYVcEhuI+XAkxRDS/ICvzZ8J0p0RGVvkVcbg49890Wy9ZT4k0
-yHqvIvXySl9QAzquoTJP+vg0zQGFkHWfvVmhaWBQSRB9R6ZdoHA=
-=9uK3
+klAkDA/+MrjaEf2J6j/az7mTka6sTlbbOGqxfei+RvnWTHxumgwYCGqSnAVx7Bgq
+zTup5j791svBNoRlZd3aWXHtziSvx7zQBHLxYtTZrAa0gMP7c/CV9C7xFA5v/+BN
+IBYRVvwXt69yMSWQuF5dqMh4ivUWsUpFB5Z7JC9s5DSTmtM+274v16fe6h0XS0w+
+Ho3wfsRIRlrWYP6Baq5gEsSaPgePKSdVhXSRg0JySnqntI0nhNd1Ey/obDSKDn+2
+fg6fQ/tIigG3XWB4Gx2mXISi6cDsMEK587tVFuvle5DpJIcOs3xUBOYhPxJ5+W+X
+mMBR6vqIq/PoMgDWSiOZSkONwUU4f83rR7D7ulch8YrRzrMWyOd8co5PowvxAKoa
+26z6EaC7SGM9e9vO5/bs2o7WWBFc5nGLD1lw5hDFyXvX0vffpxJpNdwQxKevkRil
+Ni0xm+QpA3BGFAbw7mzsV5lLo5+JPwwhHZPvowJEMyOTWfsIXan/LE5xs+gxxYKg
+m54K7gFVJLOUewVn1/9PI3Tbq7RHCqlmwhLVRTMPsSjPDKROyEnqwUBFQbtAeTfI
+Mfowj/hxJ6F1gSVzocDtzNVDr+9bpTcdU6kz6zY5EIogwFPsfiTodZ9ldgLZLr14
+E3OzzllUavj6hoT8VlY774XLx+4olbPoqDJpICjo5mZ8oxx8Q1I=
+=OTSz
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 516d00e727ad..345ee6956a2c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Jul 2020 10:08:20 +0000
+Fri, 17 Jul 2020 06:08:26 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9a48de5169dd..79b6c54ec1b8 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index f6765f2f0124..643a12fd76ff 100644
Binary files a/metadata/md5-cache/app-admin/Manifest.gz and b/metadata/md5-cache/app-admin/Manifest.gz differ
diff --git a/metadata/md5-cache/app-admin/exo-1.11.0 b/metadata/md5-cache/app-admin/exo-1.14.0
similarity index 76%
rename from metadata/md5-cache/app-admin/exo-1.11.0
rename to metadata/md5-cache/app-admin/exo-1.14.0
index 9412f6d934a3..1caea303eff1 100644
--- a/metadata/md5-cache/app-admin/exo-1.11.0
+++ b/metadata/md5-cache/app-admin/exo-1.14.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/exoscale/cli/archive/v1.11.0.tar.gz -> exo-1.11.0.tar.gz
+SRC_URI=https://github.com/exoscale/cli/archive/v1.14.0.tar.gz -> exo-1.14.0.tar.gz
 _md5_=dae2adfab12618329303cf7dc2a67196
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.2_rc2 b/metadata/md5-cache/app-admin/sudo-1.9.2_rc2
new file mode 100644
index 000000000000..ac57feb291d0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.9.2_rc2
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] )
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=7
+HOMEPAGE=https://www.sudo.ws/
+IUSE=gcrypt ldap libressl nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
+LICENSE=ISC BSD
+RDEPEND=sys-libs/zlib:= gcrypt? ( dev-libs/libgcrypt:= ) ldap? ( >=net-nds/openldap-2.1.30-r1 sasl? ( dev-libs/cyrus-sasl net-nds/openldap[sasl] ) ) pam? ( sys-libs/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) sssd? ( sys-auth/sssd[sudo] ) >=app-misc/editor-wrapper-3 virtual/editor ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) virtual/tmpfiles
+REQUIRED_USE=?? ( gcrypt ssl )
+SLOT=0
+SRC_URI=https://www.sudo.ws/sudo/dist/beta/sudo-1.9.2rc2.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.9.2rc2.tar.gz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pam	a1771fc1e5831c201eaf18451747d94b	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=5c9b56961a7366c86c35ce043a15bc82
diff --git a/metadata/md5-cache/app-antivirus/Manifest.gz b/metadata/md5-cache/app-antivirus/Manifest.gz
index d217fe9c456f..7a1ed59da693 100644
Binary files a/metadata/md5-cache/app-antivirus/Manifest.gz and b/metadata/md5-cache/app-antivirus/Manifest.gz differ
diff --git a/metadata/md5-cache/app-antivirus/clamav-0.102.3-r1 b/metadata/md5-cache/app-antivirus/clamav-0.102.4
similarity index 92%
rename from metadata/md5-cache/app-antivirus/clamav-0.102.3-r1
rename to metadata/md5-cache/app-antivirus/clamav-0.102.4
index 7a6b42b18a38..8b38d4f1ef15 100644
--- a/metadata/md5-cache/app-antivirus/clamav-0.102.3-r1
+++ b/metadata/md5-cache/app-antivirus/clamav-0.102.4
@@ -5,12 +5,12 @@ DESCRIPTION=Clam Anti-Virus Scanner
 EAPI=7
 HOMEPAGE=https://www.clamav.net/
 IUSE=bzip2 doc clamdtop clamsubmit iconv ipv6 libclamav-only libressl milter metadata-analysis-api selinux test uclibc xml
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=acct-group/clamav acct-user/clamav dev-libs/libltdl dev-libs/libmspack || ( dev-libs/libpcre2 >dev-libs/libpcre-6 ) dev-libs/tomsfastmath >=sys-libs/zlib-1.2.2:= bzip2? ( app-arch/bzip2 ) clamdtop? ( sys-libs/ncurses:0 ) clamsubmit? ( net-misc/curl dev-libs/json-c:= ) elibc_musl? ( sys-libs/fts-standalone ) iconv? ( virtual/libiconv ) !libclamav-only? ( net-misc/curl ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) ) xml? ( dev-libs/libxml2 ) selinux? ( sec-policy/selinux-clamav )
 REQUIRED_USE=libclamav-only? ( !clamdtop !clamsubmit !milter !metadata-analysis-api )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://www.clamav.net/downloads/production/clamav-0.102.3.tar.gz
+SRC_URI=https://www.clamav.net/downloads/production/clamav-0.102.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=0ad4949949bc9e9e5a10b073035972c8
+_md5_=a94b8ec1d206d38e0435ec58d10e2dee
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 80f101470920..8a9d6f794b87 100644
Binary files a/metadata/md5-cache/app-crypt/Manifest.gz and b/metadata/md5-cache/app-crypt/Manifest.gz differ
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.5.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.5.0
index a1ebbc47aefa..add3655b7550 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.5.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.5.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.5.0.tar.gz -> certbot-1.5.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=f59c55f4da29476f1ff8aa30a77abaf3
+_md5_=0cfa150df64b48f155edf324e22bcf4b
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-1.6.0 b/metadata/md5-cache/app-crypt/certbot-apache-1.6.0
index 6d91bde89145..497815fd99c1 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-1.6.0
+++ b/metadata/md5-cache/app-crypt/certbot-apache-1.6.0
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.6.0.tar.gz -> certbot-1.6.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c51ccc9450cc7d30bea954b3d1d0c8a8
+_md5_=31803c858f988b8e2be381f7806721f8
diff --git a/metadata/md5-cache/app-crypt/certbot-apache-9999 b/metadata/md5-cache/app-crypt/certbot-apache-9999
index f7143b580789..495adb4f1d67 100644
--- a/metadata/md5-cache/app-crypt/certbot-apache-9999
+++ b/metadata/md5-cache/app-crypt/certbot-apache-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=test? ( >=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Apache plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=test python_targets_python3_6 python_targets_python3_7
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=>=app-crypt/acme-0.29.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/python-augeas[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-component[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c51ccc9450cc7d30bea954b3d1d0c8a8
+_md5_=31803c858f988b8e2be381f7806721f8
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
index 243e78aee553..0cba6fb7c99e 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.5.0.tar.gz -> certbot-1.5.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bc3a06eb47152a5b007dd7651fd811c6
+_md5_=b089441ad220eaa4e1575bbf8e7866b9
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-1.6.0 b/metadata/md5-cache/app-crypt/certbot-nginx-1.6.0
index 788715a7d3dd..ee26f3dd3a61 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-1.6.0
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-1.6.0
@@ -1,15 +1,15 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=https://github.com/certbot/certbot/archive/v1.6.0.tar.gz -> certbot-1.6.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=632b1fecc7ac82f4909b2f476a2ba16d
+_md5_=eb37fb750f6980900afe6b98e1dd1a9e
diff --git a/metadata/md5-cache/app-crypt/certbot-nginx-9999 b/metadata/md5-cache/app-crypt/certbot-nginx-9999
index 58c21e2db370..955b7749cc5e 100644
--- a/metadata/md5-cache/app-crypt/certbot-nginx-9999
+++ b/metadata/md5-cache/app-crypt/certbot-nginx-9999
@@ -1,14 +1,14 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 DESCRIPTION=Nginx plugin for certbot (Let's Encrypt Client)
 EAPI=7
 HOMEPAGE=https://github.com/certbot/certbot https://letsencrypt.org/
-IUSE=python_targets_python3_6 python_targets_python3_7
+IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RDEPEND=dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/acme-1.4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=app-crypt/certbot-1.6.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pyopenssl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyparsing-1.5.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/zope-interface[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=632b1fecc7ac82f4909b2f476a2ba16d
+_md5_=eb37fb750f6980900afe6b98e1dd1a9e
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index a2c9642cb5c4..bd57cfb81606 100644
Binary files a/metadata/md5-cache/app-editors/Manifest.gz and b/metadata/md5-cache/app-editors/Manifest.gz differ
diff --git a/metadata/md5-cache/app-editors/mousepad-0.4.2 b/metadata/md5-cache/app-editors/mousepad-0.4.2
index 7d4e21294937..76c522e82ce3 100644
--- a/metadata/md5-cache/app-editors/mousepad-0.4.2
+++ b/metadata/md5-cache/app-editors/mousepad-0.4.2
@@ -4,11 +4,11 @@ DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
 EAPI=7
 HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
 IUSE=dbus +gtk3
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
 RDEPEND=>=dev-libs/glib-2.42:2= >=xfce-base/xfconf-4.12:= !gtk3? ( >=x11-libs/gtk+-2.24:2= x11-libs/gtksourceview:2.0= ) gtk3? ( >=x11-libs/gtk+-3.20:3= x11-libs/gtksourceview:3.0= )
 REQUIRED_USE=dbus? ( gtk3 )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.4/mousepad-0.4.2.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d9328510a1b3235fd53743ee40002cc9
+_md5_=6713519ee750048147ca45727d806d2c
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 23ba7ca71958..de0401536ae8 100644
Binary files a/metadata/md5-cache/app-emulation/Manifest.gz and b/metadata/md5-cache/app-emulation/Manifest.gz differ
diff --git a/metadata/md5-cache/app-emulation/qemu-5.0.0 b/metadata/md5-cache/app-emulation/qemu-5.0.0
index 280cb615045a..c74c23e2e656 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.0.0
+++ b/metadata/md5-cache/app-emulation/qemu-5.0.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.0.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=249fca5554d6e8e87675a4c2b313c318
+_md5_=de6a773ee54080cc634887ab357270e7
diff --git a/metadata/md5-cache/app-emulation/qemu-5.0.0-r1 b/metadata/md5-cache/app-emulation/qemu-5.0.0-r1
index 2e9f11d911eb..0b9d9bdf611c 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.0.0-r1
+++ b/metadata/md5-cache/app-emulation/qemu-5.0.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.0.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dd1eabe9899646a257ca442e76ad0f7
+_md5_=44302857eb952b8a0907201620003748
diff --git a/metadata/md5-cache/app-emulation/qemu-5.0.0-r2 b/metadata/md5-cache/app-emulation/qemu-5.0.0-r2
index 5566b21dc90a..8d30132880b0 100644
--- a/metadata/md5-cache/app-emulation/qemu-5.0.0-r2
+++ b/metadata/md5-cache/app-emulation/qemu-5.0.0-r2
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://download.qemu.org/qemu-5.0.0.tar.xz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e7be3f74b1a254a69a08e62b89cbee1
+_md5_=cf74ecc3076a34c63b0c3c0186ed2d6b
diff --git a/metadata/md5-cache/app-emulation/qemu-9999 b/metadata/md5-cache/app-emulation/qemu-9999
index 4e8483b90dc4..167af6b0bb14 100644
--- a/metadata/md5-cache/app-emulation/qemu-9999
+++ b/metadata/md5-cache/app-emulation/qemu-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	8ec5b53812bce105ae7943930e4660f8	l10n	97f2753e3f1f3753d53d856c7c0bbb0b	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e55b7c83ec47831d55f9b6936d37875b
+_md5_=41d985479dc980ce4e992793a381ce70
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 9f9a5641c4f6..a6e5f67038fc 100644
Binary files a/metadata/md5-cache/app-forensics/Manifest.gz and b/metadata/md5-cache/app-forensics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614 b/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
new file mode 100644
index 000000000000..752c0410590b
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/bison sys-devel/flex virtual/pkgconfig prelink? ( sys-devel/prelink ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst prepare setup
+DEPEND=dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) postgres? ( dev-db/postgresql:= ) prelink? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) static? ( dev-libs/libpcre[static-libs] acl? ( >=virtual/acl-0-r1[static-libs] ) e2fs? ( sys-fs/e2fsprogs[static-libs] ) !mhash? ( dev-libs/libgcrypt:0[static-libs] dev-libs/libgpg-error[static-libs] ) mhash? ( app-crypt/mhash[static-libs] ) prelink? ( dev-libs/elfutils[static-libs] ) selinux? ( sys-libs/libselinux[static-libs] ) xattr? ( sys-apps/attr[static-libs] ) zlib? ( sys-libs/zlib[static-libs] ) )
+DESCRIPTION=AIDE (Advanced Intrusion Detection Environment) is a file integrity checker
+EAPI=7
+HOMEPAGE=https://aide.github.io/ https://github.com/aide/aide
+IUSE=acl audit curl e2fs mhash postgres prelink selinux static xattr zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/libpcre acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) e2fs? ( sys-fs/e2fsprogs ) !mhash? ( dev-libs/libgcrypt:0= dev-libs/libgpg-error ) mhash? ( app-crypt/mhash ) postgres? ( dev-db/postgresql:= ) prelink? ( dev-libs/elfutils ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) ) selinux? ( sec-policy/selinux-aide )
+REQUIRED_USE=postgres? ( !mhash ) static? ( !audit !curl !postgres )
+SLOT=0
+SRC_URI=https://github.com/aide/aide/archive/7949feff20501724a43929ee7894b005812ffb4f.tar.gz -> aide-0.16.2_p20200614.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f7aeb81809882031b2d1ad063b2927bc
diff --git a/metadata/md5-cache/app-metrics/Manifest.gz b/metadata/md5-cache/app-metrics/Manifest.gz
index 77a6261b1d17..6b7169a09eb1 100644
Binary files a/metadata/md5-cache/app-metrics/Manifest.gz and b/metadata/md5-cache/app-metrics/Manifest.gz differ
diff --git a/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1 b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1
new file mode 100644
index 000000000000..c47ded8deec0
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1
@@ -0,0 +1,14 @@
+BDEPEND=dev-util/promu >=dev-lang/go-1.12 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct-group/nginx-vts-exporter acct-user/nginx-vts-exporter
+DESCRIPTION=Nginx virtual host traffic stats exporter for Prometheus
+EAPI=7
+HOMEPAGE=https://github.com/hnlq715/nginx-vts-exporter
+KEYWORDS=~amd64
+LICENSE=MIT Apache-2.0 BSD
+RDEPEND=acct-group/nginx-vts-exporter acct-user/nginx-vts-exporter
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/hnlq715/nginx-vts-exporter/archive/v0.10.7.tar.gz -> nginx-vts-exporter-0.10.7.tar.gz
+_eclasses_=go-module	45394825d9260b479aa1cf252ea58e01
+_md5_=967377a43cf695ca5509aa6e6cd824ef
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index cc7eebd9c921..7cc87295f788 100644
Binary files a/metadata/md5-cache/app-misc/Manifest.gz and b/metadata/md5-cache/app-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-misc/figlet-2.2.5-r1 b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
index 4e15a9a395a4..23c45e9dfe83 100644
--- a/metadata/md5-cache/app-misc/figlet-2.2.5-r1
+++ b/metadata/md5-cache/app-misc/figlet-2.2.5-r1
@@ -7,4 +7,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=ftp://ftp.figlet.org/pub/figlet/program/unix/figlet-2.2.5.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1bff9ab3417f3e9e76dd54d5eb2f3798
+_md5_=6be17e0641c7a11364c513df3d4cdd60
diff --git a/metadata/md5-cache/app-misc/figlet-9999 b/metadata/md5-cache/app-misc/figlet-9999
new file mode 100644
index 000000000000..c19f4d357239
--- /dev/null
+++ b/metadata/md5-cache/app-misc/figlet-9999
@@ -0,0 +1,10 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=program for making large letters out of ordinary text
+EAPI=7
+HOMEPAGE=http://www.figlet.org/
+LICENSE=BSD
+PROPERTIES=live
+SLOT=0
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	git-r3	8ec5b53812bce105ae7943930e4660f8	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0c9baf8d6d7b03a991392220e1e326f5
diff --git a/metadata/md5-cache/app-pda/Manifest.gz b/metadata/md5-cache/app-pda/Manifest.gz
index ed1fb0326b10..7460c7b0a14d 100644
Binary files a/metadata/md5-cache/app-pda/Manifest.gz and b/metadata/md5-cache/app-pda/Manifest.gz differ
diff --git a/metadata/md5-cache/app-pda/libimobiledevice-1.3.0 b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0
new file mode 100644
index 000000000000..4c283b628973
--- /dev/null
+++ b/metadata/md5-cache/app-pda/libimobiledevice-1.3.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) python? ( >=dev-python/cython-0.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=>=app-pda/libplist-2.2.0:= >=app-pda/libusbmuxd-2.0.2:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-pda/libplist[python(-),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Support library to communicate with Apple iPhone/iPod Touch devices
+EAPI=7
+HOMEPAGE=https://www.libimobiledevice.org/
+IUSE=doc gnutls libressl python static-libs python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=app-pda/libplist-2.2.0:= >=app-pda/libusbmuxd-2.0.2:= gnutls? ( dev-libs/libgcrypt:0 >=dev-libs/libtasn1-1.1 >=net-libs/gnutls-2.2.0 ) !gnutls? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] app-pda/libplist[python(-),python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=0/6
+SRC_URI=https://github.com/libimobiledevice/libimobiledevice/releases/download/1.3.0/libimobiledevice-1.3.0.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=37fb7d28b26c3d933d56f0c372198f08
diff --git a/metadata/md5-cache/app-pda/libplist-2.2.0 b/metadata/md5-cache/app-pda/libplist-2.2.0
new file mode 100644
index 000000000000..0c4bee7d9c44
--- /dev/null
+++ b/metadata/md5-cache/app-pda/libplist-2.2.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig python? ( >=dev-python/cython-0.17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Support library to deal with Apple Property Lists (Binary & XML)
+EAPI=7
+HOMEPAGE=https://www.libimobiledevice.org/
+IUSE=python static-libs python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=python? ( python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 ) )
+SLOT=0/3
+SRC_URI=https://cgit.libimobiledevice.org/libplist.git/snapshot/libplist-2.2.0.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=de28d3669605e9e02723d5ff13c55e60
diff --git a/metadata/md5-cache/app-pda/libusbmuxd-2.0.2 b/metadata/md5-cache/app-pda/libusbmuxd-2.0.2
new file mode 100644
index 000000000000..9714fa342390
--- /dev/null
+++ b/metadata/md5-cache/app-pda/libusbmuxd-2.0.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-pda/libplist-2.2.0:=
+DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
+EAPI=7
+HOMEPAGE=https://www.libimobiledevice.org/
+IUSE=static-libs
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=app-pda/libplist-2.2.0:=
+SLOT=0/6
+SRC_URI=https://cgit.libimobiledevice.org/libusbmuxd.git/snapshot/libusbmuxd-2.0.2.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2b3c5e786b113eca40c163c5d463f01e
diff --git a/metadata/md5-cache/app-pda/usbmuxd-1.1.1 b/metadata/md5-cache/app-pda/usbmuxd-1.1.1
new file mode 100644
index 000000000000..8280c9ca66e9
--- /dev/null
+++ b/metadata/md5-cache/app-pda/usbmuxd-1.1.1
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
+DEFINED_PHASES=configure prepare
+DEPEND=acct-user/usbmux >=app-pda/libimobiledevice-1.0:= >=app-pda/libplist-2.0:= virtual/libusb:1
+DESCRIPTION=USB multiplex daemon for use with Apple iPhone/iPod Touch devices
+EAPI=7
+HOMEPAGE=https://www.libimobiledevice.org/
+IUSE=systemd
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 GPL-3 LGPL-2.1+
+RDEPEND=acct-user/usbmux >=app-pda/libimobiledevice-1.0:= >=app-pda/libplist-2.0:= virtual/libusb:1 virtual/udev
+SLOT=0
+SRC_URI=https://github.com/libimobiledevice/usbmuxd/releases/download/1.1.1/usbmuxd-1.1.1.tar.bz2
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6
+_md5_=64f3dec75539db3c44cf90acc87d8242
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 670c0a35c76d..ef9df030c3d4 100644
Binary files a/metadata/md5-cache/app-portage/Manifest.gz and b/metadata/md5-cache/app-portage/Manifest.gz differ
diff --git a/metadata/md5-cache/app-portage/nattka-0.2.9 b/metadata/md5-cache/app-portage/nattka-0.2.9
index 0afc1ce0e9a3..4519760ed839 100644
--- a/metadata/md5-cache/app-portage/nattka-0.2.9
+++ b/metadata/md5-cache/app-portage/nattka-0.2.9
@@ -4,7 +4,7 @@ DESCRIPTION=A New Arch Tester Toolkit -- open-source stable-bot replacement
 EAPI=7
 HOMEPAGE=https://github.com/mgorny/nattka/
 IUSE=depgraph-order doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD-2
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-util/pkgcheck[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-vcs/git sys-apps/pkgcore[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] depgraph-order? ( dev-python/networkx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mgorny/nattka/archive/v0.2.9.tar.gz -> nattka-0.2.9.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=be3f19383ba0646f89848a3584f00187
+_md5_=5d9f663a50d4a51a1b0c118e863ee0cb
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 3bfe6c50137b..dd4433ab5082 100644
Binary files a/metadata/md5-cache/dev-db/Manifest.gz and b/metadata/md5-cache/dev-db/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-db/sqlite-3.32.3 b/metadata/md5-cache/dev-db/sqlite-3.32.3
index 64a3a4d2b245..dc3b90975b6d 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.32.3
+++ b/metadata/md5-cache/dev-db/sqlite-3.32.3
@@ -5,11 +5,11 @@ DESCRIPTION=SQL database engine
 EAPI=7
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=3
 SRC_URI=https://sqlite.org/2020/sqlite-src-3320300.zip doc? ( https://sqlite.org/2020/sqlite-doc-3320300.zip )
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d2dcd2eed5342705505fb456e6843509
+_md5_=f89cb480299fe797de62fb6ef613d5b6
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 542d8a46542a..e3caabe1028e 100644
Binary files a/metadata/md5-cache/dev-java/Manifest.gz and b/metadata/md5-cache/dev-java/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-java/iso-relax-20050331-r4 b/metadata/md5-cache/dev-java/iso-relax-20050331-r4
index 0b89ecfa0b1b..e108c3c599e0 100644
--- a/metadata/md5-cache/dev-java/iso-relax-20050331-r4
+++ b/metadata/md5-cache/dev-java/iso-relax-20050331-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Interfaces useful for applications which support RELAX Core
 EAPI=5
 HOMEPAGE=http://iso-relax.sourceforge.net
 IUSE=elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-java/ant-core:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://gentoo/iso-relax-20050331.tar.bz2
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-pkg-simple	3e71074eb6884746b37b70b2c9c881f4	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=18d1fbf7753c603aaae7324ed4f43d9f
+_md5_=1909d60456f0b19b1ed834aa998593fc
diff --git a/metadata/md5-cache/dev-java/java-config-9999 b/metadata/md5-cache/dev-java/java-config-9999
new file mode 100644
index 000000000000..4e2deed772fc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/java-config-9999
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=test? ( sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Java environment configuration query tool
+EAPI=7
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Java
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+LICENSE=GPL-2
+PROPERTIES=live
+RDEPEND=!dev-java/java-config-wrapper sys-apps/baselayout-java sys-apps/portage[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=2
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=dd8d32abd163781a66c002054d05e6c4
diff --git a/metadata/md5-cache/dev-java/jdom-2.0.6-r4 b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
index 5a569c77b1e6..bdbcf14948e4 100644
--- a/metadata/md5-cache/dev-java/jdom-2.0.6-r4
+++ b/metadata/md5-cache/dev-java/jdom-2.0.6-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Java API to manipulate XML data
 EAPI=5
 HOMEPAGE=http://www.jdom.org
 IUSE=test elibc_FreeBSD doc source elibc_FreeBSD
-KEYWORDS=amd64 ppc64 x86
+KEYWORDS=amd64 ~arm ppc64 x86
 LICENSE=Apache-1.1
 RDEPEND=dev-java/xalan:0 dev-java/jaxen:1.1 dev-java/iso-relax:0 >=virtual/jre-1.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=https://github.com/hunterhacker/jdom/archive/JDOM-2.0.6.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-ant-2	8d9cb415f1ca9fc7ebc5a74bacec300c	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=c0caecc204b460fb02114f50725c4536
+_md5_=08cc479589f8c720cc57b1dc4b7ea458
diff --git a/metadata/md5-cache/dev-java/openjdk-bin-8.262_p10 b/metadata/md5-cache/dev-java/openjdk-bin-8.262_p10
new file mode 100644
index 000000000000..533eed2a03d7
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-bin-8.262_p10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Prebuilt Java JDK binaries provided by AdoptOpenJDK
+EAPI=6
+HOMEPAGE=https://adoptopenjdk.net
+IUSE=alsa cups examples headless-awt nsplugin selinux source webstart
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RESTRICT=preserve-libs strip
+SLOT=8
+SRC_URI=arm? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u262-b10/OpenJDK8U-jdk_arm_linux_hotspot_8u262b10.tar.gz ) ppc64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u262-b10/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u262b10.tar.gz ) amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u262-b10/OpenJDK8U-jdk_x64_linux_hotspot_8u262b10.tar.gz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1aa58386df781fb1cc7286f0d9c5b56a
diff --git a/metadata/md5-cache/dev-java/openjdk-jre-bin-8.262_p10 b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.262_p10
new file mode 100644
index 000000000000..9ab45f4cca7f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/openjdk-jre-bin-8.262_p10
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm prerm setup
+DEPEND=>=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+DESCRIPTION=Prebuilt Java JRE binaries provided by AdoptOpenJDK
+EAPI=6
+HOMEPAGE=https://adoptopenjdk.net
+IUSE=alsa cups headless-awt nsplugin selinux webstart
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-classpath-exception
+PDEPEND=webstart? ( >=dev-java/icedtea-web-1.6.1:0 ) nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
+RDEPEND=media-libs/fontconfig:1.0 media-libs/freetype:2 >net-libs/libnet-1.1 >=sys-apps/baselayout-java-0.1.0-r1 >=sys-libs/glibc-2.2.5:* sys-libs/zlib alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) selinux? ( sec-policy/selinux-java ) !headless-awt? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrender x11-libs/libXtst ) >=dev-java/java-config-2.2.0-r3 >=app-eselect/eselect-java-0.4.0
+RESTRICT=preserve-libs splitdebug
+SLOT=8
+SRC_URI=amd64? ( https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u262-b10/OpenJDK8U-jre_x64_linux_hotspot_8u262b10.tar.gz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	java-vm-2	7cfcabfd055e69d3568103a4e0b0fae7	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2a5f6fb5bbaf363fcb7345c5c2ed13fb
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b050d277e42e..c7ec51f16f00 100644
Binary files a/metadata/md5-cache/dev-lang/Manifest.gz and b/metadata/md5-cache/dev-lang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lang/go-1.13.13 b/metadata/md5-cache/dev-lang/go-1.13.13
new file mode 100644
index 000000000000..7ca9a384578f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.13.13
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* amd64 ~arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.13.13
+SRC_URI=https://storage.googleapis.com/golang/go1.13.13.src.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=47ba50242048a9897c2286f1515ab996
diff --git a/metadata/md5-cache/dev-lang/go-1.13.14 b/metadata/md5-cache/dev-lang/go-1.13.14
new file mode 100644
index 000000000000..a7695dbeeb7f
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.13.14
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=test strip
+SLOT=0/1.13.14
+SRC_URI=https://storage.googleapis.com/golang/go1.13.14.src.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ce893d43e35220a04b1ba6ff57d4ffed
diff --git a/metadata/md5-cache/dev-lang/go-1.14.5 b/metadata/md5-cache/dev-lang/go-1.14.5
new file mode 100644
index 000000000000..c39e133333e9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.14.5
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* amd64 ~arm arm64 ppc64 ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.14.5
+SRC_URI=https://storage.googleapis.com/golang/go1.14.5.src.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3363fdee253af86855e83ca48197a1fb
diff --git a/metadata/md5-cache/dev-lang/go-1.14.6 b/metadata/md5-cache/dev-lang/go-1.14.6
new file mode 100644
index 000000000000..c9ad2c9fbbc1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/go-1.14.6
@@ -0,0 +1,13 @@
+BDEPEND=|| ( dev-lang/go dev-lang/go-bootstrap )
+DEFINED_PHASES=compile install test
+DESCRIPTION=A concurrent garbage collected and typesafe programming language
+EAPI=7
+HOMEPAGE=https://golang.org
+KEYWORDS=-* ~amd64 ~arm ~arm64 ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris
+LICENSE=BSD
+RDEPEND=!<dev-go/go-tools-0_pre20150902
+RESTRICT=strip
+SLOT=0/1.14.6
+SRC_URI=https://storage.googleapis.com/golang/go1.14.6.src.tar.gz
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=59df96eb097dc2dc822830a3de3b2bf2
diff --git a/metadata/md5-cache/dev-lang/php-7.4.8 b/metadata/md5-cache/dev-lang/php-7.4.8-r1
similarity index 100%
rename from metadata/md5-cache/dev-lang/php-7.4.8
rename to metadata/md5-cache/dev-lang/php-7.4.8-r1
diff --git a/metadata/md5-cache/dev-lang/python-3.6.11-r1 b/metadata/md5-cache/dev-lang/python-3.6.11-r1
index f6360824a82f..224d23b86028 100644
--- a/metadata/md5-cache/dev-lang/python-3.6.11-r1
+++ b/metadata/md5-cache/dev-lang/python-3.6.11-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test +threads tk wininst +xml
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.6/3.6m
 SRC_URI=https://www.python.org/ftp/python/3.6.11/Python-3.6.11.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.6.11-r2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=32413ebf486ac9ccaeaff650306204cb
+_md5_=8fe8a1c15095f5e8202c70809ef93c17
diff --git a/metadata/md5-cache/dev-lang/python-3.7.8-r1 b/metadata/md5-cache/dev-lang/python-3.7.8-r1
index d96b0ec333bb..5a7e6062acdd 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.8-r1
+++ b/metadata/md5-cache/dev-lang/python-3.7.8-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.8/Python-3.7.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.8-r2.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d6589ca7d3a7e321c2886772ae512fcd
+_md5_=dc2ed41666d34676cbe7472556e13755
diff --git a/metadata/md5-cache/dev-lang/python-3.8.3-r1 b/metadata/md5-cache/dev-lang/python-3.8.3-r1
index dac10e9ff6de..c2569d03e0a2 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.3-r1
+++ b/metadata/md5-cache/dev-lang/python-3.8.3-r1
@@ -5,7 +5,7 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=7
 HOMEPAGE=https://www.python.org/
 IUSE=bluetooth build examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl test tk wininst +xml
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.3/Python-3.8.3.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.3-r1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b407b3c8b14547e5ac9da3b5675e0fb3
+_md5_=496e6e8e258004d957398e7bd36b111f
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 9de3261ce6ac..93cf516e61ba 100644
Binary files a/metadata/md5-cache/dev-libs/Manifest.gz and b/metadata/md5-cache/dev-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-libs/iksemel-1.4-r1 b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
index 53fc4329a72b..cd55e0c390bb 100644
--- a/metadata/md5-cache/dev-libs/iksemel-1.4-r1
+++ b/metadata/md5-cache/dev-libs/iksemel-1.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=eXtensible Markup Language parser library designed for Jabber applic
 EAPI=6
 HOMEPAGE=https://github.com/meduketto/iksemel
 IUSE=ssl static-libs
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=ssl? ( net-libs/gnutls:= )
 SLOT=0
 SRC_URI=https://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=650a326fd8b5f54127f4f6522a57ba6e
+_md5_=66cf7226b10173f2d74585ea6260d55e
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3-r1 b/metadata/md5-cache/dev-libs/libffi-3.3-r1
index ca60fb068aa2..d9b8d3ca7fdb 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3-r1
+++ b/metadata/md5-cache/dev-libs/libffi-3.3-r1
@@ -1,13 +1,13 @@
 BDEPEND=test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
-IUSE=debug pax_kernel static-libs test test-bhaible abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=debug pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1a9041b191a73f14fd2795c055091a9d
+_md5_=e87215883845440c1cbd8a1b82f0da9f
diff --git a/metadata/md5-cache/dev-libs/libffi-3.3-r2 b/metadata/md5-cache/dev-libs/libffi-3.3-r2
index abd5b8b06da0..c0880e14a760 100644
--- a/metadata/md5-cache/dev-libs/libffi-3.3-r2
+++ b/metadata/md5-cache/dev-libs/libffi-3.3-r2
@@ -1,13 +1,13 @@
 BDEPEND=test? ( dev-util/dejagnu )
-DEFINED_PHASES=compile configure install prepare setup test
+DEFINED_PHASES=compile configure install setup test
 DESCRIPTION=a portable, high level programming interface to various calling conventions
 EAPI=7
 HOMEPAGE=https://sourceware.org/libffi/
-IUSE=debug pax_kernel static-libs test +test-bhaible abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
+IUSE=debug pax_kernel static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/7
 SRC_URI=https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=785a457b49fb1d11fe9ac83ed1877bdf
+_md5_=56a69e61c875e5955d65ad483e5cc68b
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.7.0 b/metadata/md5-cache/dev-libs/spdlog-1.7.0
new file mode 100644
index 000000000000..3aa1422e8a65
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/spdlog-1.7.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libfmt-6.1.2:=
+DESCRIPTION=Very fast, header only, C++ logging library
+EAPI=7
+HOMEPAGE=https://github.com/gabime/spdlog
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libfmt-6.1.2:=
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/gabime/spdlog/archive/v1.7.0.tar.gz -> spdlog-1.7.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a956dd35239cd2d56b93368b5be7c2b9
diff --git a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1 b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
index 91c5d362c590..489cdd5c32ec 100644
--- a/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
+++ b/metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install test
 DESCRIPTION=Fast public domain large integer arithmetic library
 EAPI=7
 HOMEPAGE=https://www.libtom.net/TomsFastMath/ https://github.com/libtom/tomsfastmath
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=Unlicense
 SLOT=0/1
 SRC_URI=https://github.com/libtom/tomsfastmath/releases/download/v0.13.1/tfm-0.13.1.tar.xz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5346d97159566acafe9a875b157c3986
+_md5_=c4e70272a16d6535f2f353d8b1256dfb
diff --git a/metadata/md5-cache/dev-libs/tre-0.8.0-r2 b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
index 396166ca0f9c..8810d2902a4d 100644
--- a/metadata/md5-cache/dev-libs/tre-0.8.0-r2
+++ b/metadata/md5-cache/dev-libs/tre-0.8.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight, robust, and efficient POSIX compliant regexp matching l
 EAPI=6
 HOMEPAGE=https://laurikari.net/tre/ https://github.com/laurikari/tre/
 IUSE=nls static-libs
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=BSD-2
 RDEPEND=!app-text/agrep !dev-ruby/amatch !app-misc/glimpse
 SLOT=0
 SRC_URI=https://laurikari.net/tre/tre-0.8.0.tar.bz2
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ce6273789a7bc1a5037542f5c269e2a0
+_md5_=f3b4159957147054764c53939809d57b
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index 7bc477e595f3..bff1cc8bc703 100644
Binary files a/metadata/md5-cache/dev-lisp/Manifest.gz and b/metadata/md5-cache/dev-lisp/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-lisp/roswell-20.04.14.105 b/metadata/md5-cache/dev-lisp/roswell-20.04.14.105
new file mode 100644
index 000000000000..8161952ae7f7
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/roswell-20.04.14.105
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DESCRIPTION=A lisp installer and launcher for major environment
+EAPI=7
+HOMEPAGE=https://github.com/roswell/roswell
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!net-libs/librouteros
+SLOT=0
+SRC_URI=https://github.com/roswell/roswell/archive/v20.04.14.105.tar.gz -> roswell-20.04.14.105.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2be6a75429182072309e8034387f00d
diff --git a/metadata/md5-cache/dev-lisp/roswell-20.05.14.106 b/metadata/md5-cache/dev-lisp/roswell-20.05.14.106
new file mode 100644
index 000000000000..ce9cf9355ae0
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/roswell-20.05.14.106
@@ -0,0 +1,12 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DESCRIPTION=A lisp installer and launcher for major environment
+EAPI=7
+HOMEPAGE=https://github.com/roswell/roswell
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=!net-libs/librouteros
+SLOT=0
+SRC_URI=https://github.com/roswell/roswell/archive/v20.05.14.106.tar.gz -> roswell-20.05.14.106.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e2be6a75429182072309e8034387f00d
diff --git a/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.190.0 b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.190.0
new file mode 100644
index 000000000000..3ecbe4befd15
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-ObjectDriver-0.190.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Class-Trigger dev-perl/DBI virtual/perl-Scalar-List-Utils >=dev-perl/Module-Build-Tiny-0.35.0 >=virtual/perl-ExtUtils-MakeMaker-6.590.0 test? ( dev-perl/Test-Exception >=dev-perl/DBD-SQLite-1.110.0 virtual/perl-version ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Module-Build-Tiny dev-lang/perl
+DESCRIPTION=Simple, transparent data interface, with caching
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Data-ObjectDriver
+IUSE=test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Accessor dev-perl/Class-Data-Inheritable dev-perl/Class-Trigger dev-perl/DBI virtual/perl-Scalar-List-Utils dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/S/SI/SIXAPART/Data-ObjectDriver-0.19.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=4d5190397084368927b7452c2ef19f71
diff --git a/metadata/md5-cache/dev-perl/Data-Page-2.30.0 b/metadata/md5-cache/dev-perl/Data-Page-2.30.0
new file mode 100644
index 000000000000..eca1e3837d55
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Page-2.30.0
@@ -0,0 +1,15 @@
+BDEPEND=virtual/perl-Carp dev-perl/Class-Accessor-Chained virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-File-Spec dev-perl/Test-Exception virtual/perl-Test-Simple ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=help when paging through sets of results
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Data-Page
+IUSE=test
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp dev-perl/Class-Accessor-Chained dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/Data-Page-2.03.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=c204a91cdbfc22f171cc0ac8f31d27d9
diff --git a/metadata/md5-cache/dev-perl/Data-Perl-0.2.11 b/metadata/md5-cache/dev-perl/Data-Perl-0.2.11
new file mode 100644
index 000000000000..ea66f87485d3
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Data-Perl-0.2.11
@@ -0,0 +1,15 @@
+BDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-Scalar-List-Utils virtual/perl-parent dev-perl/strictures virtual/perl-ExtUtils-MakeMaker test? ( dev-perl/Test-Deep dev-perl/Test-Fatal dev-perl/Test-Output ) dev-lang/perl
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=Base classes wrapping fundamental Perl data types
+EAPI=7
+HOMEPAGE=https://metacpan.org/release/Data-Perl
+IUSE=test
+KEYWORDS=~amd64 ~hppa ~ppc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-perl/Class-Method-Modifiers dev-perl/List-MoreUtils dev-perl/Module-Runtime dev-perl/Role-Tiny virtual/perl-Scalar-List-Utils virtual/perl-parent dev-perl/strictures dev-lang/perl:=
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/T/TO/TOBYINK/Data-Perl-0.002011.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
+_md5_=804727dc8fcbc0c01354035df5bbf07e
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index aa1a40555669..4d0d91cb0871 100644
Binary files a/metadata/md5-cache/dev-perl/Manifest.gz and b/metadata/md5-cache/dev-perl/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0 b/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
index 024bf29de592..662e5b75638f 100644
--- a/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
+++ b/metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
@@ -4,10 +4,10 @@ DESCRIPTION=Compiles yacc-like LALR grammars to generate Perl OO parser modules
 EAPI=6
 HOMEPAGE=https://metacpan.org/release/Parse-Yapp
 IUSE=examples
-KEYWORDS=~alpha amd64 ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<net-fs/samba-4.10.6 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	perl-module	97206c028d9bdc9f248e022ac5c9fc83
-_md5_=53c546b7ff17606e61d4237b1d2704e5
+_md5_=628ed9960029fead6067a2064634d1f0
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index cf48795f40b5..ab2338bacd7d 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/boto-2.49.0-r3 b/metadata/md5-cache/dev-python/boto-2.49.0-r3
index 0ed0861a290c..92af0b42d568 100644
--- a/metadata/md5-cache/dev-python/boto-2.49.0-r3
+++ b/metadata/md5-cache/dev-python/boto-2.49.0-r3
@@ -4,7 +4,7 @@ DESCRIPTION=Amazon Web Services API
 EAPI=7
 HOMEPAGE=https://github.com/boto/boto https://pypi.org/project/boto/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/b/boto/boto-2.49.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1755950db3873b7102b63df7bd53f9f0
+_md5_=7dd0fe976fc22478e3ecdc8320a3075d
diff --git a/metadata/md5-cache/dev-python/cliff-3.3.0 b/metadata/md5-cache/dev-python/cliff-3.3.0
index 6d80fe04e652..2ab9e577e912 100644
--- a/metadata/md5-cache/dev-python/cliff-3.3.0
+++ b/metadata/md5-cache/dev-python/cliff-3.3.0
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/pbr-2.1.0 test? ( >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cmd2-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] !~dev-python/pbr-2.1.0 test? ( dev-python/sphinx[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testtools-2.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/testscenarios-0.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/cmd2-0.8.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] <dev-python/prettytable-0.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyparsing-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pyyaml-3.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Command Line Interface Formulation Framework
 EAPI=7
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cliff/cliff-3.3.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=86af7d9c7d54b41255adddb0cdfc98e7
+_md5_=6531f0cf642ceb46a5090a20b3f143e3
diff --git a/metadata/md5-cache/dev-python/cryptography-2.9 b/metadata/md5-cache/dev-python/cryptography-2.9
index f24a953f79fd..4bc4db3950f9 100644
--- a/metadata/md5-cache/dev-python/cryptography-2.9
+++ b/metadata/md5-cache/dev-python/cryptography-2.9
@@ -5,7 +5,7 @@ DESCRIPTION=Library providing cryptographic recipes and primitives
 EAPI=7
 HOMEPAGE=https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/
 IUSE=libressl idna test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
 LICENSE=|| ( Apache-2.0 BSD )
 RDEPEND=!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= ) libressl? ( >=dev-libs/libressl-2.8:0= ) idna? ( >=dev-python/idna-2.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.4.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddress[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-python/cffi-1.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_6? ( >=dev-python/cffi-1.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( >=dev-python/cffi-1.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( >=dev-python/cffi-1.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( >=dev-python/cffi-1.8:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/c/cryptography/cryptography-2.9.tar.gz test? ( mirror://pypi/c/cryptography_vectors/cryptography_vectors-2.9.tar.gz )
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=df76378154e3cf380b422cc2e69442d4
+_md5_=e8aebeaaf17ccbfa8f3e9466abf63831
diff --git a/metadata/md5-cache/dev-python/dogpile-cache-0.9.1 b/metadata/md5-cache/dev-python/dogpile-cache-0.9.1
index 67b1059328dc..203128fbccde 100644
--- a/metadata/md5-cache/dev-python/dogpile-cache-0.9.1
+++ b/metadata/md5-cache/dev-python/dogpile-cache-0.9.1
@@ -5,7 +5,7 @@ DESCRIPTION=A locking API for expiring values while a single thread generates a
 EAPI=7
 HOMEPAGE=https://bitbucket.org/zzzeek/dogpile.cache
 IUSE=test test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dogpile.cache/dogpile.cache-0.9.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fc01b455767ef9b65a17799b5abe8ad4
+_md5_=7d80b306a44ad9d49cb6b20ecc3ca7aa
diff --git a/metadata/md5-cache/dev-python/dulwich-0.19.15 b/metadata/md5-cache/dev-python/dulwich-0.19.15
index e7dd2f92d20d..d4760b50b412 100644
--- a/metadata/md5-cache/dev-python/dulwich-0.19.15
+++ b/metadata/md5-cache/dev-python/dulwich-0.19.15
@@ -5,7 +5,7 @@ DESCRIPTION=Pure-Python implementation of the Git file formats and protocols
 EAPI=7
 HOMEPAGE=https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/
 IUSE=doc examples test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/urllib3-1.23[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/d/dulwich/dulwich-0.19.15.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e39466c3e97d215362a557b69791288e
+_md5_=ad802f7ec7d9bc113c07735e5897b67f
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.4.2 b/metadata/md5-cache/dev-python/geventhttpclient-1.4.2
index fa71f9e1e4e7..c5ff8f3b524c 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.4.2
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=A high performance, concurrent HTTP client library for Python using
 EAPI=7
 HOMEPAGE=https://github.com/gwik/geventhttpclient
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.4.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=88fad07b3e1b4d0160d426022bdd32f2
+_md5_=2037967f9f1e85a0f60c6881441af44d
diff --git a/metadata/md5-cache/dev-python/geventhttpclient-1.4.4 b/metadata/md5-cache/dev-python/geventhttpclient-1.4.4
index 479bdfba5d47..a881e337e0fd 100644
--- a/metadata/md5-cache/dev-python/geventhttpclient-1.4.4
+++ b/metadata/md5-cache/dev-python/geventhttpclient-1.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=A high performance, concurrent HTTP client library for Python using
 EAPI=7
 HOMEPAGE=https://github.com/gwik/geventhttpclient
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-python/certifi[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/gevent[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/g/geventhttpclient/geventhttpclient-1.4.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4acee06397e5da0f212057d01e76fcf7
+_md5_=3eaab21a79112d1cb62c5aa090930352
diff --git a/metadata/md5-cache/dev-python/helpdev-0.7.1 b/metadata/md5-cache/dev-python/helpdev-0.7.1
new file mode 100644
index 000000000000..098d1af69533
--- /dev/null
+++ b/metadata/md5-cache/dev-python/helpdev-0.7.1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Helping users and developers to get information about the environment
+EAPI=7
+HOMEPAGE=https://gitlab.com/dpizetta/helpdev
+IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) python_targets_python3_8? ( dev-python/importlib_metadata[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-)] ) dev-python/psutil[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/helpdev/helpdev-0.7.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=80aea6e79ae9a0c47933e4aa4986fd4e
diff --git a/metadata/md5-cache/dev-python/httpretty-1.0.2-r1 b/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
index ce94e6cf9706..9def3f325a6a 100644
--- a/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
+++ b/metadata/md5-cache/dev-python/httpretty-1.0.2-r1
@@ -5,7 +5,7 @@ DESCRIPTION=HTTP client mock for Python
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/httpretty
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ~ppc64 x86
 LICENSE=MIT
 RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/h/httpretty/httpretty-1.0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=330b3e427ccbce75654383b1f9d532ba
+_md5_=f2d80e49286fb5fab1bb7f481f02418c
diff --git a/metadata/md5-cache/dev-python/importlib_metadata-1.6.1 b/metadata/md5-cache/dev-python/importlib_metadata-1.6.1
index e29422d31998..7757b79f50bf 100644
--- a/metadata/md5-cache/dev-python/importlib_metadata-1.6.1
+++ b/metadata/md5-cache/dev-python/importlib_metadata-1.6.1
@@ -4,7 +4,7 @@ DESCRIPTION=Read metadata from Python packages
 EAPI=7
 HOMEPAGE=https://importlib-metadata.readthedocs.io/
 IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/zipp[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-python/configparser-3.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/contextlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/pathlib2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/i/importlib_metadata/importlib_metadata-1.6.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf121418b56037652004015974264487
+_md5_=a533116bc5ece68d2170aacb3a1d209e
diff --git a/metadata/md5-cache/dev-python/jedi-0.17.1 b/metadata/md5-cache/dev-python/jedi-0.17.1-r1
similarity index 95%
rename from metadata/md5-cache/dev-python/jedi-0.17.1
rename to metadata/md5-cache/dev-python/jedi-0.17.1-r1
index cf4bd200c1bc..e616119a6f6e 100644
--- a/metadata/md5-cache/dev-python/jedi-0.17.1
+++ b/metadata/md5-cache/dev-python/jedi-0.17.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/parso-0.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+BDEPEND=doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) test? ( >=dev-python/parso-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Autocompletion library for Python
 EAPI=7
@@ -6,10 +6,10 @@ HOMEPAGE=https://github.com/davidhalter/jedi
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT test? ( Apache-2.0 )
-RDEPEND=>=dev-python/parso-0.5.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+RDEPEND=>=dev-python/parso-0.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/davidhalter/jedi/archive/v0.17.1.tar.gz -> jedi-0.17.1.tar.gz https://github.com/davidhalter/typeshed/archive/jedi_v0.16.0.tar.gz -> typeshed-jedi_v0.16.0.tar.gz https://github.com/davidhalter/django-stubs/archive/v1.5.0.tar.gz -> django-stubs-1.5.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a1ad4cd8acf24a5a91080d8b44ca2dc3
+_md5_=7a2473856ed03d12a2a05511e8448972
diff --git a/metadata/md5-cache/dev-python/jeepney-0.4.3 b/metadata/md5-cache/dev-python/jeepney-0.4.3
index a5c1a76fd8f8..6ae1d4a24b22 100644
--- a/metadata/md5-cache/dev-python/jeepney-0.4.3
+++ b/metadata/md5-cache/dev-python/jeepney-0.4.3
@@ -4,7 +4,7 @@ DESCRIPTION=Low-level, pure Python DBus protocol wrapper
 EAPI=7
 HOMEPAGE=https://gitlab.com/takluyver/jeepney
 IUSE=examples test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jeepney/jeepney-0.4.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d0b3c2ef15006d57928dd3aee75c2c2a
+_md5_=f352a323ff6fcfa38ef4ae09e281af52
diff --git a/metadata/md5-cache/dev-python/jmespath-0.10.0 b/metadata/md5-cache/dev-python/jmespath-0.10.0
index 23bf6b33d3f3..55a5fd0be268 100644
--- a/metadata/md5-cache/dev-python/jmespath-0.10.0
+++ b/metadata/md5-cache/dev-python/jmespath-0.10.0
@@ -4,7 +4,7 @@ DESCRIPTION=JSON Matching Expressions
 EAPI=7
 HOMEPAGE=https://github.com/jmespath/jmespath.py https://pypi.org/project/jmespath/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmespath/jmespath.py/archive/0.10.0.tar.gz -> jmespath.py-0.10.0.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=629b1f0ef75c8caf69c96070287cf9a9
+_md5_=ac6a9b5b3dc6bea1abbf57e77e63db51
diff --git a/metadata/md5-cache/dev-python/jsonpatch-1.26 b/metadata/md5-cache/dev-python/jsonpatch-1.26
index 99cc8643bd4a..04fcef7b66c3 100644
--- a/metadata/md5-cache/dev-python/jsonpatch-1.26
+++ b/metadata/md5-cache/dev-python/jsonpatch-1.26
@@ -4,7 +4,7 @@ DESCRIPTION=Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json
 EAPI=7
 HOMEPAGE=https://github.com/stefankoegl/python-json-patch
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonpointer-1.9[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/stefankoegl/python-json-patch/archive/v1.26.tar.gz -> jsonpatch-1.26.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a692ae6548a470023aade84912ecf0d7
+_md5_=e0a0e63e99d2cb1cd8b6ffdda6016a60
diff --git a/metadata/md5-cache/dev-python/keyring-21.2.1 b/metadata/md5-cache/dev-python/keyring-21.2.1
index 451355591a1d..947768c121ed 100644
--- a/metadata/md5-cache/dev-python/keyring-21.2.1
+++ b/metadata/md5-cache/dev-python/keyring-21.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=Provides access to the system keyring service
 EAPI=7
 HOMEPAGE=https://github.com/jaraco/keyring
 IUSE=doc test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=PSF-2
 RDEPEND=dev-python/secretstorage[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/entrypoints[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/jeepney[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-python/importlib_metadata[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jaraco/keyring/archive/v21.2.1.tar.gz -> keyring-21.2.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bad39cf78cbdf1745080d58dbfc8877d
+_md5_=be1657f1ac7dc58717c04380fa2f7e27
diff --git a/metadata/md5-cache/dev-python/keystoneauth-4.0.1 b/metadata/md5-cache/dev-python/keystoneauth-4.0.1
index 62e226f59f9c..d91a49326796 100644
--- a/metadata/md5-cache/dev-python/keystoneauth-4.0.1
+++ b/metadata/md5-cache/dev-python/keystoneauth-4.0.1
@@ -5,11 +5,11 @@ DESCRIPTION=This package contains tools for authenticating to an OpenStack-based
 EAPI=7
 HOMEPAGE=https://github.com/openstack/keystoneauth
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.14.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/stevedore-1.20.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/k/keystoneauth1/keystoneauth1-4.0.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d003dd6505d91fd258a123686279375c
+_md5_=8b34c82dddd8c980156cf63561168f2d
diff --git a/metadata/md5-cache/dev-python/libsass-0.20.0 b/metadata/md5-cache/dev-python/libsass-0.20.0
index a5c4adb881a7..d7295bfa0455 100644
--- a/metadata/md5-cache/dev-python/libsass-0.20.0
+++ b/metadata/md5-cache/dev-python/libsass-0.20.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libsass dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/PyQt5[testlib,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-libs/libsass dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/PyQt5[testlib,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/werkzeug[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=A straightforward binding of libsass for Python
 EAPI=7
 HOMEPAGE=https://github.com/sass/libsass-python
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/l/libsass/libsass-0.20.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=19708e51644cfd451f1115e805b967d8
+_md5_=75ecb7fa5b88bfe1fca1151102616bf4
diff --git a/metadata/md5-cache/dev-python/lit-10.0.0 b/metadata/md5-cache/dev-python/lit-10.0.0
index 3282f998a587..0550da168651 100644
--- a/metadata/md5-cache/dev-python/lit-10.0.0
+++ b/metadata/md5-cache/dev-python/lit-10.0.0
@@ -4,7 +4,7 @@ DESCRIPTION=A stand-alone install of the LLVM suite testing tool
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=9ed0bfedaf3254d2bb1d09e875a5b037
+_md5_=0c9b4ff9651c8b6f18448bfa84fff6ed
diff --git a/metadata/md5-cache/dev-python/m2crypto-0.36.0 b/metadata/md5-cache/dev-python/m2crypto-0.36.0
new file mode 100644
index 000000000000..1505485729ce
--- /dev/null
+++ b/metadata/md5-cache/dev-python/m2crypto-0.36.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/swig-2.0.9 dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=A Python crypto and SSL toolkit
+EAPI=7
+HOMEPAGE=https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/
+IUSE=libressl python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_python2_7? ( dev-python/typing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/M/M2Crypto/M2Crypto-0.36.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=abd35465650e0ae5b8b5aaac91478adc
diff --git a/metadata/md5-cache/dev-python/multidict-4.7.6 b/metadata/md5-cache/dev-python/multidict-4.7.6
index 2cb35b6e3ab6..324a7a9b4469 100644
--- a/metadata/md5-cache/dev-python/multidict-4.7.6
+++ b/metadata/md5-cache/dev-python/multidict-4.7.6
@@ -4,7 +4,7 @@ DESCRIPTION=multidict implementation
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/multidict/
 IUSE=doc test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aio-libs/multidict/archive/v4.7.6.tar.gz -> multidict-4.7.6.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e1b92f094bde26e8f54051c0e1df43dc
+_md5_=ac9bf33e53c72cac68de971924969066
diff --git a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1 b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
index 9fc28a5b0f69..c84623b76177 100644
--- a/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
+++ b/metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
@@ -4,11 +4,11 @@ DESCRIPTION=Theme and extension support for Sphinx documentation
 EAPI=6
 HOMEPAGE=https://docs.openstack.org/openstackdocstheme/latest/
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~alpha amd64 arm64 ~ia64 ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstackdocstheme/openstackdocstheme-1.18.1.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a4aa6cd6423d7d4587858809fe813b9
+_md5_=c14ff8bd7d95a674cb93d58ec78a612b
diff --git a/metadata/md5-cache/dev-python/openstacksdk-0.46.0 b/metadata/md5-cache/dev-python/openstacksdk-0.46.0
index b8bc352a1541..0d20e3d7f0e6 100644
--- a/metadata/md5-cache/dev-python/openstacksdk-0.46.0
+++ b/metadata/md5-cache/dev-python/openstacksdk-0.46.0
@@ -5,11 +5,11 @@ DESCRIPTION=A collection of libraries for building applications to work with Ope
 EAPI=7
 HOMEPAGE=https://github.com/openstack/python-openstacksdk
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/pbr-2.1.0 >=dev-python/pyyaml-3.12[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/appdirs-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requestsexceptions-1.2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jsonpatch-1.16[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] !~dev-python/jsonpatch-1.20[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/os-service-types-1.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/keystoneauth-3.18.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/munch-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/decorator-4.4.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jmespath-0.9.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/iso8601-0.1.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/dogpile-cache-0.6.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/cryptography-2.1.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/o/openstacksdk/openstacksdk-0.46.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1830813fb388f8bd2e2ea613e22eaa3f
+_md5_=7a4a3f4f8f0a541130587446f72f6319
diff --git a/metadata/md5-cache/dev-python/os-service-types-1.7.0 b/metadata/md5-cache/dev-python/os-service-types-1.7.0
index 4ff392144111..d198ef638a77 100644
--- a/metadata/md5-cache/dev-python/os-service-types-1.7.0
+++ b/metadata/md5-cache/dev-python/os-service-types-1.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=A library to handle official service types for OpenStack and it's al
 EAPI=7
 HOMEPAGE=https://github.com/openstack/os-service-types
 IUSE=python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] !~dev-python/pbr-2.1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/o/os-service-types/os-service-types-1.7.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1bed0cec51c6b20302292e2b41dde1be
+_md5_=3ad3430c0717ae9b80673d4b04da7284
diff --git a/metadata/md5-cache/dev-python/pathspec-0.8.0 b/metadata/md5-cache/dev-python/pathspec-0.8.0
index 7a756b463c21..648ddd4c154e 100644
--- a/metadata/md5-cache/dev-python/pathspec-0.8.0
+++ b/metadata/md5-cache/dev-python/pathspec-0.8.0
@@ -4,11 +4,11 @@ DESCRIPTION=Utility library for gitignore style pattern matching of file paths.
 EAPI=7
 HOMEPAGE=https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/
 IUSE=python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pathspec/pathspec-0.8.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a12206b0778695542218611d095f3be3
+_md5_=76346ebdc968a43e5be9cffb0d3206bf
diff --git a/metadata/md5-cache/dev-python/pep8-1.7.1-r1 b/metadata/md5-cache/dev-python/pep8-1.7.1-r1
new file mode 100644
index 000000000000..db96d6e7f566
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pep8-1.7.1-r1
@@ -0,0 +1,15 @@
+BDEPEND=doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python style guide checker
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/pep8 https://pypi.org/project/pep8/
+IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pep8/pep8-1.7.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=aabf43faabcf2aaa600b60c216f2066b
diff --git a/metadata/md5-cache/dev-python/psutil-5.7.2 b/metadata/md5-cache/dev-python/psutil-5.7.2
new file mode 100644
index 000000000000..c8d41202fe76
--- /dev/null
+++ b/metadata/md5-cache/dev-python/psutil-5.7.2
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( python_targets_python2_7? ( dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipaddress[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) )
+DESCRIPTION=Retrieve information on running processes and system utilization
+EAPI=7
+HOMEPAGE=https://github.com/giampaolo/psutil https://pypi.org/project/psutil/
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/psutil/psutil-5.7.2.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a4bbaedfde98ca083098de3bf23277eb
diff --git a/metadata/md5-cache/dev-python/pycairo-1.19.1 b/metadata/md5-cache/dev-python/pycairo-1.19.1
index 5a807c7ec8cb..ad456229fdcc 100644
--- a/metadata/md5-cache/dev-python/pycairo-1.19.1
+++ b/metadata/md5-cache/dev-python/pycairo-1.19.1
@@ -5,7 +5,7 @@ DESCRIPTION=Python bindings for the cairo library
 EAPI=7
 HOMEPAGE=https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo
 IUSE=examples doc test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=|| ( LGPL-2.1 MPL-1.1 )
 RDEPEND=>=x11-libs/cairo-1.13.1[svg] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[threads(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[threads(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[threads(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[threads(+)] ) python_targets_python3_9? ( dev-lang/python:3.9[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pygobject/pycairo/releases/download/v1.19.1/pycairo-1.19.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=c880febedd60ead5100de52edbddd6ce
+_md5_=a53473f0cb90a35fd332c79c781b73d6
diff --git a/metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1 b/metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1
new file mode 100644
index 000000000000..47d6a5dcb9c4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/snowballstemmer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/pytest-pep8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/mypy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/tox[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Python docstring style checker
+EAPI=7
+HOMEPAGE=https://github.com/PyCQA/pydocstyle/
+IUSE=test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/snowballstemmer[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyCQA/pydocstyle/archive/5.0.2.tar.gz -> pydocstyle-5.0.2.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=49dbfb734214b3e2f3ccd0f27401fae2
diff --git a/metadata/md5-cache/dev-python/pyfakefs-3.7.2 b/metadata/md5-cache/dev-python/pyfakefs-3.7.2
index ebc849231296..c46160a2f0f3 100644
--- a/metadata/md5-cache/dev-python/pyfakefs-3.7.2
+++ b/metadata/md5-cache/dev-python/pyfakefs-3.7.2
@@ -5,7 +5,7 @@ DESCRIPTION=a fake file system that mocks the Python file system modules
 EAPI=7
 HOMEPAGE=https://github.com/jmcgeheeiv/pyfakefs/ https://pypi.org/project/pyfakefs/
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jmcgeheeiv/pyfakefs/archive/v3.7.2.tar.gz -> pyfakefs-3.7.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fdf2cfcb944c0bfc1e0b1264dfe45105
+_md5_=eda99c57510527d6a725d4cea5efea87
diff --git a/metadata/md5-cache/dev-python/pyre2-1.0.7 b/metadata/md5-cache/dev-python/pyre2-1.0.7
new file mode 100644
index 000000000000..82a856a24d16
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyre2-1.0.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-libs/re2:= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/re2:=
+DESCRIPTION=Python bindings for dev-libs/re2
+EAPI=7
+HOMEPAGE=https://github.com/facebook/pyre2/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-libs/re2:= python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facebook/pyre2/archive/v1.0.7.tar.gz -> pyre2-1.0.7.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=488998b6fb7a3868ed715e46163f4871
diff --git a/metadata/md5-cache/dev-python/pyrsistent-0.16.0 b/metadata/md5-cache/dev-python/pyrsistent-0.16.0
index fd29cb5c14f4..53eaa0d4092c 100644
--- a/metadata/md5-cache/dev-python/pyrsistent-0.16.0
+++ b/metadata/md5-cache/dev-python/pyrsistent-0.16.0
@@ -5,7 +5,7 @@ DESCRIPTION=Persistent/Functional/Immutable data structures
 EAPI=7
 HOMEPAGE=https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pyrsistent/pyrsistent-0.16.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=7c42da762f7219e41a0358dd8098152c
+_md5_=2a339093e6c8ad89a505b84825ea26ca
diff --git a/metadata/md5-cache/dev-python/pytest-cache-1.0-r3 b/metadata/md5-cache/dev-python/pytest-cache-1.0-r3
new file mode 100644
index 000000000000..3b58dcc6d21a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-cache-1.0-r3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=mechanisms for caching across test runs
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-cache/ https://bitbucket.org/hpk42/pytest-cache/ https://pythonhosted.org/pytest-cache/
+IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/execnet[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-cache/pytest-cache-1.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=3d8b6ddf211473a300831204efefa34c
diff --git a/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2 b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2
new file mode 100644
index 000000000000..a98a8bbb178a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DESCRIPTION=pytest plugin to check PEP8 requirements
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-pep8/
+IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pep8-1.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-2.4.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-cache[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-pep8/pytest-pep8-1.0.6.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=51ac627316be1c847c296c7d0f4b1df0
diff --git a/metadata/md5-cache/dev-python/pytest-timeout-1.4.2 b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2
new file mode 100644
index 000000000000..3e008bba1662
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-timeout-1.4.2
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-cov[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) test? ( >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=py.test plugin to abort hanging tests
+EAPI=7
+HOMEPAGE=https://pypi.org/project/pytest-timeout/
+IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-timeout/pytest-timeout-1.4.2.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=d5970abf3e29785792dbc3a972cd3df0
diff --git a/metadata/md5-cache/dev-python/python-fastimport-0.9.8 b/metadata/md5-cache/dev-python/python-fastimport-0.9.8
index 2ebf3350437b..c3aca17a40c9 100644
--- a/metadata/md5-cache/dev-python/python-fastimport-0.9.8
+++ b/metadata/md5-cache/dev-python/python-fastimport-0.9.8
@@ -4,11 +4,11 @@ DESCRIPTION=Library for parsing the fastimport VCS serialization format
 EAPI=7
 HOMEPAGE=https://github.com/jelmer/python-fastimport
 IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fastimport/fastimport-0.9.8.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=26cf73ce0f8b367a5973257f9075d01a
+_md5_=7424b88a98edcca4fd011b77965be151
diff --git a/metadata/md5-cache/dev-python/python-language-server-0.34.1 b/metadata/md5-cache/dev-python/python-language-server-0.34.1
new file mode 100644
index 000000000000..d50a787405cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-language-server-0.34.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/versioneer[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] test? ( >=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pluggy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-jsonrpc-server-0.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/ujson-1.35[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=test? ( dev-python/autopep8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/flake8-3.8.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/mccabe-0.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/mccabe-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pycodestyle-2.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/pycodestyle-2.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pydocstyle-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pyflakes[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pylint[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/QtPy[testlib,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/rope-0.10.5[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/yapf[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
+DESCRIPTION=An implementation of the Language Server Protocol for Python
+EAPI=7
+HOMEPAGE=https://github.com/palantir/python-language-server
+IUSE=test python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/jedi-0.17.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/jedi-0.18.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pluggy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-jsonrpc-server-0.3.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/ujson-1.35[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/python-language-server/python-language-server-0.34.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=8a0c02626a0b6a95748f61c70d4e46ab
diff --git a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1 b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
index 6edec4ca2c3d..7b8e77989472 100644
--- a/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+++ b/metadata/md5-cache/dev-python/qdarkstyle-2.8.1
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) doc? ( || ( ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/m2r[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/m2r[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/m2r[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/m2r[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/m2r[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/m2r[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/m2r[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ) ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=test? ( dev-python/qtsass[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=test? ( dev-python/qtsass[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=A dark style sheet for QtWidgets application
 EAPI=7
 HOMEPAGE=https://github.com/ColinDuquesnoy/QDarkStyleSheet
-IUSE=examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=examples test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=>=dev-python/helpdev-0.6.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/QtPy-1.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ColinDuquesnoy/QDarkStyleSheet/archive/v2.8.1.tar.gz -> qdarkstyle-2.8.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5cde2234ee1791ee294c64df9931aec9
+_md5_=fa17704fd973703c66680874a8296abe
diff --git a/metadata/md5-cache/dev-python/qtsass-0.3.0 b/metadata/md5-cache/dev-python/qtsass-0.3.0
index 27e5a845747c..c63c3427c926 100644
--- a/metadata/md5-cache/dev-python/qtsass-0.3.0
+++ b/metadata/md5-cache/dev-python/qtsass-0.3.0
@@ -1,16 +1,16 @@
-BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/libsass[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEPEND=dev-python/libsass[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DESCRIPTION=Compile SASS files to Qt stylesheets
 EAPI=7
 HOMEPAGE=https://github.com/spyder-ide/qtsass
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spyder-ide/qtsass/archive/v0.3.0.tar.gz -> qtsass-0.3.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ae67b3338f8f7d852a4ce9b49734d65e
+_md5_=435fcd3fd685da05bc14172ea4ca6736
diff --git a/metadata/md5-cache/dev-python/regex-2020.4.4 b/metadata/md5-cache/dev-python/regex-2020.4.4
index b9e739db2707..42b589fa725d 100644
--- a/metadata/md5-cache/dev-python/regex-2020.4.4
+++ b/metadata/md5-cache/dev-python/regex-2020.4.4
@@ -4,11 +4,11 @@ DESCRIPTION=Alternative regular expression module to replace re
 EAPI=7
 HOMEPAGE=https://bitbucket.org/mrabarnett/mrab-regex
 IUSE=doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 SLOT=0
 SRC_URI=mirror://pypi/r/regex/regex-2020.4.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=d320c3d6417ad30898cb45339a0e55e1
+_md5_=5b0eca3ec2c69c819a21b16772ea2353
diff --git a/metadata/md5-cache/dev-python/reno-2.11.3 b/metadata/md5-cache/dev-python/reno-2.11.3
index 672b137c52d3..a7737da0ff19 100644
--- a/metadata/md5-cache/dev-python/reno-2.11.3
+++ b/metadata/md5-cache/dev-python/reno-2.11.3
@@ -4,11 +4,11 @@ DESCRIPTION=Release notes manager, storing release notes in a git repo and build
 EAPI=7
 HOMEPAGE=https://pypi.org/project/reno/
 IUSE=python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha ~amd64 ~arm64 ~ia64 ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-1.4[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pyyaml-3.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/six-1.10.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/dulwich-0.15.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
 SLOT=0
 SRC_URI=mirror://pypi/r/reno/reno-2.11.3.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=e664c2195c61a147bd1b3b237ad33862
+_md5_=a4c39e9b936a70752c90336ee4f8a06d
diff --git a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0 b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
index a7a471f2ed3d..4ea08fc0e3e6 100644
--- a/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+++ b/metadata/md5-cache/dev-python/requestsexceptions-1.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Finds the correct path to exceptions in the requests library.
 EAPI=6
 HOMEPAGE=https://github.com/openstack-infra/requestsexceptions
 IUSE=python_targets_python3_6 python_targets_python3_7
-KEYWORDS=amd64 arm64 x86
+KEYWORDS=amd64 ~arm arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
 SLOT=0
 SRC_URI=mirror://pypi/r/requestsexceptions/requestsexceptions-1.4.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=237ca9fe52b844c09a532e1e51a3718d
+_md5_=9aae683035769dc9a1cb5e03b5868b37
diff --git a/metadata/md5-cache/dev-python/rope-0.17.0 b/metadata/md5-cache/dev-python/rope-0.17.0
new file mode 100644
index 000000000000..e0c4e1ebeebf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rope-0.17.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DESCRIPTION=Python refactoring library
+EAPI=7
+HOMEPAGE=https://github.com/python-rope/rope
+IUSE=doc test python_targets_python3_7 python_targets_python3_8
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rope/rope-0.17.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=101014fad67d1f6ff2440e03734f8245
diff --git a/metadata/md5-cache/dev-python/rsa-4.2 b/metadata/md5-cache/dev-python/rsa-4.2
index bdc41e12fb85..8e441354bb77 100644
--- a/metadata/md5-cache/dev-python/rsa-4.2
+++ b/metadata/md5-cache/dev-python/rsa-4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Pure-Python RSA implementation
 EAPI=7
 HOMEPAGE=https://stuvel.eu/rsa https://pypi.org/project/rsa/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm arm64 ~ppc64 x86
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pyasn1-0.1.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sybrenstuvel/python-rsa/archive/version-4.2.tar.gz -> python-rsa-version-4.2.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=a47754570496204f94061435ad7d6fa7
+_md5_=e430418d54d8dd65cebd04ac8fdbe600
diff --git a/metadata/md5-cache/dev-python/scrypt-0.8.15 b/metadata/md5-cache/dev-python/scrypt-0.8.15
index 7d6f735118c9..7230c598c810 100644
--- a/metadata/md5-cache/dev-python/scrypt-0.8.15
+++ b/metadata/md5-cache/dev-python/scrypt-0.8.15
@@ -5,7 +5,7 @@ DESCRIPTION=Bindings for the scrypt key derivation function library
 EAPI=7
 HOMEPAGE=https://github.com/holgern/py-scrypt/
 IUSE=libressl test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
 LICENSE=BSD-2
 RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/scrypt/scrypt-0.8.15.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2e89d560027bfbf06e987ef0a8c9ff01
+_md5_=26f4a206c7ca172bb50051bf2945c3d4
diff --git a/metadata/md5-cache/dev-python/secretstorage-3.1.2 b/metadata/md5-cache/dev-python/secretstorage-3.1.2
index 6f7f728809a5..601876be43e1 100644
--- a/metadata/md5-cache/dev-python/secretstorage-3.1.2
+++ b/metadata/md5-cache/dev-python/secretstorage-3.1.2
@@ -4,7 +4,7 @@ DESCRIPTION=Python bindings to FreeDesktop.org Secret Service API.
 EAPI=7
 HOMEPAGE=https://github.com/mitya57/secretstorage https://pypi.org/project/SecretStorage/
 IUSE=test doc python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=dev-python/cryptography[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SecretStorage/SecretStorage-3.1.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8a3e655b95e6b5fe47ec74fca4331dc7
+_md5_=c83de6538a86d195f75807f666b11ccc
diff --git a/metadata/md5-cache/dev-python/selenium-3.141.0-r1 b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
index 09e7a663c510..237b496189c1 100644
--- a/metadata/md5-cache/dev-python/selenium-3.141.0-r1
+++ b/metadata/md5-cache/dev-python/selenium-3.141.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Python language binding for Selenium Remote Control
 EAPI=7
 HOMEPAGE=https://www.seleniumhq.org
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 arm ~arm64 ~ia64 ~ppc ppc64 ~sparc x86
+KEYWORDS=amd64 arm arm64 ~ia64 ~ppc ppc64 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/selenium/selenium-3.141.0.tar.gz test? ( https://github.com/SeleniumHQ/selenium/archive/selenium-3.141.0.tar.gz -> selenium-3.141.0.gh.tar.gz )
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=af53d975abcfbc162125fb6b5f2902df
+_md5_=7dad0e6d2bad8f508424e00237de8bd2
diff --git a/metadata/md5-cache/dev-python/simplejson-3.17.2 b/metadata/md5-cache/dev-python/simplejson-3.17.2
new file mode 100644
index 000000000000..21acef91fb65
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplejson-3.17.2
@@ -0,0 +1,14 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple, fast, extensible JSON encoder/decoder for Python
+EAPI=7
+HOMEPAGE=https://github.com/simplejson/simplejson https://pypi.org/project/simplejson/
+IUSE=python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=|| ( MIT AFL-2.1 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=mirror://pypi/s/simplejson/simplejson-3.17.2.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=46ef496d5aa53f9c2f00e03bc1311c49
diff --git a/metadata/md5-cache/dev-python/six-1.15.0 b/metadata/md5-cache/dev-python/six-1.15.0
index 6207d510a3e8..a5fc4bba484f 100644
--- a/metadata/md5-cache/dev-python/six-1.15.0
+++ b/metadata/md5-cache/dev-python/six-1.15.0
@@ -4,7 +4,7 @@ DESCRIPTION=Python 2 and 3 compatibility library
 EAPI=7
 HOMEPAGE=https://github.com/benjaminp/six https://pypi.org/project/six/
 IUSE=doc doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/six/six-1.15.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=12b358fbfc284d03bbab678ead5cb702
+_md5_=cb3432e3deb9f76cb894e4aae5bb8051
diff --git a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2 b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
index f3bfbcadc4af..65b9c2217d25 100644
--- a/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+++ b/metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
@@ -1,15 +1,16 @@
+BDEPEND=test? ( dev-python/namespace-sphinxcontrib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/mock[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pytest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/namespace-sphinxcontrib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Extension to sphinx to create links to issue trackers
-EAPI=6
+EAPI=7
 HOMEPAGE=http://sphinxcontrib-issuetracker.readthedocs.org/
-IUSE=doc test python_targets_python3_6
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD-2
-RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/requests[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/sphinx[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
+RDEPEND=dev-python/namespace-sphinxcontrib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4907797f59de23efc5c3bfb5b0f851e5
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=0083247e06646d663cc0418a115636d2
diff --git a/metadata/md5-cache/dev-python/spyder-4.1.4 b/metadata/md5-cache/dev-python/spyder-4.1.4
new file mode 100644
index 000000000000..58940f70b081
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-4.1.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/atomicwrites-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/chardet-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/intervaltree[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ipython-4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/jedi-0.17.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/parso-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pickleshare-0.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pylint-1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-language-server-0.34.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyxdg-0.26[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyzmq-17.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/qdarkstyle-2.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/qtawesome-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/qtconsole-4.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/spyder-kernels-1.9.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/spyder-kernels-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/watchdog[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) doc? ( dev-python/sphinx ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=test? ( dev-python/coverage[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/matplotlib[tk,python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pillow[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pytest-lazy-fixture[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pytest-mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pytest-qt[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/sympy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/xarray[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=The Scientific Python Development Environment
+EAPI=7
+HOMEPAGE=https://www.spyder-ide.org/ https://github.com/spyder-ide/spyder/ https://pypi.org/project/spyder/
+IUSE=test doc python_targets_python3_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/atomicwrites-1.2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/chardet-2.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/cloudpickle-0.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/diff-match-patch-20181111[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/intervaltree[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ipython-4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/jedi-0.17.1[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/keyring[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/nbconvert-4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/numpydoc-0.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ~dev-python/parso-0.7.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pexpect-4.4.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pickleshare-0.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/psutil-5.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pylint-1.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/python-language-server-0.34.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/python-language-server-1.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyxdg-0.26[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyzmq-17.0.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/qdarkstyle-2.8[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/qtawesome-0.5.7[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/qtconsole-4.6.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/QtPy-1.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-),svg,webengine] >=dev-python/sphinx-0.6.6[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/spyder-kernels-1.9.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] <dev-python/spyder-kernels-1.10.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/watchdog[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 )
+RESTRICT=test !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder/archive/v4.1.4.tar.gz -> spyder-4.1.4.tar.gz https://github.com/spyder-ide/spyder-docs/archive/0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz -> spyder-docs-0d5afe26b8e28f3eb9f36f4ec3828bf8375c339e.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6ce76fe20260f0fb904b1e1163242da7
diff --git a/metadata/md5-cache/dev-python/spyder-kernels-1.9.2 b/metadata/md5-cache/dev-python/spyder-kernels-1.9.2
new file mode 100644
index 000000000000..9dd871475d20
--- /dev/null
+++ b/metadata/md5-cache/dev-python/spyder-kernels-1.9.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cloudpickle[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ipykernel-5.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/wurlitzer-1.0.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pytest-4.5.0[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/cython[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/flaky[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/matplotlib[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/mock[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/numpy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/pandas[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] sci-libs/scipy[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] dev-python/xarray[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] )
+DESCRIPTION=Kernels used by spyder on its ipython console
+EAPI=7
+HOMEPAGE=https://github.com/spyder-ide/spyder-kernels/ https://pypi.org/project/spyder-kernels/
+IUSE=test python_targets_python3_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/cloudpickle[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/ipykernel-5.1.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] >=dev-python/wurlitzer-1.0.3[python_targets_python3_7(-)?,-python_single_target_python3_7(-)] python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python3_7(-)?,-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/spyder-kernels/archive/v1.9.2.tar.gz -> spyder-kernels-1.9.2-gh.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=36b986121f91d5cd8de5963752c6e9ff
diff --git a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17 b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
index 49b3e7d08e5e..10cd8aac7ede 100644
--- a/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+++ b/metadata/md5-cache/dev-python/sqlalchemy-1.3.17
@@ -4,7 +4,7 @@ DESCRIPTION=Python SQL toolkit and Object Relational Mapper
 EAPI=7
 HOMEPAGE=https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/
 IUSE=examples +sqlite test test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0=[sqlite?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite?] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite?] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite?] ) python_targets_python3_8? ( dev-lang/python:3.8[sqlite?] ) python_targets_python3_9? ( dev-lang/python:3.9[sqlite?] ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=test? ( sqlite ) || ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/S/SQLAlchemy/SQLAlchemy-1.3.17.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=976d4b491218e60f398a0bb852de4ecb
+_md5_=979c5860f9518ab83a1b0c00d54c94e6
diff --git a/metadata/md5-cache/dev-python/stevedore-3.1.0 b/metadata/md5-cache/dev-python/stevedore-3.1.0
index 8ae2435ac41a..aeb6c34b3a25 100644
--- a/metadata/md5-cache/dev-python/stevedore-3.1.0
+++ b/metadata/md5-cache/dev-python/stevedore-3.1.0
@@ -4,7 +4,7 @@ DESCRIPTION=Manage dynamic plugins for Python applications
 EAPI=7
 HOMEPAGE=https://github.com/openstack/stevedore https://pypi.org/project/stevedore/
 IUSE=test doc python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_6? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.7.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) >=dev-python/six-1.10.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/stevedore/stevedore-3.1.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=48a45c0632c03dd6c5ab68f96795485f
+_md5_=affe7a97761d2c0f14854826cb29e12b
diff --git a/metadata/md5-cache/dev-python/subunit-1.2.0-r1 b/metadata/md5-cache/dev-python/subunit-1.2.0-r1
deleted file mode 100644
index eadea219c58d..000000000000
--- a/metadata/md5-cache/dev-python/subunit-1.2.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/extras[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-lang/perl:= dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-libs/check-0.9.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cppunit-1.13.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig test? ( dev-python/fixtures[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/hypothesis[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/testscenarios[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DESCRIPTION=A streaming protocol for test results
-EAPI=5
-HOMEPAGE=https://launchpad.net/subunit https://pypi.org/project/python-subunit/
-IUSE=static-libs test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
-LICENSE=Apache-2.0 BSD
-RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/extras[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-lang/perl:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://launchpad.net/subunit/trunk/1.2/+download/subunit-1.2.0.tar.gz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9aeffb1e066cd2d6eaab8ac9d2ea526
diff --git a/metadata/md5-cache/dev-python/subunit-1.4.0 b/metadata/md5-cache/dev-python/subunit-1.4.0
index af9922fb92e5..6d161fe54346 100644
--- a/metadata/md5-cache/dev-python/subunit-1.4.0
+++ b/metadata/md5-cache/dev-python/subunit-1.4.0
@@ -5,7 +5,7 @@ DESCRIPTION=A streaming protocol for test results
 EAPI=7
 HOMEPAGE=https://launchpad.net/subunit https://pypi.org/project/python-subunit/
 IUSE=static-libs test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86
 LICENSE=Apache-2.0 BSD
 RDEPEND=>=dev-python/testtools-0.9.34[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/extras[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-lang/perl:= python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://launchpad.net/subunit/trunk/1.4.0/+download/subunit-1.4.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b7fba56038b1719c83b398970bb68d61
+_md5_=bc8b312b1faa2f5c3fd54e741dc5a608
diff --git a/metadata/md5-cache/dev-python/sure-1.4.11 b/metadata/md5-cache/dev-python/sure-1.4.11
index 4ce6a8bef9c5..debbd1883f56 100644
--- a/metadata/md5-cache/dev-python/sure-1.4.11
+++ b/metadata/md5-cache/dev-python/sure-1.4.11
@@ -4,7 +4,7 @@ DESCRIPTION=idiomatic assertion toolkit with human-friendly failure messages
 EAPI=7
 HOMEPAGE=https://github.com/gabrielfalcao/sure
 IUSE=test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86
+KEYWORDS=amd64 ~arm arm64 ~ppc ppc64 x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/nose-1.3.0[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/s/sure/sure-1.4.11.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=653d47ab2125e87773d681c4a628daf2
+_md5_=2f86fb48449f366141564cd01daaf13d
diff --git a/metadata/md5-cache/dev-python/tox-3.17.1 b/metadata/md5-cache/dev-python/tox-3.17.1
new file mode 100644
index 000000000000..2e8f4ff076a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-3.17.1
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/flaky-3.4.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/freezegun-0.3.11[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathlib2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pytest-4.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] =dev-python/tox-3.17.1-r0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=7
+HOMEPAGE=https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/filelock[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-1.1[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/py[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.14[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/toml[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/virtualenv-16.0.0[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/3.17.1.tar.gz -> tox-3.17.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1e9d30fbfd2a6816acfd77ee06897649
diff --git a/metadata/md5-cache/dev-python/tqdm-4.48.0 b/metadata/md5-cache/dev-python/tqdm-4.48.0
new file mode 100644
index 000000000000..cc7c4de84d61
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tqdm-4.48.0
@@ -0,0 +1,15 @@
+BDEPEND=test? ( >=dev-python/nose-1.3.7-r4[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Add a progress meter to your loops in a second
+EAPI=7
+HOMEPAGE=https://github.com/tqdm/tqdm
+IUSE=examples test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tqdm/tqdm-4.48.0.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=bbbc135a0f1a2663cac848cc6f761e76
diff --git a/metadata/md5-cache/dev-python/ujson-1.35-r1 b/metadata/md5-cache/dev-python/ujson-1.35-r1
index 53c091202a65..b08fe6dec530 100644
--- a/metadata/md5-cache/dev-python/ujson-1.35-r1
+++ b/metadata/md5-cache/dev-python/ujson-1.35-r1
@@ -1,16 +1,16 @@
-BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
+DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
 DESCRIPTION=Ultra fast JSON encoder and decoder for Python
 EAPI=7
 HOMEPAGE=https://pypi.org/project/ujson/
-IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
+IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/u/ujson/ujson-1.35.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=551301cda54753966dc69a5ae1512eff
+_md5_=06c636f52c3347eaf81ef59255d35f07
diff --git a/metadata/md5-cache/dev-python/vcrpy-4.0.2 b/metadata/md5-cache/dev-python/vcrpy-4.0.2
index b4a6c2a7058b..e7403519c978 100644
--- a/metadata/md5-cache/dev-python/vcrpy-4.0.2
+++ b/metadata/md5-cache/dev-python/vcrpy-4.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Automatically mock your HTTP interactions to simplify and speed up t
 EAPI=7
 HOMEPAGE=https://github.com/kevin1024/vcrpy
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/httplib2-0.9.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pyyaml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/requests[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/urllib3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/wrapt[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/yarl[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kevin1024/vcrpy/archive/v4.0.2.tar.gz -> vcrpy-4.0.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5188e1c8e30f458a5435241b3e0f19f8
+_md5_=f4b3a34eeadd3acd046a7c12fb09ac60
diff --git a/metadata/md5-cache/dev-python/virtualenv-20.0.27 b/metadata/md5-cache/dev-python/virtualenv-20.0.27
new file mode 100644
index 000000000000..e50d7f4030ca
--- /dev/null
+++ b/metadata/md5-cache/dev-python/virtualenv-20.0.27
@@ -0,0 +1,15 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] test? ( >=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_7? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_8? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) python_targets_python3_9? ( dev-python/coverage[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/flaky[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pip-20.0.2[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-5[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-freezegun-0.4.1[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-mock-2.0.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/pytest-timeout-1.3.4[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] dev-python/wheel[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] >=dev-python/packaging-20.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-),python_targets_python3_8(-)?,-python_single_target_python3_8(-),python_targets_python3_9(-)?,-python_single_target_python3_9(-)] ) ) doc? ( || ( ( dev-lang/python:3.9 dev-python/sphinx[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-),python_single_target_python3_9(+)] dev-python/towncrier[python_targets_python3_9(-),python_single_target_python3_9(+)] ) ( dev-lang/python:3.8 dev-python/sphinx[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-),python_single_target_python3_8(+)] dev-python/towncrier[python_targets_python3_8(-),python_single_target_python3_8(+)] ) ( dev-lang/python:3.7 dev-python/sphinx[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/sphinx_rtd_theme[python_targets_python3_7(-),python_single_target_python3_7(+)] dev-python/towncrier[python_targets_python3_7(-),python_single_target_python3_7(+)] ) ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/sphinx_rtd_theme[python_targets_python3_6(-),python_single_target_python3_6(+)] dev-python/towncrier[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/sphinx_rtd_theme[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/towncrier[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ( >=dev-python/pypy3-7.3.0:0 dev-python/sphinx[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/sphinx_rtd_theme[python_targets_pypy3(-),python_single_target_pypy3(+)] dev-python/towncrier[python_targets_pypy3(-),python_single_target_pypy3(+)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Virtual Python Environment builder
+EAPI=7
+HOMEPAGE=https://virtualenv.pypa.io/en/stable/ https://pypi.org/project/virtualenv/ https://github.com/pypa/virtualenv/
+IUSE=test doc python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/appdirs-1.4.3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/distlib-0.3.1[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/filelock-3[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-41[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/six-1.9.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python2_7? ( >=dev-python/contextlib2-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pathlib2-2.3.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python2_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_6? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_python3_7? ( >=dev-python/importlib_metadata-0.12[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-),python_targets_python3_7(-)?,-python_single_target_python3_7(-)] ) python_targets_pypy3? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( >=dev-python/importlib_resources-1.0[python_targets_pypy3(-)?,-python_single_target_pypy3(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/v/virtualenv/virtualenv-20.0.27.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=6816f9a2ae5604024f8e5d1a0d1e7b40
diff --git a/metadata/md5-cache/dev-python/waitress-1.4.4 b/metadata/md5-cache/dev-python/waitress-1.4.4
index 36ef5778de2a..d4b6dbced317 100644
--- a/metadata/md5-cache/dev-python/waitress-1.4.4
+++ b/metadata/md5-cache/dev-python/waitress-1.4.4
@@ -4,7 +4,7 @@ DESCRIPTION=A pure-Python WSGI server
 EAPI=7
 HOMEPAGE=https://docs.pylonsproject.org/projects/waitress/en/latest/ https://pypi.org/project/waitress/ https://github.com/Pylons/waitress
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86
 LICENSE=ZPL
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/waitress/waitress-1.4.4.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=15b585bba21bc7b78a5485267eab263a
+_md5_=48b993e47ab885fc87b32b643a275489
diff --git a/metadata/md5-cache/dev-python/webob-1.8.6 b/metadata/md5-cache/dev-python/webob-1.8.6
index c9faa679a48a..71ff7d93d132 100644
--- a/metadata/md5-cache/dev-python/webob-1.8.6
+++ b/metadata/md5-cache/dev-python/webob-1.8.6
@@ -4,7 +4,7 @@ DESCRIPTION=WSGI request and response object
 EAPI=7
 HOMEPAGE=https://webob.org/
 IUSE=doc test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/W/WebOb/WebOb-1.8.6.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b29648ce4604ecb5287ef19b1cb3dfd0
+_md5_=126db4734789c4f6073e87bb4bd556ca
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.16.0 b/metadata/md5-cache/dev-python/werkzeug-0.16.0
deleted file mode 100644
index 0a7c96082fc0..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-0.16.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=7
-HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/0.16.0.tar.gz -> werkzeug-0.16.0.gh.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4433ac232a2fcead31a8dc75e4aca9d3
diff --git a/metadata/md5-cache/dev-python/werkzeug-0.16.1 b/metadata/md5-cache/dev-python/werkzeug-0.16.1
deleted file mode 100644
index b8293d80a171..000000000000
--- a/metadata/md5-cache/dev-python/werkzeug-0.16.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/pytest-4.5.0[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-timeout[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/pytest-xprocess[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] )
-DESCRIPTION=Collection of various utilities for WSGI applications
-EAPI=7
-HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
-IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=amd64 arm arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-LICENSE=BSD
-RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pallets/werkzeug/archive/0.16.1.tar.gz -> werkzeug-0.16.1.gh.tar.gz
-_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=cfe488a1a44a95e2a9598a7a12c1e368
diff --git a/metadata/md5-cache/dev-python/werkzeug-1.0.1 b/metadata/md5-cache/dev-python/werkzeug-1.0.1
index eaba86df50d1..09f88c51e0cd 100644
--- a/metadata/md5-cache/dev-python/werkzeug-1.0.1
+++ b/metadata/md5-cache/dev-python/werkzeug-1.0.1
@@ -5,7 +5,7 @@ DESCRIPTION=Collection of various utilities for WSGI applications
 EAPI=7
 HOMEPAGE=http://werkzeug.pocoo.org/ https://pypi.org/project/Werkzeug/ https://github.com/pallets/werkzeug
 IUSE=test python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/simplejson[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pallets/werkzeug/archive/1.0.1.tar.gz -> werkzeug-1.0.1.gh.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=5d2c1bad2831e5787590116ea939b70b
+_md5_=ce6d9066b12820a33a33b3937bf8119c
diff --git a/metadata/md5-cache/dev-python/wstools-0.4.8 b/metadata/md5-cache/dev-python/wstools-0.4.8
index e8e416964273..7cc033a78505 100644
--- a/metadata/md5-cache/dev-python/wstools-0.4.8
+++ b/metadata/md5-cache/dev-python/wstools-0.4.8
@@ -5,7 +5,7 @@ DESCRIPTION=WSDL parsing services package for Web Services for Python
 EAPI=7
 HOMEPAGE=https://github.com/pycontribs/wstools https://pypi.org/project/wstools/
 IUSE=test test python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+)] ) python_targets_python3_6? ( dev-lang/python:3.6[xml(+)] ) python_targets_python3_7? ( dev-lang/python:3.7[xml(+)] ) python_targets_python3_8? ( dev-lang/python:3.8[xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python2_7(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/w/wstools/wstools-0.4.8.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4a3055e20c3f5bd0c5db330985a3ec69
+_md5_=3ed1550ae8a8a613f4c656bf00a66dbb
diff --git a/metadata/md5-cache/dev-python/wurlitzer-2.0.1 b/metadata/md5-cache/dev-python/wurlitzer-2.0.1
new file mode 100644
index 000000000000..5e6246d9e3cb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wurlitzer-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-4.5.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-python/mock[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] )
+DESCRIPTION=Capture C-level stdout/stderr in Python
+EAPI=7
+HOMEPAGE=https://github.com/minrk/wurlitzer https://pypi.org/project/wurlitzer
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/wurlitzer/wurlitzer-2.0.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=168d16cf10f4df39d197e197d2a2eb08
diff --git a/metadata/md5-cache/dev-python/xmlschema-1.2.0 b/metadata/md5-cache/dev-python/xmlschema-1.2.0
index 323d5b6fa464..dd80941c248b 100644
--- a/metadata/md5-cache/dev-python/xmlschema-1.2.0
+++ b/metadata/md5-cache/dev-python/xmlschema-1.2.0
@@ -4,7 +4,7 @@ DESCRIPTION=An XML Schema validator and decoder
 EAPI=7
 HOMEPAGE=https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/
 IUSE=test python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND==dev-python/elementpath-1.4*[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_pypy3? ( >=dev-python/pypy3-7.3.0:0= ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_pypy3(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xmlschema/xmlschema-1.2.0.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b674a9566f73adbbd29e17dca6860537
+_md5_=c76a3c865613897f54848aa4b92a6051
diff --git a/metadata/md5-cache/dev-python/yarl-1.4.2 b/metadata/md5-cache/dev-python/yarl-1.4.2
index c13af3b4daee..9133e5d3fb97 100644
--- a/metadata/md5-cache/dev-python/yarl-1.4.2
+++ b/metadata/md5-cache/dev-python/yarl-1.4.2
@@ -4,7 +4,7 @@ DESCRIPTION=Yet another URL library
 EAPI=7
 HOMEPAGE=https://github.com/aio-libs/yarl/
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/multidict-4.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/idna-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/y/yarl/yarl-1.4.2.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=6086d02a8cf2c2c8a902a33c26312a9d
+_md5_=edc4120dfda9804e15b575c93d9de5fe
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 69351b6156b2..afa539d860d2 100644
Binary files a/metadata/md5-cache/dev-ros/Manifest.gz and b/metadata/md5-cache/dev-ros/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.13 b/metadata/md5-cache/dev-ros/actionlib-1.11.13
deleted file mode 100644
index 39d09a74a1ce..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/actionlib/archive/1.11.13.tar.gz -> actionlib-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25c19d1f3a5bdde415f4751019dafade
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.14 b/metadata/md5-cache/dev-ros/actionlib-1.11.14
deleted file mode 100644
index 7005e4e4e0ec..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/actionlib/archive/1.11.14.tar.gz -> actionlib-1.11.14.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25c19d1f3a5bdde415f4751019dafade
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.11.15 b/metadata/md5-cache/dev-ros/actionlib-1.11.15
deleted file mode 100644
index 44616c767992..000000000000
--- a/metadata/md5-cache/dev-ros/actionlib-1.11.15
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/actionlib/archive/1.11.15.tar.gz -> actionlib-1.11.15.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25c19d1f3a5bdde415f4751019dafade
diff --git a/metadata/md5-cache/dev-ros/actionlib-1.13.1 b/metadata/md5-cache/dev-ros/actionlib-1.13.1
new file mode 100644
index 000000000000..0f00a352f01d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib-1.13.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/actionlib/archive/1.13.1.tar.gz -> actionlib-1.13.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18a981dde395241d0c8dce7461c2e54b
diff --git a/metadata/md5-cache/dev-ros/actionlib-9999 b/metadata/md5-cache/dev-ros/actionlib-9999
index 5fd25bbf8f29..ff6a269b219d 100644
--- a/metadata/md5-cache/dev-ros/actionlib-9999
+++ b/metadata/md5-cache/dev-ros/actionlib-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Provides a standardized interface for interfacing with preemptable tasks
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/actionlib https://github.com/ros/actionlib
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/roscpp dev-ros/rospy[python_targets_py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25c19d1f3a5bdde415f4751019dafade
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18a981dde395241d0c8dce7461c2e54b
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1 b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1
new file mode 100644
index 000000000000..6b72e94b3ccd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-1.13.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Tools for dealing with actionlib
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/actionlib/archive/1.13.1.tar.gz -> actionlib-1.13.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22e6139385ff249dcba3ad65f75d43b3
diff --git a/metadata/md5-cache/dev-ros/actionlib_tools-9999 b/metadata/md5-cache/dev-ros/actionlib_tools-9999
new file mode 100644
index 000000000000..a878f4158137
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/actionlib_tools-9999
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Tools for dealing with actionlib
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/actionlib_tools https://github.com/ros/actionlib
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+LICENSE=BSD
+PROPERTIES=live
+RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostopic[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=22e6139385ff249dcba3ad65f75d43b3
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.11 b/metadata/md5-cache/dev-ros/angles-1.9.11
deleted file mode 100644
index 9fd8f2665512..000000000000
--- a/metadata/md5-cache/dev-ros/angles-1.9.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Set of simple math utilities to work with angles
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/angles/archive/1.9.11.tar.gz -> angles-1.9.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=579ac31dd149994c1464b77f63e71b67
diff --git a/metadata/md5-cache/dev-ros/angles-1.9.13 b/metadata/md5-cache/dev-ros/angles-1.9.13
new file mode 100644
index 000000000000..a49058807fbc
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/angles-1.9.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Set of simple math utilities to work with angles
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/angles/archive/1.9.13.tar.gz -> angles-1.9.13.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/angles-9999 b/metadata/md5-cache/dev-ros/angles-9999
index 679f02b0de36..6500b2304fd5 100644
--- a/metadata/md5-cache/dev-ros/angles-9999
+++ b/metadata/md5-cache/dev-ros/angles-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Set of simple math utilities to work with angles
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/angles https://github.com/ros/angles
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=579ac31dd149994c1464b77f63e71b67
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ff71c32720451a93e498f46795a63bc4
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.1 b/metadata/md5-cache/dev-ros/audio_capture-0.3.1
deleted file mode 100644
index ef44be114df8..000000000000
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Transports audio from a source to a destination
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=287d727cb5ff74f279bb4e27d1f936f8
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.2 b/metadata/md5-cache/dev-ros/audio_capture-0.3.2
deleted file mode 100644
index aaa382a8c80e..000000000000
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Transports audio from a source to a destination
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc96ebfa250557a8f8d859e0c7d89272
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.3 b/metadata/md5-cache/dev-ros/audio_capture-0.3.3
deleted file mode 100644
index f234b96a97d4..000000000000
--- a/metadata/md5-cache/dev-ros/audio_capture-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Transports audio from a source to a destination
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc96ebfa250557a8f8d859e0c7d89272
diff --git a/metadata/md5-cache/dev-ros/audio_capture-0.3.6 b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
new file mode 100644
index 000000000000..ac2c56158262
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_capture-0.3.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Transports audio from a source to a destination
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_capture-9999 b/metadata/md5-cache/dev-ros/audio_capture-9999
index 233352621963..2645b98b05f0 100644
--- a/metadata/md5-cache/dev-ros/audio_capture-9999
+++ b/metadata/md5-cache/dev-ros/audio_capture-9999
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Transports audio from a source to a destination
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_capture https://github.com/ros-drivers/audio_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-plugins/gst-plugins-lame:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=287d727cb5ff74f279bb4e27d1f936f8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=64fdba36435eba08dd70a22f43ae4a2f
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
deleted file mode 100644
index b25fb6924cfe..000000000000
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Messages for transmitting audio via ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b821ef7f5384daea81c7dca4a5620ebb
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
deleted file mode 100644
index fd089ece58cf..000000000000
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Messages for transmitting audio via ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b821ef7f5384daea81c7dca4a5620ebb
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3
deleted file mode 100644
index 819e9c544854..000000000000
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Messages for transmitting audio via ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b821ef7f5384daea81c7dca4a5620ebb
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6 b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
new file mode 100644
index 000000000000..69b4fa73efa6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Messages for transmitting audio via ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_common_msgs-9999 b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
index a094e52e06e0..7ee3f26e5f0a 100644
--- a/metadata/md5-cache/dev-ros/audio_common_msgs-9999
+++ b/metadata/md5-cache/dev-ros/audio_common_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Messages for transmitting audio via ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_common_msgs https://github.com/ros-drivers/audio_common
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b821ef7f5384daea81c7dca4a5620ebb
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de63960ca5ad5ac769adc5b8ef25acf7
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.1 b/metadata/md5-cache/dev-ros/audio_play-0.3.1
deleted file mode 100644
index 8a5d61409bab..000000000000
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Outputs audio to a speaker from a source node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.1.tar.gz -> audio_common-0.3.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dd390f17e225aabbfb2ca6196d5b031
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.3 b/metadata/md5-cache/dev-ros/audio_play-0.3.3
deleted file mode 100644
index 6e65235f42e8..000000000000
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Outputs audio to a speaker from a source node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.3.tar.gz -> audio_common-0.3.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f23119a0cdb129965afc487214835dc
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.6 b/metadata/md5-cache/dev-ros/audio_play-0.3.6
new file mode 100644
index 000000000000..15c005d25e65
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/audio_play-0.3.6
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Outputs audio to a speaker from a source node
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/audio_play-9999 b/metadata/md5-cache/dev-ros/audio_play-9999
index 44448f9f3242..d6757bf4b743 100644
--- a/metadata/md5-cache/dev-ros/audio_play-9999
+++ b/metadata/md5-cache/dev-ros/audio_play-9999
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 dev-ros/audio_common_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Outputs audio to a speaker from a source node
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7dd390f17e225aabbfb2ca6196d5b031
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=94f22bf7c6a558567594e3bbcd74ec96
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1
deleted file mode 100644
index 5f7d3e735fc9..000000000000
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization virtual/pkgconfig test? ( dev-python/nose ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Routines for reading and writing camera calibration parameters
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c04681d2ce8a403b66d41015ff84d88b
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
new file mode 100644
index 000000000000..e85be4aca1c8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( dev-python/nose ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Routines for reading and writing camera calibration parameters
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5080631be6ce389bde1d63e7b4255076
diff --git a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999 b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
index aa196b49f2e4..f52b9a0fffc5 100644
--- a/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+++ b/metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
@@ -1,14 +1,15 @@
+BDEPEND=virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization virtual/pkgconfig test? ( dev-python/nose ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization test? ( dev-python/nose ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Routines for reading and writing camera calibration parameters
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_calibration_parsers https://github.com/ros-perception/image_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole >=dev-cpp/yaml-cpp-0.5:= dev-ros/roscpp dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c04681d2ce8a403b66d41015ff84d88b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5080631be6ce389bde1d63e7b4255076
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
deleted file mode 100644
index 41e69e10cc63..000000000000
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.10.tar.gz -> image_common-1.11.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
deleted file mode 100644
index c50b72c7bae5..000000000000
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.11.tar.gz -> image_common-1.11.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a741c1284730fdf94a7a3c7c61a101c8
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12
deleted file mode 100644
index d401a3f534e3..000000000000
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.12.tar.gz -> image_common-1.11.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94188239b8404c70f73f13c95ac08133
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13
deleted file mode 100644
index e8a668ac6003..000000000000
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94188239b8404c70f73f13c95ac08133
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
deleted file mode 100644
index 4d83cfe5d0b9..000000000000
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.8.tar.gz -> image_common-1.11.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9 b/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
deleted file mode 100644
index bc1343a09d62..000000000000
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.9.tar.gz -> image_common-1.11.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7df4d824d0b198dde798e130ffd517c
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0 b/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
new file mode 100644
index 000000000000..cb524f33fc67
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=C++ interface for camera calibration information
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6738d4b6a04ac02762ea3cb8024d2d0e
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-9999 b/metadata/md5-cache/dev-ros/camera_info_manager-9999
index f23567735c93..0327f61a854b 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-9999
+++ b/metadata/md5-cache/dev-ros/camera_info_manager-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= test? ( dev-ros/rostest ) dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=C++ interface for camera calibration information
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7df4d824d0b198dde798e130ffd517c
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6738d4b6a04ac02762ea3cb8024d2d0e
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1 b/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1
deleted file mode 100644
index 6931ea408101..000000000000
--- a/metadata/md5-cache/dev-ros/class_loader-0.4.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS-independent package for loading plugins
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0/melodic2
-SRC_URI=https://github.com/ros/class_loader/archive/0.4.1.tar.gz -> class_loader-0.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da92b18ce2704791f4944c21fcf01018
diff --git a/metadata/md5-cache/dev-ros/class_loader-0.5.0 b/metadata/md5-cache/dev-ros/class_loader-0.5.0
new file mode 100644
index 000000000000..bdd191733d67
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/class_loader-0.5.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS-independent package for loading plugins
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0/melodic2
+SRC_URI=https://github.com/ros/class_loader/archive/0.5.0.tar.gz -> class_loader-0.5.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/class_loader-9999 b/metadata/md5-cache/dev-ros/class_loader-9999
index 228e9a892a9d..791664e771d0 100644
--- a/metadata/md5-cache/dev-ros/class_loader-9999
+++ b/metadata/md5-cache/dev-ros/class_loader-9999
@@ -1,14 +1,15 @@
+BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=ROS-independent package for loading plugins
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/class_loader https://github.com/ros/class_loader
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-ros/cmake_modules dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-libs/poco dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/melodic2
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=da92b18ce2704791f4944c21fcf01018
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ea25e496e9205be6f619095d789cb1c5
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.4.2 b/metadata/md5-cache/dev-ros/cmake_modules-0.4.2
deleted file mode 100644
index a5f2158af93a..000000000000
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=CMake Modules which are not distributed with CMake but are commonly used by ROS packages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/cmake_modules/archive/0.4.2.tar.gz -> cmake_modules-0.4.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=df40c729494090eed5488a7cec1940f1
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0 b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
index 13b4ffe48583..7d9d90dc1f7a 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+++ b/metadata/md5-cache/dev-ros/cmake_modules-0.5.0
@@ -1,7 +1,7 @@
 BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=CMake Modules which are not distributed with CMake but are commonly used by ROS packages
+DESCRIPTION=CMake Modules which are commonly used by ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
 IUSE=python_targets_python3_6 test
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/cmake_modules/archive/0.5.0.tar.gz -> cmake_modules-0.5.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e13d96c3dadca68f7fa5a53de1e015de
+_md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/cmake_modules-9999 b/metadata/md5-cache/dev-ros/cmake_modules-9999
index 9539da7ab4ee..a9eba0a58933 100644
--- a/metadata/md5-cache/dev-ros/cmake_modules-9999
+++ b/metadata/md5-cache/dev-ros/cmake_modules-9999
@@ -1,7 +1,7 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=CMake Modules which are not distributed with CMake but are commonly used by ROS packages
+DESCRIPTION=CMake Modules which are commonly used by ROS packages
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/cmake_modules https://github.com/ros/cmake_modules
 IUSE=python_targets_python3_6 test
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e13d96c3dadca68f7fa5a53de1e015de
+_md5_=3ed8adbe875888eb5dd936712d309c00
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3 b/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3
deleted file mode 100644
index 9507ba43bed2..000000000000
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ parser for the Collada robot description format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/roscpp dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.10.tar.gz -> collada_urdf-1.12.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=88d8cec32cb458ceace8011334d35220
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.12 b/metadata/md5-cache/dev-ros/collada_parser-1.12.12
deleted file mode 100644
index 588affc3d1cd..000000000000
--- a/metadata/md5-cache/dev-ros/collada_parser-1.12.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ parser for the Collada robot description format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.12.tar.gz -> collada_urdf-1.12.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd22009f387996875fdd45f55b031fc5
diff --git a/metadata/md5-cache/dev-ros/collada_parser-1.12.13 b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
new file mode 100644
index 000000000000..ca22279d99d4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/collada_parser-1.12.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=C++ parser for the Collada robot description format
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.13.tar.gz -> collada_urdf-1.12.13.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_parser-9999 b/metadata/md5-cache/dev-ros/collada_parser-9999
index a19d1bcd137c..0b2070bd665f 100644
--- a/metadata/md5-cache/dev-ros/collada_parser-9999
+++ b/metadata/md5-cache/dev-ros/collada_parser-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loader:= dev-libs/urdfdom_headers dev-libs/collada-dom:= >=dev-ros/urdf-1.12.6 dev-ros/rosconsole dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=C++ parser for the Collada robot description format
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_parser https://github.com/ros/collada_urdf
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:= >=dev-ros/urdf_parser_plugin-1.12.6 dev-ros/class_loade
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dd22009f387996875fdd45f55b031fc5
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d2a7d635cc3062e6dc1bda167558ba78
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
deleted file mode 100644
index 6ec3810a99fa..000000000000
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/urdf dev-ros/geometric_shapes dev-ros/tf media-libs/assimp dev-libs/tinyxml dev-libs/collada-dom:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.10.tar.gz -> collada_urdf-1.12.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e304874dde49a10c0f9b435600cd2c2a
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.12 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.12
deleted file mode 100644
index 3a1950f89e55..000000000000
--- a/metadata/md5-cache/dev-ros/collada_urdf-1.12.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.12.tar.gz -> collada_urdf-1.12.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42a6f543a208263592a5b421687c54ba
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-1.12.13 b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
new file mode 100644
index 000000000000..76003f205d53
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/collada_urdf-1.12.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/collada_urdf/archive/1.12.13.tar.gz -> collada_urdf-1.12.13.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7198cdd3a39c66b897e1626f3bb18340
diff --git a/metadata/md5-cache/dev-ros/collada_urdf-9999 b/metadata/md5-cache/dev-ros/collada_urdf-9999
index 2a299aa5d25d..e665d936196c 100644
--- a/metadata/md5-cache/dev-ros/collada_urdf-9999
+++ b/metadata/md5-cache/dev-ros/collada_urdf-9999
@@ -1,14 +1,15 @@
+BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Convert Unified Robot Description Format (URDF) documents into COLLADA documents
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/collada_urdf https://github.com/ros/collada_urdf
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-libs/boost:= dev-ros/angles dev-ros/collada_parser dev-ros/resource_retriever dev-ros/rosconsole dev-ros/urdf dev-ros/geometric_shapes media-libs/assimp dev-libs/collada-dom:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=42a6f543a208263592a5b421687c54ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7198cdd3a39c66b897e1626f3bb18340
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.4.0 b/metadata/md5-cache/dev-ros/control_msgs-1.4.0
deleted file mode 100644
index 76250d7689c3..000000000000
--- a/metadata/md5-cache/dev-ros/control_msgs-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Base messages and actions useful for controlling robots
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/control_msgs/archive/1.4.0.tar.gz -> control_msgs-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a590d92e0e4927226b59c353c098ce3
diff --git a/metadata/md5-cache/dev-ros/control_msgs-1.5.2 b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
new file mode 100644
index 000000000000..e318be443f40
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/control_msgs-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Base messages and actions useful for controlling robots
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/control_msgs/archive/1.5.2.tar.gz -> control_msgs-1.5.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_msgs-9999 b/metadata/md5-cache/dev-ros/control_msgs-9999
index 2e97ae63d735..1124ea8803a6 100644
--- a/metadata/md5-cache/dev-ros/control_msgs-9999
+++ b/metadata/md5-cache/dev-ros/control_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Base messages and actions useful for controlling robots
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_msgs https://github.com/ros-controls/control_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5a590d92e0e4927226b59c353c098ce3
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2ead36c91c5596d4c4e2ea71eed51546
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.14.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
deleted file mode 100644
index 70a71213d3f9..000000000000
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Modules that are useful across all controllers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.14.0.tar.gz -> control_toolbox-1.14.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e413fb1511721a2d4f54f2686fc3cdd6
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.15.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
deleted file mode 100644
index 3f706b26a2f1..000000000000
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.15.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Modules that are useful across all controllers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.15.0.tar.gz -> control_toolbox-1.15.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ef38c5a82b9e9bcc50e6731b1c80db2
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.16.0 b/metadata/md5-cache/dev-ros/control_toolbox-1.16.0
deleted file mode 100644
index 65837234e7bf..000000000000
--- a/metadata/md5-cache/dev-ros/control_toolbox-1.16.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Modules that are useful across all controllers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.16.0.tar.gz -> control_toolbox-1.16.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=24e49535e89c7b0da708832097f0b7f7
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-1.18.2 b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
new file mode 100644
index 000000000000..151a6bd45ca9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/control_toolbox-1.18.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Modules that are useful across all controllers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-controls/control_toolbox/archive/1.18.2.tar.gz -> control_toolbox-1.18.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc63c0d67f122c5a7a341a4cec8bf560
diff --git a/metadata/md5-cache/dev-ros/control_toolbox-9999 b/metadata/md5-cache/dev-ros/control_toolbox-9999
index daf93bdd3ee9..f9784839fdd1 100644
--- a/metadata/md5-cache/dev-ros/control_toolbox-9999
+++ b/metadata/md5-cache/dev-ros/control_toolbox-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Modules that are useful across all controllers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/control_toolbox https://github.com/ros-controls/control_toolbox
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml dev-ros/control_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+RDEPEND=dev-ros/roscpp dev-ros/dynamic_reconfigure dev-ros/realtime_tools dev-libs/boost:=[threads] dev-libs/tinyxml python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e413fb1511721a2d4f54f2686fc3cdd6
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cc63c0d67f122c5a7a341a4cec8bf560
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
deleted file mode 100644
index 50f5f56c6373..000000000000
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convex Decomposition Tool for Robot Model
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.10.tar.gz -> convex_decomposition-0.1.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1afe7d78e0c17782288d96d893048dd
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
deleted file mode 100644
index a0170d344b66..000000000000
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convex Decomposition Tool for Robot Model
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.11.tar.gz -> convex_decomposition-0.1.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1afe7d78e0c17782288d96d893048dd
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12 b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
index 890e0cbcfd97..314f112125f9 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/unzip sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Convex Decomposition Tool for Robot Model
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/convex_decomposition/archive/0.1.12.tar.gz -> convex_decomposition-0.1.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56098c5a572e6b1d1804bade5bda44fd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/convex_decomposition-9999 b/metadata/md5-cache/dev-ros/convex_decomposition-9999
index 34cba6f77a17..96b301229fa8 100644
--- a/metadata/md5-cache/dev-ros/convex_decomposition-9999
+++ b/metadata/md5-cache/dev-ros/convex_decomposition-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/unzip >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Convex Decomposition Tool for Robot Model
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/convex_decomposition https://github.com/ros/convex_decomposition
 IUSE=python_targets_python3_6 test
 LICENSE=MIT
@@ -10,5 +11,5 @@ RDEPEND=app-arch/unzip python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-l
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b1afe7d78e0c17782288d96d893048dd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=2d3fb7be73c1a7467c91d52567060bfb
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.13.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
deleted file mode 100644
index ff80f83ecc81..000000000000
--- a/metadata/md5-cache/dev-ros/cv_bridge-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=703e89854e5a3f15f7e402f18c2626b5
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-1.15.0 b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
new file mode 100644
index 000000000000..f5a5535633f4
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/cv_bridge-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Converts between ROS Image messages and OpenCV images
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1730a3e7bebbcda19d1d28c7a8803656
diff --git a/metadata/md5-cache/dev-ros/cv_bridge-9999 b/metadata/md5-cache/dev-ros/cv_bridge-9999
index 3be1fa6ac3d5..e76664cb6ac8 100644
--- a/metadata/md5-cache/dev-ros/cv_bridge-9999
+++ b/metadata/md5-cache/dev-ros/cv_bridge-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Converts between ROS Image messages and OpenCV images
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/cv_bridge https://github.com/ros-perception/vision_opencv
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/rosconsole >=media-libs/opencv-3:=[contrib(+)] dev-libs/boost:=[threads,python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1cd5f8bacd9b5ebdac21150828842eed
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1730a3e7bebbcda19d1d28c7a8803656
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2
deleted file mode 100644
index 13f60a5605bd..000000000000
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.7.tar.gz -> depthimage_to_laserscan-1.0.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b65ffd432210fbe6290ff0ef8cb71223
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
new file mode 100644
index 000000000000..6ff2673e41de
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/depthimage_to_laserscan/archive/1.0.8.tar.gz -> depthimage_to_laserscan-1.0.8.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eea59247fa1b4375da733066bc07f6f5
diff --git a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999 b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
index c8e4eb6b72ae..bd0703d68cc1 100644
--- a/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Converts a depth image to a laser scan for use with navigation and localization
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/depthimage_to_laserscan https://github.com/ros-perception/depthimage_to_laserscan
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp media-libs/opencv:= dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_geometry dev-ros/image_transport dev-ros/nodelet dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b65ffd432210fbe6290ff0ef8cb71223
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=eea59247fa1b4375da733066bc07f6f5
diff --git a/metadata/md5-cache/dev-ros/driver_base-1.6.8 b/metadata/md5-cache/dev-ros/driver_base-1.6.8
index 395f868e9057..7af8611fa82c 100644
--- a/metadata/md5-cache/dev-ros/driver_base-1.6.8
+++ b/metadata/md5-cache/dev-ros/driver_base-1.6.8
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test
-EAPI=5
+DEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Framework for writing drivers
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-drivers/driver_common/archive/1.6.8.tar.gz -> driver_common-1.6.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06346a054df631852c7dc4bb0069910a
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/driver_base-9999 b/metadata/md5-cache/dev-ros/driver_base-9999
index 2f89bbad98a7..26ec7d508023 100644
--- a/metadata/md5-cache/dev-ros/driver_base-9999
+++ b/metadata/md5-cache/dev-ros/driver_base-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Framework for writing drivers that helps with runtime reconfiguration, diagnostics and self-test
-EAPI=5
+DEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Framework for writing drivers
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/driver_base https://github.com/ros-drivers/driver_common
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=06346a054df631852c7dc4bb0069910a
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=47fe3039e76fa5de838dd16bdfd5a936
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48
deleted file mode 100644
index a29b94bb8048..000000000000
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.48.tar.gz -> dynamic_reconfigure-1.5.48.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4143ffbfb8cc1d76b3eb037db80ecf38
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
deleted file mode 100644
index 83598aa4749e..000000000000
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.5.49.tar.gz -> dynamic_reconfigure-1.5.49.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4143ffbfb8cc1d76b3eb037db80ecf38
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.6.0 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.6.0
deleted file mode 100644
index 5c1399a55c7d..000000000000
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.6.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.6.0.tar.gz -> dynamic_reconfigure-1.6.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4143ffbfb8cc1d76b3eb037db80ecf38
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
new file mode 100644
index 000000000000..a07d6574b101
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Provides a means to change node parameters at runtime
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/dynamic_reconfigure/archive/1.7.0.tar.gz -> dynamic_reconfigure-1.7.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ee8c9f8584ed9b5de430273dfa89d3c
diff --git a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999 b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
index 5ea17c373ddc..09834e5d5bd4 100644
--- a/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+++ b/metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Provides a means to change node parameters at any time without having to restart the node
-EAPI=5
+DEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Provides a means to change node parameters at runtime
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/dynamic_reconfigure https://github.com/ros/dynamic_reconfigure
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python3_6(-)?,-py
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4143ffbfb8cc1d76b3eb037db80ecf38
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=4ee8c9f8584ed9b5de430273dfa89d3c
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
deleted file mode 100644
index f4424911f88c..000000000000
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.4.tar.gz -> eigen_stl_containers-0.1.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac09e23c9a297f1ea5d497c33257fa2d
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
deleted file mode 100644
index 0afcacbe2a04..000000000000
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.5.tar.gz -> eigen_stl_containers-0.1.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac09e23c9a297f1ea5d497c33257fa2d
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
deleted file mode 100644
index 654768840ce7..000000000000
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.6.tar.gz -> eigen_stl_containers-0.1.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=91703cee90c0e5c45bf6b2c44ad494a6
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7
deleted file mode 100644
index 910b3f2b7662..000000000000
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.7.tar.gz -> eigen_stl_containers-0.1.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25aed673878d8662d83e60722427305b
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8 b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
index 948f41df4a95..b6bc98f39e2e 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/eigen_stl_containers/archive/0.1.8.tar.gz -> eigen_stl_containers-0.1.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=25aed673878d8662d83e60722427305b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70b5caeb0dc427ad6b3d87326c2656b3
diff --git a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999 b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
index 39a19fccad15..1fb3d6a3e0c5 100644
--- a/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+++ b/metadata/md5-cache/dev-ros/eigen_stl_containers-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Provides a set of typedef's that allow using Eigen datatypes in STL containers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/eigen_stl_containers https://github.com/ros/eigen_stl_containers
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac09e23c9a297f1ea5d497c33257fa2d
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=70b5caeb0dc427ad6b3d87326c2656b3
diff --git a/metadata/md5-cache/dev-ros/filters-1.8.1-r1 b/metadata/md5-cache/dev-ros/filters-1.8.1-r1
deleted file mode 100644
index 3ae00f445618..000000000000
--- a/metadata/md5-cache/dev-ros/filters-1.8.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Standardized interface for processing data as a sequence of filters
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/filters/archive/1.8.1.tar.gz -> filters-1.8.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f5028c6903189c68887453be25cfe05
diff --git a/metadata/md5-cache/dev-ros/filters-1.9.0 b/metadata/md5-cache/dev-ros/filters-1.9.0
new file mode 100644
index 000000000000..043a7b611a37
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/filters-1.9.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Standardized interface for processing data as a sequence of filters
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/filters/archive/1.9.0.tar.gz -> filters-1.9.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=542c9ceab517ac39da5d8caaf6adbf1b
diff --git a/metadata/md5-cache/dev-ros/filters-9999 b/metadata/md5-cache/dev-ros/filters-9999
index d898da7c7323..f00b5c17815c 100644
--- a/metadata/md5-cache/dev-ros/filters-9999
+++ b/metadata/md5-cache/dev-ros/filters-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-ros/pluginlib test? ( dev-ros/rostest dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Standardized interface for processing data as a sequence of filters
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/filters https://github.com/ros/filters
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:=[threads] dev-libs/console_bridge:= dev-r
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4f5028c6903189c68887453be25cfe05
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=542c9ceab517ac39da5d8caaf6adbf1b
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
deleted file mode 100644
index 8454b1c1417f..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
deleted file mode 100644
index b21b9c8ef79e..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_dev-2.8.5
deleted file mode 100644
index f4c5afc5222a..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=699aa35637185d2a77dbbabba2914f64
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.7 b/metadata/md5-cache/dev-ros/gazebo_dev-2.8.7
deleted file mode 100644
index 3832c9339e2d..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.7.tar.gz -> gazebo_ros_pkgs-2.8.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7e344560cd05a75e7d39db1f8811a8ad
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
new file mode 100644
index 000000000000..d5d0dcd1d466
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-9999 b/metadata/md5-cache/dev-ros/gazebo_dev-9999
index e24accffabe7..86729acbe700 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=sci-electronics/gazebo >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
-EAPI=5
+DEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Cmake config for the default version of Gazebo for the ROS distribution
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
 IUSE=python_targets_python3_6 test
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 )
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9272b7fc6b39eae0800e872cf98ad7ea
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b327cea369c8453b406b61ce9c2a5422
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2
deleted file mode 100644
index 2907169c15df..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
deleted file mode 100644
index 86a5a42cae38..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
deleted file mode 100644
index 097589983f45..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4
deleted file mode 100644
index 9e5736a4586d..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5
deleted file mode 100644
index d5443c9b65b4..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.7 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.7
deleted file mode 100644
index 15ff28f56182..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-2.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.7.tar.gz -> gazebo_ros_pkgs-2.8.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
new file mode 100644
index 000000000000..68e95cc1d9b2
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-9999 b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
index 28fad277ecbd..549d37b5eb6c 100644
--- a/metadata/md5-cache/dev-ros/gazebo_msgs-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_msgs https://github.com/ros-simulation/gazebo_ros_pkgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=62b3d0d2090231e36ad2505f446af6c4
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=5231bcb1ababf0a1c7fa0bdd6dd0661d
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.7 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
similarity index 98%
rename from metadata/md5-cache/dev-ros/gazebo_plugins-2.8.7
rename to metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
index 2d42322c986e..20df7b75f538 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.8.7
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
@@ -11,6 +11,6 @@ RDEPEND=dev-ros/gazebo_dev dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.7.tar.gz -> gazebo_ros_pkgs-2.8.7.tar.gz
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=655c1e060521fd58c8b0c60a5865a1e2
+_md5_=4e68688229f8f4aaea9b1cae25f01021
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 28652af516a8..2e34f292f7da 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=655c1e060521fd58c8b0c60a5865a1e2
+_md5_=4e68688229f8f4aaea9b1cae25f01021
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2 b/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2
deleted file mode 100644
index 4241765de19e..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6fe881ce4516d99c789037bf8c021a0b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
deleted file mode 100644
index fa30d103f537..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a46b772ff66aabc135a95f70293bee0
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
deleted file mode 100644
index 4e051a84280f..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4
deleted file mode 100644
index bfcbee1305f9..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.5
deleted file mode 100644
index 298403d9dad1..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e4364b932e19a7b79eb0d98383fd4520
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.7 b/metadata/md5-cache/dev-ros/gazebo_ros-2.8.7
deleted file mode 100644
index b211c2f85dd5..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros-2.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.7.tar.gz -> gazebo_ros_pkgs-2.8.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=143daa994bf0755c749cfbc00759beaf
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
new file mode 100644
index 000000000000..011888782769
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18b1dd018116e4defe719a9ad34a6696
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index c47b5b08dadf..ec9fefdff5fa 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
-EAPI=5
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS plugins that offer messages and services for interfacing with gazebo
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros https://github.com/ros-simulation/gazebo_ros_pkgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=Apache-2.0
 PROPERTIES=live
-RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/tf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_srvs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7844afbd791467a4c5705be19adf3fcd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=18b1dd018116e4defe719a9ad34a6696
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1
deleted file mode 100644
index 39300b38ec57..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18ae2263dfb54482940eb4f77b3f4285
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
deleted file mode 100644
index c40769f6f190..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz mirror://gentoo/gazebo-ros-2.7.3-patches-1.tar.bz2
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=745d538f0e3e5b505d80c915e8fe25db
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
deleted file mode 100644
index c6f91f045cce..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.4.tar.gz -> gazebo_ros_pkgs-2.7.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4
deleted file mode 100644
index 34b1f7cd76b5..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5
deleted file mode 100644
index 9d7da7417bd7..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz -> gazebo_ros_pkgs-2.8.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6dcbbe505259630f1eeedd39f676538a
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.7 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.7
deleted file mode 100644
index db7be49f1fb9..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.7.tar.gz -> gazebo_ros_pkgs-2.8.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=87c2f1741eed8930e495aa97a6eafbab
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
new file mode 100644
index 000000000000..a00ff0dd2ac9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS control plugins for gazebo
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index 7ee81b18a5cb..3c18309fdc59 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/gazebo_ros_control https://github.com/ros-simulation/gazebo_ros_pkgs
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_too
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c91d6e4b0057042158c6f3930759c72b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fe2b15fcc5e2edd26caeaa5b226f1c70
diff --git a/metadata/md5-cache/dev-ros/gennodejs-2.0.1 b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
index b9acd77bb38a..0f5db3f6a187 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-2.0.1
+++ b/metadata/md5-cache/dev-ros/gennodejs-2.0.1
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Javascript ROS message and service generators
-EAPI=5
+EAPI=7
 HOMEPAGE=http://wiki.ros.org/gennodejs
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/2.0.1
 SRC_URI=https://github.com/RethinkRobotics-opensource/gennodejs/archive/2.0.1.tar.gz -> gennodejs-2.0.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a0bc6a9989484112163242e61251f1
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c94e2fd9737c6554ea3177923b9dee7a
diff --git a/metadata/md5-cache/dev-ros/gennodejs-9999 b/metadata/md5-cache/dev-ros/gennodejs-9999
index 6dbb958cf838..06bbcd9f454b 100644
--- a/metadata/md5-cache/dev-ros/gennodejs-9999
+++ b/metadata/md5-cache/dev-ros/gennodejs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Javascript ROS message and service generators
-EAPI=5
+EAPI=7
 HOMEPAGE=http://wiki.ros.org/gennodejs
 IUSE=python_targets_python3_6 test
 LICENSE=Apache-2.0
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0/9999
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=73a0bc6a9989484112163242e61251f1
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c94e2fd9737c6554ea3177923b9dee7a
diff --git a/metadata/md5-cache/dev-ros/geodesy-0.5.5 b/metadata/md5-cache/dev-ros/geodesy-0.5.5
new file mode 100644
index 000000000000..983165dbd529
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geodesy-0.5.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63befbfeb4d4aab5125d46649b28d42f
diff --git a/metadata/md5-cache/dev-ros/geodesy-9999 b/metadata/md5-cache/dev-ros/geodesy-9999
index 76fd65baa0bf..8077980cbf6f 100644
--- a/metadata/md5-cache/dev-ros/geodesy-9999
+++ b/metadata/md5-cache/dev-ros/geodesy-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rosunit[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python and C++ interfaces for manipulating geodetic coordinates
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/geodesy https://github.com/ros-geographic-info/geographic_info
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/angles dev-ros/geographic_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/unique_id dev-ros/uuid_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/pyproj[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d8e6ff85bcdf66c2343436c76c9f7b65
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=63befbfeb4d4aab5125d46649b28d42f
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5 b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
new file mode 100644
index 000000000000..2cd52e956781
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=ROS messages for Geographic Information Systems
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geographic_msgs-9999 b/metadata/md5-cache/dev-ros/geographic_msgs-9999
index 25591f09a145..90950fbdd3cc 100644
--- a/metadata/md5-cache/dev-ros/geographic_msgs-9999
+++ b/metadata/md5-cache/dev-ros/geographic_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/uuid_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/uuid_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=ROS messages for Geographic Information Systems
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_msgs https://github.com/ros-geographic-info/geographic_info
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf9c223ef82ca1d6962c3b3cd4c8f3ef
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cfbe26988d020197f147fac0f0bf2e25
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0 b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
new file mode 100644
index 000000000000..d39b9cd0ec21
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Generic definitions of geometric shapes and bodies
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.7.0.tar.gz -> geometric_shapes-0.7.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36a3d00af8f6496ae1bde28944d38314
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-9999 b/metadata/md5-cache/dev-ros/geometric_shapes-9999
index b61999547c8d..f8d65671ac31 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-9999
+++ b/metadata/md5-cache/dev-ros/geometric_shapes-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= test? ( dev-cpp/gtest dev-ros/rosunit ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest dev-ros/rosunit ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Generic definitions of geometric shapes and bodies
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c131aa87bad2b1efafa0db94846076ec
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=36a3d00af8f6496ae1bde28944d38314
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.3.10 b/metadata/md5-cache/dev-ros/gmapping-1.3.10
deleted file mode 100644
index f8efe86b9cc5..000000000000
--- a/metadata/md5-cache/dev-ros/gmapping-1.3.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.3.10.tar.gz -> slam_gmapping-1.3.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=647914d504ce7107968266bb04b6f792
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.4.0 b/metadata/md5-cache/dev-ros/gmapping-1.4.0
deleted file mode 100644
index 0df7b2189f79..000000000000
--- a/metadata/md5-cache/dev-ros/gmapping-1.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/rostest sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.0.tar.gz -> slam_gmapping-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1246be89fd03a402793f7b056619fa5d
diff --git a/metadata/md5-cache/dev-ros/gmapping-1.4.1 b/metadata/md5-cache/dev-ros/gmapping-1.4.1
new file mode 100644
index 000000000000..7f79735aef83
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gmapping-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/slam_gmapping/archive/1.4.1.tar.gz -> slam_gmapping-1.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1af76dc8c46b3a9cccc53626491d0e7
diff --git a/metadata/md5-cache/dev-ros/gmapping-9999 b/metadata/md5-cache/dev-ros/gmapping-9999
index 307204e8d8f4..14f3c87d778c 100644
--- a/metadata/md5-cache/dev-ros/gmapping-9999
+++ b/metadata/md5-cache/dev-ros/gmapping-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/rostest >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/rostest python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=ROS wrapper for OpenSlam's Gmapping
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/gmapping https://github.com/ros-perception/slam_gmapping
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/tf dev-ros/openslam_gmapping dev-ros/rosbag_storage dev-ros/gmapping python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=8c1cddf4ddd706e807a1fa7e0f730302
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b1af76dc8c46b3a9cccc53626491d0e7
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
deleted file mode 100644
index b2e4d904561c..000000000000
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Means for transporting compressed map data through the use of image_transport
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dfbc8efe0eb0115a8a44433f7bf276a
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.0 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.0
deleted file mode 100644
index 1d0eee39336e..000000000000
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Means for transporting compressed map data through the use of image_transport
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c30e4ced065acc419f744daaf27936c0
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
new file mode 100644
index 000000000000..7a9517de00e7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Means for transporting compressed map data through the use of image_transport
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999 b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
index 9552f374fbc9..be7606fc73a9 100644
--- a/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+++ b/metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Means for transporting compressed map data through the use of image_transport
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_compressed_map_transport https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/image_transport dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] media-libs/opencv python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/cv_bridge media-libs/opencv:= dev-ros/hector_map_tools dev-ros/image_transport media-libs/opencv python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5dfbc8efe0eb0115a8a44433f7bf276a
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d830e16d8397255ba1c20e283425b216
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2 b/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2
deleted file mode 100644
index c63d8ab77c74..000000000000
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9957353c2f0ce1c0b5eaa155ef0a655
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.0 b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.0
deleted file mode 100644
index 22a60d890f02..000000000000
--- a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d04de54d1248662b7b55457f12b920ac
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
new file mode 100644
index 000000000000..9fced9536ee0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d69a6460307608173fc1f79733d2c4f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff-9999 b/metadata/md5-cache/dev-ros/hector_geotiff-9999
index 86002ed862e9..d312c4c8a3eb 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Node to save occupancy grid map, robot trajectory and object of interest data to GeoTiff images
-EAPI=5
+DEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Saves occupancy grid map, robot trajectory and object data to GeoTiff images
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_map_tools dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-ros/std_msgs[ros_messages_cxx(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/hector_map_tools dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/roscpp dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9957353c2f0ce1c0b5eaa155ef0a655
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8d69a6460307608173fc1f79733d2c4f
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1
deleted file mode 100644
index 8beaf9b8338a..000000000000
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53455196979b8294ab36a964ddeb049c
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.0 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.0
deleted file mode 100644
index 219d61987edb..000000000000
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=226cd41d5e48f5fc4859b7edb62e8455
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
new file mode 100644
index 000000000000..3159d47a85bb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999 b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
index 5f7024c8e662..53b3b845540d 100644
--- a/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+++ b/metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Plugins that extend geotiff maps generated by hector_geotiff
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_geotiff_plugins https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_geotiff dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/hector_geotiff dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53455196979b8294ab36a964ddeb049c
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9a40ae04cc5a3313a255461d6be4d559
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
deleted file mode 100644
index 6ab4e38a4f1e..000000000000
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=509866be883e2dd85b9af230d1eb23b3
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.0 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.0
deleted file mode 100644
index 6ed4796c2505..000000000000
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0ec86d00b38b88e892b3c5920f2c2d6e
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
new file mode 100644
index 000000000000..26b2d9ab94eb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
diff --git a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999 b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
index 280774b8c243..ff3662ea232e 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Publish the roll/pitch attitude angles reported via a imu message to tf
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_attitude_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=509866be883e2dd85b9af230d1eb23b3
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a17eaa44ef1699ca20dd7943f1bcd6c6
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
deleted file mode 100644
index 74a7ea96a11a..000000000000
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for processing IMU messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40bf27beb57f680d1aafab5693acbe07
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.0 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.0
deleted file mode 100644
index fd2908c03549..000000000000
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for processing IMU messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=14c1b73862f185315feb92deaa22faa5
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1 b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
new file mode 100644
index 000000000000..78310cc25704
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for processing IMU messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_imu_tools-9999 b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
index e2819eafe20e..4ebcd2190493 100644
--- a/metadata/md5-cache/dev-ros/hector_imu_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_imu_tools-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Tools for processing IMU messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_imu_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=40bf27beb57f680d1aafab5693acbe07
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=213489697035b562e76bfd44c44da07d
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.3.5 b/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
deleted file mode 100644
index 5cc08477f511..000000000000
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e550b28ddd54c0dd7fa9054a64244fd
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.4.0 b/metadata/md5-cache/dev-ros/hector_map_server-0.4.0
deleted file mode 100644
index e01c2380ab3c..000000000000
--- a/metadata/md5-cache/dev-ros/hector_map_server-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e06843eaaefc4d4b4d1969532ee8bd4f
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-0.4.1 b/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
new file mode 100644
index 000000000000..032aefb1f252
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_map_server-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_server-9999 b/metadata/md5-cache/dev-ros/hector_map_server-9999
index e494c1695003..206a27bfc7ce 100644
--- a/metadata/md5-cache/dev-ros/hector_map_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_server-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Service for retrieving the map, as well as for raycasting based obstacle queries
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/hector_marker_drawing dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0e550b28ddd54c0dd7fa9054a64244fd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c6822b5490cb03e5c42def1f2a103580
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.0-r1 b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.0-r1
deleted file mode 100644
index ba04006b2650..000000000000
--- a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc31ba1e170e557b3e49acf2882cec1e
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1 b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
new file mode 100644
index 000000000000..0eae8576ebe6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_map_tools-9999 b/metadata/md5-cache/dev-ros/hector_map_tools-9999
index e4914ae6c019..af920311c070 100644
--- a/metadata/md5-cache/dev-ros/hector_map_tools-9999
+++ b/metadata/md5-cache/dev-ros/hector_map_tools-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Functions related to accessing information from OccupancyGridMap maps
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_map_tools https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/nav_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc31ba1e170e557b3e49acf2882cec1e
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85c23dd2f9789c5f39ee2170803b4766
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5 b/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
deleted file mode 100644
index 6d6a9f8a7a14..000000000000
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7702119835bd0391a7763ff6719d22a7
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.4.0 b/metadata/md5-cache/dev-ros/hector_mapping-0.4.0
deleted file mode 100644
index 6e8f5962a3b8..000000000000
--- a/metadata/md5-cache/dev-ros/hector_mapping-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7702119835bd0391a7763ff6719d22a7
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-0.4.1 b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
new file mode 100644
index 000000000000..9ae11f8d8904
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_mapping-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_mapping-9999 b/metadata/md5-cache/dev-ros/hector_mapping-9999
index f08a79375f50..7643ec066dd6 100644
--- a/metadata/md5-cache/dev-ros/hector_mapping-9999
+++ b/metadata/md5-cache/dev-ros/hector_mapping-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=SLAM approach that can be used without odometry and on platforms that exhibit roll/pitch motion
-EAPI=5
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry dev-ros/tf_conversions dev-libs/boost:=[threads] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/visualization_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/visualization_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=SLAM that can be used without odometry and on platforms that exhibit roll/pitch
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_mapping https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/message_filters dev-ros/laser_geometry
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fbb807ade99851d2f3e5d9d0753236dc
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ad87d2d78b60f932d629fa814bb74d47
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
deleted file mode 100644
index 4c222c4832f1..000000000000
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convenience functions for easier publishing of visualization markers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47dc27e112b5beec730ef4b8cacd518d
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
deleted file mode 100644
index dc2a9032d1d3..000000000000
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convenience functions for easier publishing of visualization markers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47dc27e112b5beec730ef4b8cacd518d
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
deleted file mode 100644
index 6420dd8319bd..000000000000
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convenience functions for easier publishing of visualization markers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=299abd7ce44f85e9a0618756eb0c94be
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.0 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.0
deleted file mode 100644
index 249b3479d5f3..000000000000
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Convenience functions for easier publishing of visualization markers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eeb5272c74b85538a9ede60c6980bbdb
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1 b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
new file mode 100644
index 000000000000..7d80ebfdbaff
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Convenience functions for easier publishing of visualization markers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999 b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
index 9491121fbd16..1bfd56cecd4e 100644
--- a/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+++ b/metadata/md5-cache/dev-ros/hector_marker_drawing-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Convenience functions for easier publishing of visualization markers
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_marker_drawing https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=47dc27e112b5beec730ef4b8cacd518d
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ede9860a621b113b9237ea08cc1105c8
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
deleted file mode 100644
index 47cf6533f973..000000000000
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages and services used in the hector_slam stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5af3dcf886f54140cb2bceab0a953570
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.0 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.0
deleted file mode 100644
index 79375ef7d268..000000000000
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages and services used in the hector_slam stack
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5af3dcf886f54140cb2bceab0a953570
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1 b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
new file mode 100644
index 000000000000..3c8c65a2f92a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages and services used in the hector_slam stack
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8fc6876bc9317bd927b127f32204a198
diff --git a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999 b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
index b9b428347451..fc69ee6a7a6e 100644
--- a/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+++ b/metadata/md5-cache/dev-ros/hector_nav_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages and services used in the hector_slam stack
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_nav_msgs https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5af3dcf886f54140cb2bceab0a953570
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=8fc6876bc9317bd927b127f32204a198
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
index 36046ab36087..fe94d282cec0 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d71945a8fe113bc957c65e91c44f5015
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7e658ee7e44484c2c9a89267812b2472
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
index 0fbfec219286..3a29a8a096f2 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=hector_pose_estimation node and the hector_pose_estimation nodelet
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation https://github.com/tu-darmstadt-ros-pkg/hector_localization
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/hector_pose_estimation_core dev-ros/nodelet dev-ros/tf dev-ros/message_filters dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ace561c6b7380d035e0f000aefb119fe
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d90fcc08383e793d7fdf87f1fb3256c1
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
index 1750abb84c76..4bd1ccf3605c 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cf4c3ca7f6525cc1409ae8a248dc3cf8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a40d3b7b6eeef71184fd7c6fe8f399dc
diff --git a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999 b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
index 5c482144de52..61679046e9f0 100644
--- a/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+++ b/metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Extended Kalman Filter (EKF) that estimates the 6DOF pose of the robot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_pose_estimation_core https://github.com/tu-darmstadt-ros-pkg/hector_localization
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/rostime dev-ros/rosconsole dev-ros/roscpp dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9e2d76fbe730115c8dfedbdab7dc5e6d
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fabbfad8e1eab30ede6e0257ae2ed725
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
deleted file mode 100644
index 864908d818b2..000000000000
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.3.tar.gz -> hector_slam-0.3.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abfa6eb13695e61a9d7362280d7cc7ee
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
deleted file mode 100644
index 5db6747edfc3..000000000000
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.4.tar.gz -> hector_slam-0.3.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abfa6eb13695e61a9d7362280d7cc7ee
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
deleted file mode 100644
index 29bff255e24c..000000000000
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dfc699664464c100022f5208d4cb8887
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1 b/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
new file mode 100644
index 000000000000..c1a3d86d6888
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af4bd6a8cf4132a83050d6be43cc1116
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-9999 b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
index 63c9ef0b7836..4c8cb03005d6 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-9999
+++ b/metadata/md5-cache/dev-ros/hector_slam_launch-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
-EAPI=5
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Launch files for launching hector_slam with different robot scenarios
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajecto
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=abfa6eb13695e61a9d7362280d7cc7ee
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=af4bd6a8cf4132a83050d6be43cc1116
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
deleted file mode 100644
index 5f1735620d93..000000000000
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.3.5.tar.gz -> hector_slam-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56da7ace2a3b9b19716d8d0a6e782dcf
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.0 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.0
deleted file mode 100644
index de4f617f317e..000000000000
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=28a44edf0bd0843fe56163e30a53878d
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1 b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
new file mode 100644
index 000000000000..6a3e65a6b38c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999 b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
index b5371c87f7f8..1d944fb3ed07 100644
--- a/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+++ b/metadata/md5-cache/dev-ros/hector_trajectory_server-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Keeps track of tf trajectories and makes this data accessible via a service and topic
-EAPI=5
+DEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Keeps track of tf trajectories and makes this data accessible
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/hector_trajectory_server https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/hector_nav_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/hector_map_tools dev-ros/tf dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=56da7ace2a3b9b19716d8d0a6e782dcf
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=e02032ead3c4811d370fdd61c5d983e4
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.3 b/metadata/md5-cache/dev-ros/image_geometry-1.12.3
deleted file mode 100644
index d4e8d2789a8b..000000000000
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc83140012a59caead68f4587fd3115e
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.4 b/metadata/md5-cache/dev-ros/image_geometry-1.12.4
deleted file mode 100644
index 7666a25c9835..000000000000
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32ad81c28aea58f03913c05fb0ee5196
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.5 b/metadata/md5-cache/dev-ros/image_geometry-1.12.5
deleted file mode 100644
index af757a65823b..000000000000
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32ad81c28aea58f03913c05fb0ee5196
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.7 b/metadata/md5-cache/dev-ros/image_geometry-1.12.7
deleted file mode 100644
index 812e593e1b82..000000000000
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=32ad81c28aea58f03913c05fb0ee5196
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.12.8 b/metadata/md5-cache/dev-ros/image_geometry-1.12.8
deleted file mode 100644
index 17c980a6614f..000000000000
--- a/metadata/md5-cache/dev-ros/image_geometry-1.12.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7991fd1548460162cf41781baaeed864
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.13.0 b/metadata/md5-cache/dev-ros/image_geometry-1.13.0
deleted file mode 100644
index 6655da4a9346..000000000000
--- a/metadata/md5-cache/dev-ros/image_geometry-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7991fd1548460162cf41781baaeed864
diff --git a/metadata/md5-cache/dev-ros/image_geometry-1.15.0 b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
new file mode 100644
index 000000000000..6d860bbc1783
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_geometry-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=C++ and Python libraries for interpreting images geometrically
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc15caee7f0fa228cda1233b34ad8459
diff --git a/metadata/md5-cache/dev-ros/image_geometry-9999 b/metadata/md5-cache/dev-ros/image_geometry-9999
index 05b78fb79b6c..764db722a817 100644
--- a/metadata/md5-cache/dev-ros/image_geometry-9999
+++ b/metadata/md5-cache/dev-ros/image_geometry-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=C++ and Python libraries for interpreting images geometrically
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_geometry https://github.com/ros-perception/vision_opencv
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=media-libs/opencv:= dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed1e39837bce85205fa7982a82d4b307
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc15caee7f0fa228cda1233b34ad8459
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2 b/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
deleted file mode 100644
index d775e2f9d927..000000000000
--- a/metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c65070a00dc45efc3e05e6e3135146e8
diff --git a/metadata/md5-cache/dev-ros/image_transport-1.12.0 b/metadata/md5-cache/dev-ros/image_transport-1.12.0
new file mode 100644
index 000000000000..4155cc282ec6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_transport-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/image_transport-9999 b/metadata/md5-cache/dev-ros/image_transport-9999
index 4755c878dc39..2ed15eec6c1e 100644
--- a/metadata/md5-cache/dev-ros/image_transport-9999
+++ b/metadata/md5-cache/dev-ros/image_transport-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Transparent support for transporting images in low-bandwidth compressed formats
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/image_transport https://github.com/ros-perception/image_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/message_filters dev-ros/pluginlib dev-libs/tinyxml2:= dev-ros/rosconsole dev-ros/roscpp dev-ros/roslib dev-libs/boost:= dev-libs/console_bridge:= dev-ros/class_loader:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c65070a00dc45efc3e05e6e3135146e8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=68426ff5c3e79a02b1680501bf3b7b19
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.2.1 b/metadata/md5-cache/dev-ros/imu_processors-0.2.1
deleted file mode 100644
index 52cd8965bdfe..000000000000
--- a/metadata/md5-cache/dev-ros/imu_processors-0.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Processors for sensor_msgs::Imu data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.1.tar.gz -> imu_pipeline-0.2.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b597517a8703530de343f8cc54e0a35
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.2.2 b/metadata/md5-cache/dev-ros/imu_processors-0.2.2
deleted file mode 100644
index 488ea622d4cc..000000000000
--- a/metadata/md5-cache/dev-ros/imu_processors-0.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Processors for sensor_msgs::Imu data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cff65153ecaf5a83d8e00734197da57b
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.2.3 b/metadata/md5-cache/dev-ros/imu_processors-0.2.3
deleted file mode 100644
index adaa4f4b30e8..000000000000
--- a/metadata/md5-cache/dev-ros/imu_processors-0.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Processors for sensor_msgs::Imu data
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.3.tar.gz -> imu_pipeline-0.2.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e41a7eb5ab2cd2927f7c133a20e4229c
diff --git a/metadata/md5-cache/dev-ros/imu_processors-0.3.0 b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
new file mode 100644
index 000000000000..bf175b940291
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_processors-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Processors for sensor_msgs::Imu data
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_processors-9999 b/metadata/md5-cache/dev-ros/imu_processors-9999
index ae1177d275da..225ccb923292 100644
--- a/metadata/md5-cache/dev-ros/imu_processors-9999
+++ b/metadata/md5-cache/dev-ros/imu_processors-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Processors for sensor_msgs::Imu data
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_processors https://github.com/ros-perception/imu_pipeline
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2b597517a8703530de343f8cc54e0a35
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9160bc0441761d8e9cbe788cb6f9369
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1 b/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
deleted file mode 100644
index e110f141383e..000000000000
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fb1cde35e9cde01860c566856883c2af
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.2.3 b/metadata/md5-cache/dev-ros/imu_transformer-0.2.3
deleted file mode 100644
index 69e31357f328..000000000000
--- a/metadata/md5-cache/dev-ros/imu_transformer-0.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-2
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.3.tar.gz -> imu_pipeline-0.2.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=881d48b5413cded90a7a23a71ff6094e
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-0.3.0 b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
new file mode 100644
index 000000000000..cab646084189
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/imu_transformer-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Transforms sensor_msgs::Imu data from one frame into another
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6b3274acedd67ad393c05ed01680d9d
diff --git a/metadata/md5-cache/dev-ros/imu_transformer-9999 b/metadata/md5-cache/dev-ros/imu_transformer-9999
index 2b9918a45568..300e8c4625e2 100644
--- a/metadata/md5-cache/dev-ros/imu_transformer-9999
+++ b/metadata/md5-cache/dev-ros/imu_transformer-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Node/nodelet combination to transform sensor_msgs::Imu data from one frame into another
-EAPI=5
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Transforms sensor_msgs::Imu data from one frame into another
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_transformer https://github.com/ros-perception/imu_pipeline
 IUSE=python_targets_python3_6 test
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslaunch dev-ros/tf2 dev-ros/tf2_ros dev-ros/topic_tools dev-ros/tf2_sensor_msgs dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=95d7d99252854df8a0930ca709a62587
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a6b3274acedd67ad393c05ed01680d9d
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.11.3 b/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
deleted file mode 100644
index 748d647d46ea..000000000000
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.11.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=3D interactive marker communication library for RViz and similar tools
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.11.3.tar.gz -> interactive_markers-1.11.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86c6e9c60a7ecec4d6ecb85d112373d9
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.11.4 b/metadata/md5-cache/dev-ros/interactive_markers-1.11.4
deleted file mode 100644
index 2f8e967ca759..000000000000
--- a/metadata/md5-cache/dev-ros/interactive_markers-1.11.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=3D interactive marker communication library for RViz and similar tools
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.11.4.tar.gz -> interactive_markers-1.11.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=acf43c5b99445bdd0dae756489d2a48e
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-1.12.0 b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0
new file mode 100644
index 000000000000..799c7dd5bb06
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/interactive_markers-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=3D interactive marker communication library for RViz and similar tools
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/interactive_markers/archive/1.12.0.tar.gz -> interactive_markers-1.12.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35643f9e8f05439111bec7225f579822
diff --git a/metadata/md5-cache/dev-ros/interactive_markers-9999 b/metadata/md5-cache/dev-ros/interactive_markers-9999
index bb32ccea8df6..0e69fb37166e 100644
--- a/metadata/md5-cache/dev-ros/interactive_markers-9999
+++ b/metadata/md5-cache/dev-ros/interactive_markers-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/tf2_geometry_msgs[ros_messages_cxx(-)] test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=3D interactive marker communication library for RViz and similar tools
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/interactive_markers https://github.com/ros-visualization/interactive_markers
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/std_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/roscpp dev-ros/rosconsole dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/rosconsole dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf2_ros python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=86c6e9c60a7ecec4d6ecb85d112373d9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35643f9e8f05439111bec7225f579822
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.5 b/metadata/md5-cache/dev-ros/ivcon-0.1.5
deleted file mode 100644
index 7204d912db19..000000000000
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Mesh Conversion Utility
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ivcon/archive/0.1.5.tar.gz -> ivcon-0.1.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c3f77d3c31dd4495f6b33c0e6fe2d80
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.6 b/metadata/md5-cache/dev-ros/ivcon-0.1.6
deleted file mode 100644
index 5aa99808396f..000000000000
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Mesh Conversion Utility
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/ivcon/archive/0.1.6.tar.gz -> ivcon-0.1.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c3f77d3c31dd4495f6b33c0e6fe2d80
diff --git a/metadata/md5-cache/dev-ros/ivcon-0.1.7 b/metadata/md5-cache/dev-ros/ivcon-0.1.7
index cdc40c86f522..c984113c8113 100644
--- a/metadata/md5-cache/dev-ros/ivcon-0.1.7
+++ b/metadata/md5-cache/dev-ros/ivcon-0.1.7
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Mesh Conversion Utility
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros/ivcon/archive/0.1.7.tar.gz -> ivcon-0.1.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4c12a7b633a10521e6d084055c9e4fb3
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/ivcon-9999 b/metadata/md5-cache/dev-ros/ivcon-9999
index daae40d72599..3758d9a8ba03 100644
--- a/metadata/md5-cache/dev-ros/ivcon-9999
+++ b/metadata/md5-cache/dev-ros/ivcon-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Mesh Conversion Utility
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/ivcon https://github.com/ros/ivcon
 IUSE=python_targets_python3_6 test
 LICENSE=GPL-2
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9c3f77d3c31dd4495f6b33c0e6fe2d80
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6a8960ef5eca578b981de012f97bd8d9
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.12.10 b/metadata/md5-cache/dev-ros/kdl_parser-1.12.10
deleted file mode 100644
index 57be5ca088b7..000000000000
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.12.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole dev-ros/urdf sci-libs/orocos_kdl dev-libs/tinyxml python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/kdl_parser/archive/1.12.10.tar.gz -> kdl_parser-1.12.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a400996376fe28f4d2c0cd4a2ab69a46
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.13.0 b/metadata/md5-cache/dev-ros/kdl_parser-1.13.0
deleted file mode 100644
index fa9b4bb034d5..000000000000
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.0.tar.gz -> kdl_parser-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=591d4ecce1dea54a47db10652db83384
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.13.1 b/metadata/md5-cache/dev-ros/kdl_parser-1.13.1
deleted file mode 100644
index 0e93b81b8861..000000000000
--- a/metadata/md5-cache/dev-ros/kdl_parser-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.1.tar.gz -> kdl_parser-1.13.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=591d4ecce1dea54a47db10652db83384
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-1.14.0 b/metadata/md5-cache/dev-ros/kdl_parser-1.14.0
new file mode 100644
index 000000000000..d371d094b83c
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/kdl_parser-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.0.tar.gz -> kdl_parser-1.14.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de66875ba4bc0ca660ec7ac4e7b0a166
diff --git a/metadata/md5-cache/dev-ros/kdl_parser-9999 b/metadata/md5-cache/dev-ros/kdl_parser-9999
index 7456e59632cf..f5344790a705 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 sci-libs/orocos_kdl:= dev-libs/tinyxml2:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Constructs a KDL tree from an XML robot representation in URDF
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser https://github.com/ros/kdl_parser
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-libs/boost:= dev-ros/roscpp dev-ros/rosconsole >=dev-ros/urdf-1.13 s
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=591d4ecce1dea54a47db10652db83384
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=de66875ba4bc0ca660ec7ac4e7b0a166
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10
deleted file mode 100644
index dbb8438418ba..000000000000
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/urdf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/urdf[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/kdl_parser/archive/1.12.10.tar.gz -> kdl_parser-1.12.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=632cd9f1e396555b0d90d63b25aaedac
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0
deleted file mode 100644
index a1cbbf3a30dd..000000000000
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.0.tar.gz -> kdl_parser-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e66bd6e4c15819d1b7ee217a4c06acb2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1
deleted file mode 100644
index 276669d689be..000000000000
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/kdl_parser/archive/1.13.1.tar.gz -> kdl_parser-1.13.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e66bd6e4c15819d1b7ee217a4c06acb2
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0 b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
new file mode 100644
index 000000000000..d3b88f33ec15
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/kdl_parser/archive/1.14.0.tar.gz -> kdl_parser-1.14.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=835dd1ba427ced55bbbd56ec2c8c57c1
diff --git a/metadata/md5-cache/dev-ros/kdl_parser_py-9999 b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
index 3cadd53a00f1..59ec957eec58 100644
--- a/metadata/md5-cache/dev-ros/kdl_parser_py-9999
+++ b/metadata/md5-cache/dev-ros/kdl_parser_py-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Python tools to construct a KDL tree from an XML robot representation in URDF
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/kdl_parser_py https://github.com/ros/kdl_parser
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/urdf-1.13[python_targets_python3_6(-)?,-python_single_target_p
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e66bd6e4c15819d1b7ee217a4c06acb2
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=835dd1ba427ced55bbbd56ec2c8c57c1
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.6 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.6
deleted file mode 100644
index 956e2a392229..000000000000
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.6.tar.gz -> laser_assembler-1.7.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=674fef94121722022d0546f32c920089
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.7 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.7
deleted file mode 100644
index b5d5d7eed0d4..000000000000
--- a/metadata/md5-cache/dev-ros/laser_assembler-1.7.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.7.tar.gz -> laser_assembler-1.7.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=674fef94121722022d0546f32c920089
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-1.7.8 b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
new file mode 100644
index 000000000000..308a391560d6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_assembler-1.7.8
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_assembler/archive/1.7.8.tar.gz -> laser_assembler-1.7.8.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c5ebb7335f0060477ac07c01a27c77f
diff --git a/metadata/md5-cache/dev-ros/laser_assembler-9999 b/metadata/md5-cache/dev-ros/laser_assembler-9999
index b9f63b2429e4..6e38ce456ed6 100644
--- a/metadata/md5-cache/dev-ros/laser_assembler-9999
+++ b/metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pluginlib dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-ros/message_filters[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/filters dev-cpp/eigen:3 test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Nodes to assemble point clouds from either LaserScan or PointCloud messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_assembler https://github.com/ros-perception/laser_assembler
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/laser_geometry[python
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c66d9b7f0c5394ee2c31e20fb7c771e7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c5ebb7335f0060477ac07c01a27c77f
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.11 b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
new file mode 100644
index 000000000000..e504274c67bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_filters-1.8.11
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.11.tar.gz -> laser_filters-1.8.11.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=313831bea8ffc4388db1796f145313f7
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.6 b/metadata/md5-cache/dev-ros/laser_filters-1.8.6
deleted file mode 100644
index 2d852ae7066c..000000000000
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.6.tar.gz -> laser_filters-1.8.6.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=121c139042888122313766e6b5d1e036
diff --git a/metadata/md5-cache/dev-ros/laser_filters-1.8.7 b/metadata/md5-cache/dev-ros/laser_filters-1.8.7
deleted file mode 100644
index 21dce8341785..000000000000
--- a/metadata/md5-cache/dev-ros/laser_filters-1.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_filters/archive/1.8.7.tar.gz -> laser_filters-1.8.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=18f6323e5939b2b61ad55189e6dc35b7
diff --git a/metadata/md5-cache/dev-ros/laser_filters-9999 b/metadata/md5-cache/dev-ros/laser_filters-9999
index c71d058abb61..420171b937c8 100644
--- a/metadata/md5-cache/dev-ros/laser_filters-9999
+++ b/metadata/md5-cache/dev-ros/laser_filters-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Assorted filters designed to operate on 2D planar laser scanners
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_filters https://github.com/ros-perception/laser_filters
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-libs/boost:= dev-ros/tf dev-ros/angles dev-ros/filters dev-ros/laser_geometry dev-libs/tinyxml2:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9f30ba5add3aa627f390d626dff82f58
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=313831bea8ffc4388db1796f145313f7
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.4 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
deleted file mode 100644
index 8e5d1822c572..000000000000
--- a/metadata/md5-cache/dev-ros/laser_geometry-1.6.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/cmake_modules test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.4.tar.gz -> laser_geometry-1.6.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55840aa2a23c8d24a7aeebe9e66c6a66
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-1.6.5 b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
new file mode 100644
index 000000000000..45c40d172b66
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_geometry-1.6.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_geometry/archive/1.6.5.tar.gz -> laser_geometry-1.6.5.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b69664576658622603b101c871962ef9
diff --git a/metadata/md5-cache/dev-ros/laser_geometry-9999 b/metadata/md5-cache/dev-ros/laser_geometry-9999
index 5475e6d5dc5a..2c2484a59bb5 100644
--- a/metadata/md5-cache/dev-ros/laser_geometry-9999
+++ b/metadata/md5-cache/dev-ros/laser_geometry-9999
@@ -1,14 +1,15 @@
+BDEPEND=dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/cmake_modules test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-python/nose[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Class for converting from a 2D laser scan into a point cloud
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_geometry https://github.com/ros-perception/laser_geometry
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:=[threads] dev-ros/tf dev-ros/tf2_ros[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/eigen:3 dev-ros/angles python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=55840aa2a23c8d24a7aeebe9e66c6a66
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b69664576658622603b101c871962ef9
diff --git a/metadata/md5-cache/dev-ros/laser_proc-0.1.5 b/metadata/md5-cache/dev-ros/laser_proc-0.1.5
deleted file mode 100644
index 2d03c735a934..000000000000
--- a/metadata/md5-cache/dev-ros/laser_proc-0.1.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/laser_proc/archive/0.1.5.tar.gz -> laser_proc-0.1.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=4aa12cb1b1b69eebd1191b745034a4db
diff --git a/metadata/md5-cache/dev-ros/laser_proc-0.1.6 b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
new file mode 100644
index 000000000000..8b930442edfa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/laser_proc-0.1.6
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/laser_proc/archive/0.1.6.tar.gz -> laser_proc-0.1.6.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/laser_proc-9999 b/metadata/md5-cache/dev-ros/laser_proc-9999
index 49d9deeb7d81..ac0e84a604a4 100644
--- a/metadata/md5-cache/dev-ros/laser_proc-9999
+++ b/metadata/md5-cache/dev-ros/laser_proc-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Converts representations of sensor_msgs/LaserScan and sensor_msgs/MultiEchoLaserScan
-EAPI=5
+DEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Converts representations of LaserScan and MultiEchoLaserScan
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/laser_proc https://github.com/ros-perception/laser_proc
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/pluginlib dev-ros/nodelet dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0b14d0751d79c267937b44719852545b
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f3a275d0a7d06763f2bcf08f94b483a7
diff --git a/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1 b/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
deleted file mode 100644
index 8cf4d8581ebc..000000000000
--- a/metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=MAVLink communication library
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e3d81b918976ba16ab36414db745443b
diff --git a/metadata/md5-cache/dev-ros/libmavconn-1.2.0 b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
new file mode 100644
index 000000000000..157660fe0f0b
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/libmavconn-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=MAVLink communication library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92d8286acc8bfb28a80de5f03254dbe5
diff --git a/metadata/md5-cache/dev-ros/libmavconn-9999 b/metadata/md5-cache/dev-ros/libmavconn-9999
index 28607f64ff90..88bc9bbe121a 100644
--- a/metadata/md5-cache/dev-ros/libmavconn-9999
+++ b/metadata/md5-cache/dev-ros/libmavconn-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=MAVLink communication library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/libmavconn https://github.com/mavlink/mavros
 IUSE=python_targets_python3_6 test
 LICENSE=GPL-3 LGPL-3 BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/mavlink-gbp-release-2016.7.7 dev-libs/boost:= dev-libs/console
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fc87b701393688870902942c758331f9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=92d8286acc8bfb28a80de5f03254dbe5
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.13.0 b/metadata/md5-cache/dev-ros/map_msgs-1.13.0
deleted file mode 100644
index f43d191aa16d..000000000000
--- a/metadata/md5-cache/dev-ros/map_msgs-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages commonly used in mapping packages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.13.0.tar.gz -> navigation_msgs-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5781ca813529b609e76185c1f725aba7
diff --git a/metadata/md5-cache/dev-ros/map_msgs-1.14.0 b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
new file mode 100644
index 000000000000..7b223d99d047
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/map_msgs-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages commonly used in mapping packages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.0.tar.gz -> navigation_msgs-1.14.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d9902613bec184d432f057ce4dd8eb2
diff --git a/metadata/md5-cache/dev-ros/map_msgs-9999 b/metadata/md5-cache/dev-ros/map_msgs-9999
index b580cc7dcf3c..dd61bae8b9f4 100644
--- a/metadata/md5-cache/dev-ros/map_msgs-9999
+++ b/metadata/md5-cache/dev-ros/map_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages commonly used in mapping packages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/map_msgs https://github.com/ros-planning/navigation_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5781ca813529b609e76185c1f725aba7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7d9902613bec184d432f057ce4dd8eb2
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1
deleted file mode 100644
index cec16fbcf4b1..000000000000
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=MAVLink message marshaling library
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/kinetic/mavlink/2017.2.7-2017.2.7.tar.gz -> mavlink-gbp-release-2017.2.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c667f892e2edd0f915e1c8eee97150e8
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5
deleted file mode 100644
index 99c3e44696c7..000000000000
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=MAVLink message marshaling library
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/kinetic/mavlink/2017.5.5-2017.5.5.tar.gz -> mavlink-gbp-release-2017.5.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c667f892e2edd0f915e1c8eee97150e8
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2019.11.11 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2019.11.11
deleted file mode 100644
index 628e559fbfcc..000000000000
--- a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2019.11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=MAVLink message marshaling library
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=LGPL-3
-RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/melodic/mavlink/2019.11.11-2019.11.11.tar.gz -> mavlink-gbp-release-2019.11.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbd8ae547bb99d2b715a66833ecd579b
diff --git a/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7 b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7
new file mode 100644
index 000000000000..4917489997c0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=MAVLink message marshaling library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavlink-gbp-release https://github.com/mavlink/mavlink-gbp-release
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=LGPL-3
+RDEPEND=dev-python/future[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavlink-gbp-release/archive/release/noetic/mavlink/2020.7.7-2020.7.7.tar.gz -> mavlink-gbp-release-2020.7.7.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fc1d6433b882242afb65b7ac36979208
diff --git a/metadata/md5-cache/dev-ros/mavros-0.19.0-r1 b/metadata/md5-cache/dev-ros/mavros-0.19.0-r1
deleted file mode 100644
index 63708e98f227..000000000000
--- a/metadata/md5-cache/dev-ros/mavros-0.19.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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 dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.19.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-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 dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-0.19.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed0e673fed0110c1ffeba725aa03a11f
diff --git a/metadata/md5-cache/dev-ros/mavros-1.2.0 b/metadata/md5-cache/dev-ros/mavros-1.2.0
new file mode 100644
index 000000000000..9d056d383925
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-1.2.0[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=MAVLink extendable communication node for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+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-2016.11.11 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros-9999 b/metadata/md5-cache/dev-ros/mavros-9999
index f595d67a2814..5adb8b936d29 100644
--- a/metadata/md5-cache/dev-ros/mavros-9999
+++ b/metadata/md5-cache/dev-ros/mavros-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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 dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=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-2016.11.11 dev-libs/console_bridge:= dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=MAVLink extendable communication node for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros https://github.com/mavlink/mavros
 IUSE=python_targets_python3_6 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-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 dev-ros/std_srvs[ros_messages_cxx(-)] >=dev-ros/mavros_msgs-9999[ros_messages_cxx(-)] dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] >=dev-ros/mavlink-gbp-release-2016.11.11 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+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-2016.11.11 dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed0e673fed0110c1ffeba725aa03a11f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=97a87f1d3c66eca22769bea745583b3a
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1 b/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1
deleted file mode 100644
index 975b91f68566..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Extra nodes and plugins for mavros
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66aa53d75a5501a593faa9ef121d47d7
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-1.2.0 b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
new file mode 100644
index 000000000000..913387dcfce6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_extras-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Extra nodes and plugins for mavros
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-3 LGPL-3 BSD
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index a7e71337f7ee..1c42bd67bcba 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= dev-cpp/eigen:3 dev-ros/mavros_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_extras https://github.com/mavlink/mavros
 IUSE=python_targets_python3_6 test
 LICENSE=GPL-3 LGPL-3 BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/urdf dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=66aa53d75a5501a593faa9ef121d47d7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a32bca61b73d165ce652a5e91bb039c0
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7 b/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7
deleted file mode 100644
index 2cfd617a4039..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.18.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for MAVROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.18.7.tar.gz -> mavros-0.18.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed53d012003ff3da9784855a0538a327
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0 b/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0
deleted file mode 100644
index 549be4f47975..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_msgs-0.19.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for MAVROS
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.19.0.tar.gz -> mavros-0.19.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed53d012003ff3da9784855a0538a327
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0 b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
new file mode 100644
index 000000000000..756d7ab77e9f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages for MAVROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mavlink/mavros/archive/1.2.0.tar.gz -> mavros-1.2.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f66daa314118b10711f88ec5629a5ef4
diff --git a/metadata/md5-cache/dev-ros/mavros_msgs-9999 b/metadata/md5-cache/dev-ros/mavros_msgs-9999
index 855b2ecd92bd..0b1914480425 100644
--- a/metadata/md5-cache/dev-ros/mavros_msgs-9999
+++ b/metadata/md5-cache/dev-ros/mavros_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages for MAVROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/mavros_msgs https://github.com/mavlink/mavros
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ed53d012003ff3da9784855a0538a327
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f66daa314118b10711f88ec5629a5ef4
diff --git a/metadata/md5-cache/dev-ros/media_export-0.2.0 b/metadata/md5-cache/dev-ros/media_export-0.2.0
deleted file mode 100644
index 3955b4080930..000000000000
--- a/metadata/md5-cache/dev-ros/media_export-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Allow ROS packages to export media paths to each other
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/media_export/archive/0.2.0.tar.gz -> media_export-0.2.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c59a71f5c6d7db7a423f868e2dfcc7f
diff --git a/metadata/md5-cache/dev-ros/media_export-0.3.0 b/metadata/md5-cache/dev-ros/media_export-0.3.0
new file mode 100644
index 000000000000..1a64186dddbb
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/media_export-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Allow ROS packages to export media paths to each other
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/media_export/archive/0.3.0.tar.gz -> media_export-0.3.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/media_export-9999 b/metadata/md5-cache/dev-ros/media_export-9999
index dc3e3b56ee7a..39977ed00f0a 100644
--- a/metadata/md5-cache/dev-ros/media_export-9999
+++ b/metadata/md5-cache/dev-ros/media_export-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Allow ROS packages to export media paths to each other
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/media_export https://github.com/ros/media_export
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1c59a71f5c6d7db7a423f868e2dfcc7f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9baa909c0b32670e31af5d4a69f2cd48
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.3.0 b/metadata/md5-cache/dev-ros/message_generation-0.3.0
deleted file mode 100644
index 92193d999b78..000000000000
--- a/metadata/md5-cache/dev-ros/message_generation-0.3.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Build-time dependencies for generating language bindings of messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/message_generation/archive/0.3.0.tar.gz -> message_generation-0.3.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=41b75c11275796e5fa3d0b290c4d85f7
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.4.0 b/metadata/md5-cache/dev-ros/message_generation-0.4.0
deleted file mode 100644
index 2b6e199a4dac..000000000000
--- a/metadata/md5-cache/dev-ros/message_generation-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Build-time dependencies for generating language bindings of messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/message_generation/archive/0.4.0.tar.gz -> message_generation-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7168198a73d9ce0349edf0b4418da2ba
diff --git a/metadata/md5-cache/dev-ros/message_generation-0.4.1 b/metadata/md5-cache/dev-ros/message_generation-0.4.1
new file mode 100644
index 000000000000..de885275f897
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_generation-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Build-time dependencies for generating language bindings of messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/message_generation/archive/0.4.1.tar.gz -> message_generation-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_generation-9999 b/metadata/md5-cache/dev-ros/message_generation-9999
index 5442eac0c2d3..b414c4739fa1 100644
--- a/metadata/md5-cache/dev-ros/message_generation-9999
+++ b/metadata/md5-cache/dev-ros/message_generation-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/geneus dev-ros/gennodejs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Build-time dependencies for generating language bindings of messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_generation https://github.com/ros/message_generation
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/genmsg dev-ros/genlisp dev-ros/gencpp dev-ros/genpy dev-ros/gene
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7168198a73d9ce0349edf0b4418da2ba
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=a46f751e3efb9d00ab4de7bd74f4b542
diff --git a/metadata/md5-cache/dev-ros/message_runtime-0.4.12 b/metadata/md5-cache/dev-ros/message_runtime-0.4.12
deleted file mode 100644
index c325cd0b5ada..000000000000
--- a/metadata/md5-cache/dev-ros/message_runtime-0.4.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/message_runtime/archive/0.4.12.tar.gz -> message_runtime-0.4.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15e0b820f77afa276256ab1f79eb9974
diff --git a/metadata/md5-cache/dev-ros/message_runtime-0.4.13 b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
new file mode 100644
index 000000000000..e5b646126f6e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/message_runtime-0.4.13
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_serialization python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/message_runtime/archive/0.4.13.tar.gz -> message_runtime-0.4.13.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_runtime-9999 b/metadata/md5-cache/dev-ros/message_runtime-9999
index 2d3e9748076c..f926f22d83f0 100644
--- a/metadata/md5-cache/dev-ros/message_runtime-9999
+++ b/metadata/md5-cache/dev-ros/message_runtime-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Package modeling the run-time dependencies for language bindings of messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_runtime https://github.com/ros/message_runtime
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/cpp_common dev-ros/rostime dev-ros/roscpp_traits dev-ros/roscpp_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=15e0b820f77afa276256ab1f79eb9974
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9c3ea7d07776344a7e60211286a9eb76
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0 b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
index 937d00f65761..134cf61d544a 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
+++ b/metadata/md5-cache/dev-ros/message_to_tf-0.3.0
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Translates pose information from different kind of common_msgs message types to tf
-EAPI=5
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Translates pose information from different kind of common message types to tf
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_localization/archive/0.3.0.tar.gz -> hector_localization-0.3.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d4541b975a6bb536a36e0cc4248eb35
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/message_to_tf-9999 b/metadata/md5-cache/dev-ros/message_to_tf-9999
index 5ef26ff955eb..78f47d2910f3 100644
--- a/metadata/md5-cache/dev-ros/message_to_tf-9999
+++ b/metadata/md5-cache/dev-ros/message_to_tf-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Translates pose information from different kind of common_msgs message types to tf
-EAPI=5
+DEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Translates pose information from different kind of common message types to tf
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/message_to_tf https://github.com/tu-darmstadt-ros-pkg/hector_localization
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/topic_tools dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/tf dev-ros/topic_tools dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d4541b975a6bb536a36e0cc4248eb35
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ef0efaff87d81fdddfabf528c8c97902
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0 b/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
deleted file mode 100644
index 385e2207a7fe..000000000000
--- a/metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Holds the action description and relevant messages for the move_base package
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.13.0.tar.gz -> navigation_msgs-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53ea64bb8bac427c5346034f90d740b9
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0 b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
new file mode 100644
index 000000000000..6bc3c4f122f5
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Holds the action description and relevant messages for the move_base package
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation_msgs/archive/1.14.0.tar.gz -> navigation_msgs-1.14.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06c2a20a66b87f8c7ad0efdb6dc4846c
diff --git a/metadata/md5-cache/dev-ros/move_base_msgs-9999 b/metadata/md5-cache/dev-ros/move_base_msgs-9999
index ebf57991fa9b..e29948ee714a 100644
--- a/metadata/md5-cache/dev-ros/move_base_msgs-9999
+++ b/metadata/md5-cache/dev-ros/move_base_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Holds the action description and relevant messages for the move_base package
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/move_base_msgs https://github.com/ros-planning/navigation_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=53ea64bb8bac427c5346034f90d740b9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=06c2a20a66b87f8c7ad0efdb6dc4846c
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0 b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0
deleted file mode 100644
index 34d8401f06d1..000000000000
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages, services and actions used by MoveIt
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.10.0.tar.gz -> moveit_msgs-0.10.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef748062608cd7a68c491467588c92ef
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
new file mode 100644
index 000000000000..93c7a344ca2f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages, services and actions used by MoveIt
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.10.1.tar.gz -> moveit_msgs-0.10.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1 b/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1
deleted file mode 100644
index 2530ca5167cf..000000000000
--- a/metadata/md5-cache/dev-ros/moveit_msgs-0.9.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages, services and actions used by MoveIt
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/moveit_msgs/archive/0.9.1.tar.gz -> moveit_msgs-0.9.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef748062608cd7a68c491467588c92ef
diff --git a/metadata/md5-cache/dev-ros/moveit_msgs-9999 b/metadata/md5-cache/dev-ros/moveit_msgs-9999
index 3636c5bf5be1..9ffe8d16c4ee 100644
--- a/metadata/md5-cache/dev-ros/moveit_msgs-9999
+++ b/metadata/md5-cache/dev-ros/moveit_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/octomap_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/octomap_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/object_recognition_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/object_recognition_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages, services and actions used by MoveIt
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/moveit_msgs https://github.com/ros-planning/moveit_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ef748062608cd7a68c491467588c92ef
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d3ee98710b0c308b3a8bab2054f695e7
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0 b/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0
deleted file mode 100644
index ff57ec41d4f5..000000000000
--- a/metadata/md5-cache/dev-ros/nmea_msgs-1.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages related to data in the NMEA format
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/nmea_msgs/archive/nmea_msgs-1.0.0.tar.gz -> nmea_msgs-1.0.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbe170cb5373cf5624b518f543d0739a
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0 b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
new file mode 100644
index 000000000000..3bb5126b31f7
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages related to data in the NMEA format
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/nmea_msgs/archive/1.1.0.tar.gz -> nmea_msgs-1.1.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/nmea_msgs-9999 b/metadata/md5-cache/dev-ros/nmea_msgs-9999
index 5c18e3e4f02d..879af8c161d6 100644
--- a/metadata/md5-cache/dev-ros/nmea_msgs-9999
+++ b/metadata/md5-cache/dev-ros/nmea_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages related to data in the NMEA format
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/nmea_msgs https://github.com/ros-drivers/nmea_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bbe170cb5373cf5624b518f543d0739a
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=57e6ac9db02136bec3d5ed687675b3ad
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1 b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
index f78e0dadac15..96fdb6c8e9cd 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/object_recognition_msgs https://github.com/wg-perception/object_recognition_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/wg-perception/object_recognition_msgs/archive/0.4.1.tar.gz -> object_recognition_msgs-0.4.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d927ca079e224d1d45dcc133e2e70ec
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999 b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
index 9d354dbb83a8..ed38f74b8d33 100644
--- a/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+++ b/metadata/md5-cache/dev-ros/object_recognition_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/shape_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/shape_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=ROS message and the actionlib definition used in object_recognition_core
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/object_recognition_msgs https://github.com/wg-perception/object_recognition_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7d927ca079e224d1d45dcc133e2e70ec
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=35c97eba14e78a4aa5bb582f53d03f74
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
deleted file mode 100644
index 33c2fa0c3d1a..000000000000
--- a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages and serializations / conversion for the OctoMap library
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.3.tar.gz -> octomap_msgs-0.3.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d91cea1354e06670a2541b98a953bf8
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5 b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
new file mode 100644
index 000000000000..da409b544bdd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages and serializations / conversion for the OctoMap library
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OctoMap/octomap_msgs/archive/0.3.5.tar.gz -> octomap_msgs-0.3.5.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_msgs-9999 b/metadata/md5-cache/dev-ros/octomap_msgs-9999
index 3d7589f77520..46f79aa4985a 100644
--- a/metadata/md5-cache/dev-ros/octomap_msgs-9999
+++ b/metadata/md5-cache/dev-ros/octomap_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=Messages and serializations / conversion for the OctoMap library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_msgs https://github.com/OctoMap/octomap_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9d91cea1354e06670a2541b98a953bf8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7fd1efd1e54e5c2dd5400e9418caac6b
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1 b/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
deleted file mode 100644
index 4679ba7e3a8d..000000000000
--- a/metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/OctoMap/octomap_ros/archive/0.4.0.tar.gz -> octomap_ros-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff85d2fd879999793bcff8c3b0fde24f
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-0.4.1 b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
new file mode 100644
index 000000000000..78612fda82d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/octomap_ros-0.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/OctoMap/octomap_ros/archive/0.4.1.tar.gz -> octomap_ros-0.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/octomap_ros-9999 b/metadata/md5-cache/dev-ros/octomap_ros-9999
index 95d9f0071799..09ce37fe526a 100644
--- a/metadata/md5-cache/dev-ros/octomap_ros-9999
+++ b/metadata/md5-cache/dev-ros/octomap_ros-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Conversion functions between ROS / PCL and OctoMap's native types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/octomap_ros https://github.com/OctoMap/octomap_ros
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap dev-ros/octomap_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/tf dev-ros/pcl_ros sci-libs/octomap python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ff85d2fd879999793bcff8c3b0fde24f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bb69d0845d5e0a6185a81e389d347efe
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1 b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
index 1b9c1f5f8735..6b1270530ade 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
+++ b/metadata/md5-cache/dev-ros/opencv_apps-2.0.1
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=OpenCV applications for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/opencv_apps/archive/2.0.1.tar.gz -> opencv_apps-2.0.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fe44a5f8c0ffa72228148197c5bf6587
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=747e09a5c62b9bbcfcb97f7136b96bd1
diff --git a/metadata/md5-cache/dev-ros/opencv_apps-9999 b/metadata/md5-cache/dev-ros/opencv_apps-9999
index 75ec26c149dd..cbd15b1077ec 100644
--- a/metadata/md5-cache/dev-ros/opencv_apps-9999
+++ b/metadata/md5-cache/dev-ros/opencv_apps-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= dev-ros/std_srvs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=OpenCV applications for ROS
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_apps https://github.com/ros-perception/opencv_apps
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/image_transport dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp >=media-libs/opencv-3.3:0=[contrib] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=226610f1674c16c628040e3206cd8f71
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=aa4b5e9b30655f6af10def42577200cd
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
deleted file mode 100644
index 9f8f21f6effc..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.1.tar.gz -> vision_opencv-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.2 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
deleted file mode 100644
index 87f04ef433ae..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.2.tar.gz -> vision_opencv-1.12.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.3 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
deleted file mode 100644
index cb0b2f7798fd..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.3.tar.gz -> vision_opencv-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=189572adf96e0296719177bd0bb91903
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.4 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.4
deleted file mode 100644
index 06ea142f6a2f..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.4.tar.gz -> vision_opencv-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7bbeabe7ec9cf5a166e246d54734d83
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.5 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.5
deleted file mode 100644
index 846535ea424a..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.5.tar.gz -> vision_opencv-1.12.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7bbeabe7ec9cf5a166e246d54734d83
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.7 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.7
deleted file mode 100644
index f8e3617212b3..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.7
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.7.tar.gz -> vision_opencv-1.12.7.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b7bbeabe7ec9cf5a166e246d54734d83
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.12.8 b/metadata/md5-cache/dev-ros/opencv_tests-1.12.8
deleted file mode 100644
index e4ed1274f3b7..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.12.8
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.12.8.tar.gz -> vision_opencv-1.12.8.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94b6a648e2a9afc510d165d8c9392f81
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.13.0 b/metadata/md5-cache/dev-ros/opencv_tests-1.13.0
deleted file mode 100644
index 6ba34fc74c80..000000000000
--- a/metadata/md5-cache/dev-ros/opencv_tests-1.13.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.13.0.tar.gz -> vision_opencv-1.13.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=94b6a648e2a9afc510d165d8c9392f81
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-1.15.0 b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
new file mode 100644
index 000000000000..9b8e562ee103
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/opencv_tests-1.15.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Tests for ROS OpenCV integration
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1c8a3c7903141646f98c8f1df01d1ee
diff --git a/metadata/md5-cache/dev-ros/opencv_tests-9999 b/metadata/md5-cache/dev-ros/opencv_tests-9999
index 8ca85a449b1c..8dfcd1ac1669 100644
--- a/metadata/md5-cache/dev-ros/opencv_tests-9999
+++ b/metadata/md5-cache/dev-ros/opencv_tests-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] media-libs/opencv[python,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/numpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Tests for ROS OpenCV integration
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/opencv_tests https://github.com/ros-perception/vision_opencv
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/cv_bridge[python_targets_python3_6(-)?,-python_single_target_pyt
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=189572adf96e0296719177bd0bb91903
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c1c8a3c7903141646f98c8f1df01d1ee
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1 b/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1
deleted file mode 100644
index 1ea5bcd30ca3..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.3.0.tar.gz -> openni2_camera-0.3.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bd815a6dbd70ad6e3fb155e20c641263
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.4.0 b/metadata/md5-cache/dev-ros/openni2_camera-0.4.0
deleted file mode 100644
index 5dcb53c03512..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.4.0.tar.gz -> openni2_camera-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b4292f379975af5cb6c143a69b729f5e
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-0.4.2 b/metadata/md5-cache/dev-ros/openni2_camera-0.4.2
deleted file mode 100644
index 5ea163faed6a..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_camera-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.4.2.tar.gz -> openni2_camera-0.4.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=64d615ea1066e754cf66d5e4b50910f2
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-1.4.2 b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
new file mode 100644
index 000000000000..99ba32c95815
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_camera-1.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9d35c23720ba6445bd98ae88ba12e70
diff --git a/metadata/md5-cache/dev-ros/openni2_camera-9999 b/metadata/md5-cache/dev-ros/openni2_camera-9999
index b848d78eb8a9..e6dc5ad3b465 100644
--- a/metadata/md5-cache/dev-ros/openni2_camera-9999
+++ b/metadata/md5-cache/dev-ros/openni2_camera-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=ROS drivers for the Asus Xtion and Primesense Devices
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_camera https://github.com/ros-drivers/openni2_camera
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
+RDEPEND=dev-ros/image_transport dev-ros/camera_info_manager dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roscpp dev-libs/OpenNI2 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bd815a6dbd70ad6e3fb155e20c641263
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d9d35c23720ba6445bd98ae88ba12e70
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-0.4.0 b/metadata/md5-cache/dev-ros/openni2_launch-0.4.0
deleted file mode 100644
index 595c70debdd0..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_launch-0.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.4.0.tar.gz -> openni2_camera-0.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3b9fe557c39ac443487a60251f8603bc
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-0.4.2 b/metadata/md5-cache/dev-ros/openni2_launch-0.4.2
deleted file mode 100644
index a2d9cd3f6cbf..000000000000
--- a/metadata/md5-cache/dev-ros/openni2_launch-0.4.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/0.4.2.tar.gz -> openni2_camera-0.4.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7daa5936384eef9c78de010e29474d4c
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-1.4.2 b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
new file mode 100644
index 000000000000..0106ff52a542
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openni2_launch-1.4.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch sys-apps/usbutils python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-drivers/openni2_camera/archive/1.4.2.tar.gz -> openni2_camera-1.4.2.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openni2_launch-9999 b/metadata/md5-cache/dev-ros/openni2_launch-9999
index 4cfb5eb61b87..083e14eb2f13 100644
--- a/metadata/md5-cache/dev-ros/openni2_launch-9999
+++ b/metadata/md5-cache/dev-ros/openni2_launch-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/nodelet dev-ros/openni2_camera dev-ros/tf dev-ros/roslaunch python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Launch files to start the openni2_camera drivers using rgbd_launch
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/openni2_launch https://github.com/ros-drivers/openni2_camera
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rgbd_launch dev-ros/depth_image_proc dev-ros/image_proc dev-ros/
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7daa5936384eef9c78de010e29474d4c
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=c50a83e3f7327e2e2c38ca27b6a7d810
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
deleted file mode 100644
index 08603fd149c9..000000000000
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS-ified version of gmapping SLAM
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.1.1.tar.gz -> openslam_gmapping-0.1.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7575bfe62a428f249ab7c351b5722b2
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
deleted file mode 100644
index 2009c99b91b5..000000000000
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=ROS-ified version of gmapping SLAM
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=CC-BY-NC-SA-2.5
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.1.2.tar.gz -> openslam_gmapping-0.1.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=865a855c5b66abde933aa0a5a2c3970a
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1 b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
new file mode 100644
index 000000000000..c84cf9e5d75a
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=ROS-ified version of gmapping SLAM
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=CC-BY-NC-SA-2.5
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/openslam_gmapping/archive/0.2.1.tar.gz -> openslam_gmapping-0.2.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7890d310f96776aed32e6b912cb76b99
diff --git a/metadata/md5-cache/dev-ros/openslam_gmapping-9999 b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
index 85c31d349a93..982db046db58 100644
--- a/metadata/md5-cache/dev-ros/openslam_gmapping-9999
+++ b/metadata/md5-cache/dev-ros/openslam_gmapping-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=ROS-ified version of gmapping SLAM
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/openslam_gmapping https://github.com/ros-perception/openslam_gmapping
 IUSE=python_targets_python3_6 test
 LICENSE=CC-BY-NC-SA-2.5
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d7575bfe62a428f249ab7c351b5722b2
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7890d310f96776aed32e6b912cb76b99
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1 b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
index 2c192746c298..89f21e8b5292 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e9c1be5838e24683c9d471e4d40af5d3
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_conversions-9999 b/metadata/md5-cache/dev-ros/pcl_conversions-9999
index ebef0c874d7a..9fa67390ef7f 100644
--- a/metadata/md5-cache/dev-ros/pcl_conversions-9999
+++ b/metadata/md5-cache/dev-ros/pcl_conversions-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Provides conversions from PCL data types and ROS message types
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_conversions https://github.com/ros-perception/perception_pcl
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp sci-libs/pcl:= dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-cpp/eigen:3 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp sci-libs/pcl:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7443d51432724b4b3f37e412f3d44164
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=745ff6bb85b4c0dab889f165304329f6
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0 b/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
deleted file mode 100644
index 5c7f81d4dbc4..000000000000
--- a/metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/pcl_msgs/archive/0.2.0.tar.gz -> pcl_msgs-0.2.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46b3006957340e4b4e4e14e160b17df9
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0 b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
new file mode 100644
index 000000000000..14df682b2a75
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/pcl_msgs/archive/0.3.0.tar.gz -> pcl_msgs-0.3.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_msgs-9999 b/metadata/md5-cache/dev-ros/pcl_msgs-9999
index 5c82c4cc9fad..300905e52c98 100644
--- a/metadata/md5-cache/dev-ros/pcl_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pcl_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
 DESCRIPTION=PCL (Point Cloud Library)-related ROS messages
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_msgs https://github.com/ros-perception/pcl_msgs
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=46b3006957340e4b4e4e14e160b17df9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=85517fdb433b14bd707ed99694601949
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1 b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
index 661a181fb651..7f88d8013f55 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.7.1
@@ -1,15 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.7.1.tar.gz -> perception_pcl-1.7.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=941823d10113e2515e7a8b1a28153de7
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b16e490d9229b3cf5f9b0436d8e98ea7
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index 91ca6748bcc0..f93728051c18 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pcl_ros https://github.com/ros-perception/perception_pcl
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/message_filters >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-libs/console_bridge:= dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a63d8e97cf4e48fdbd957006d7867cf1
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=1906362b0e70cbd289bdcb56a0c21d69
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1 b/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1
deleted file mode 100644
index 56504565922e..000000000000
--- a/metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/pluginlib/archive/1.12.0.tar.gz -> pluginlib-1.12.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1cae04bce33952a4127d6dd854856da8
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.12.1 b/metadata/md5-cache/dev-ros/pluginlib-1.12.1
deleted file mode 100644
index ce94e8eca72e..000000000000
--- a/metadata/md5-cache/dev-ros/pluginlib-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros/pluginlib/archive/1.12.1.tar.gz -> pluginlib-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1cae04bce33952a4127d6dd854856da8
diff --git a/metadata/md5-cache/dev-ros/pluginlib-1.13.0 b/metadata/md5-cache/dev-ros/pluginlib-1.13.0
new file mode 100644
index 000000000000..7b0f6ad4cce8
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pluginlib-1.13.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for writing and dynamically loading plugins using the ROS infrastructure
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros/pluginlib/archive/1.13.0.tar.gz -> pluginlib-1.13.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d3353f417a7212c38f0f0d6596bd7f3
diff --git a/metadata/md5-cache/dev-ros/pluginlib-9999 b/metadata/md5-cache/dev-ros/pluginlib-9999
index 0bb7705eae2e..9ed1e8b3866c 100644
--- a/metadata/md5-cache/dev-ros/pluginlib-9999
+++ b/metadata/md5-cache/dev-ros/pluginlib-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides tools for writing and dynamically loading plugins using the ROS build infrastructure
-EAPI=5
+DEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-libs/boost:= dev-libs/tinyxml2:= test? ( dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for writing and dynamically loading plugins using the ROS infrastructure
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pluginlib https://github.com/ros/pluginlib
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=>=dev-ros/class_loader-0.3.5:= dev-ros/rosconsole dev-ros/roslib[python_
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1cae04bce33952a4127d6dd854856da8
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=9d3353f417a7212c38f0f0d6596bd7f3
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1
deleted file mode 100644
index 37161a70eeda..000000000000
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/pointcloud_to_laserscan/archive/1.4.0.tar.gz -> pointcloud_to_laserscan-1.4.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3aaa9ed4630449ed87ce22d7ab6e06cd
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
new file mode 100644
index 000000000000..f7ae3505e97d
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/pointcloud_to_laserscan/archive/1.4.1.tar.gz -> pointcloud_to_laserscan-1.4.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f2388eefb2c335e8a3e6d5953335c3ec
diff --git a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999 b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
index 0f2824387574..0ecfaacab50e 100644
--- a/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+++ b/metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
@@ -1,14 +1,15 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= dev-ros/sensor_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Converts a 3D Point Cloud into a 2D laser scan
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pointcloud_to_laserscan https://github.com/ros-perception/pointcloud_to_laserscan
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/message_filters dev-ros/nodelet dev-ros/roscpp dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_sensor_msgs dev-libs/boost:= dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3aaa9ed4630449ed87ce22d7ab6e06cd
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=f2388eefb2c335e8a3e6d5953335c3ec
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.12 b/metadata/md5-cache/dev-ros/polled_camera-1.11.12
deleted file mode 100644
index 688f68b7aed5..000000000000
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.12
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.12.tar.gz -> image_common-1.11.12.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a0ea2c5cc276c78d26a9b0cb08473e0
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.11.13 b/metadata/md5-cache/dev-ros/polled_camera-1.11.13
deleted file mode 100644
index b94c40c01303..000000000000
--- a/metadata/md5-cache/dev-ros/polled_camera-1.11.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.13.tar.gz -> image_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a0ea2c5cc276c78d26a9b0cb08473e0
diff --git a/metadata/md5-cache/dev-ros/polled_camera-1.12.0 b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
new file mode 100644
index 000000000000..a091691b0928
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/polled_camera-1.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=C++ classes for implementing a polled camera driver node
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/polled_camera-9999 b/metadata/md5-cache/dev-ros/polled_camera-9999
index e96eeecf080d..96e4c9706eb5 100644
--- a/metadata/md5-cache/dev-ros/polled_camera-9999
+++ b/metadata/md5-cache/dev-ros/polled_camera-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=C++ helper classes for implementing a polled camera driver node and requesting images from it
-EAPI=5
+DEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=C++ classes for implementing a polled camera driver node
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/polled_camera https://github.com/ros-perception/image_common
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/roscpp dev-ros/image_transport dev-ros/rosconsole python_targets
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0a0ea2c5cc276c78d26a9b0cb08473e0
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ba00563b065b6bd9a349548328e02267
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
deleted file mode 100644
index 82cb50e36fa0..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
deleted file mode 100644
index c7bbd3b5af07..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
deleted file mode 100644
index 8c2dcc651dff..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
deleted file mode 100644
index 5b6f84f24996..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
deleted file mode 100644
index 39bc422a6447..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
deleted file mode 100644
index 86f2fa3e4d51..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
deleted file mode 100644
index 418a17269fd5..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc9605e47fb2e2f047e0df2958b80bd6
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2
deleted file mode 100644
index 71f45da0bdc1..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=dc9605e47fb2e2f047e0df2958b80bd6
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3
deleted file mode 100644
index 9ca24b26866c..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=fff9c38e2aa41ac9c3d90ed693d19bd0
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
index 2c7a73c1bde8..febadb3d1584 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5ad412319fe00f2a38c78d2b3601abef
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c05b8d5be8f060e9154f453c3431e63
diff --git a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999 b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
index 56bb69d7e636..04ff69b3da9d 100644
--- a/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+++ b/metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/pr2_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Aggregates all of the topics that a 'pr2_dashboard' app might be interested in
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_dashboard_aggregator https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=61a317b776b3f153d86250e50baed06e
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=7c05b8d5be8f060e9154f453c3431e63
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.0 b/metadata/md5-cache/dev-ros/pr2_description-1.12.0
deleted file mode 100644
index 2162b6fafdaa..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6bc9dc98e95448a69c9387ece4edc067
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.1 b/metadata/md5-cache/dev-ros/pr2_description-1.12.1
deleted file mode 100644
index 600bed270925..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9a38f2cf273cf4553b1c97c90da1e66
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.2 b/metadata/md5-cache/dev-ros/pr2_description-1.12.2
deleted file mode 100644
index 4ebd0750cfa6..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f9a38f2cf273cf4553b1c97c90da1e66
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.3 b/metadata/md5-cache/dev-ros/pr2_description-1.12.3
deleted file mode 100644
index f7d851bc369a..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1f1539c9d5a6c526b537295d1c09156
diff --git a/metadata/md5-cache/dev-ros/pr2_description-1.12.4 b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
index 8a5ff692d9b6..63fd5e6abac0 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_description-1.12.4
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=bdf8201b4afc3fe31688b34f0da72f8a
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7a2c9ae5ef4a842bd2dda2e238c0622
diff --git a/metadata/md5-cache/dev-ros/pr2_description-9999 b/metadata/md5-cache/dev-ros/pr2_description-9999
index 51b830fe8816..109d1e6e45b1 100644
--- a/metadata/md5-cache/dev-ros/pr2_description-9999
+++ b/metadata/md5-cache/dev-ros/pr2_description-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/convex_decomposition dev-ros/ivcon test? ( dev-libs/urdfdom dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Description (mechanical, kinematic, visual, etc.) of the PR2 robot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_description https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/xacro[python_targets_python3_6(-)?,-python_single_target_python3
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f1f1539c9d5a6c526b537295d1c09156
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=d7a2c9ae5ef4a842bd2dda2e238c0622
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.10 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
deleted file mode 100644
index a8a8ad5b0e1a..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.11 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
deleted file mode 100644
index fbb0b7d629fc..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.13 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
deleted file mode 100644
index 25fb840a89df..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.14 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
deleted file mode 100644
index 59ffc823d7e2..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.11.9 b/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
deleted file mode 100644
index 57734f00f6cf..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.0 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
deleted file mode 100644
index 8698e90d4ce8..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.1 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
deleted file mode 100644
index af49ee4a00e9..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fff3957bb7bdf1d38c2c3caa1720665
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.2 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.2
deleted file mode 100644
index 381becbb18db..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3fff3957bb7bdf1d38c2c3caa1720665
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.3 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.3
deleted file mode 100644
index 78d403901802..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=158671eb296799567fbad622edc58d2f
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4 b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
index 9ef5029bd525..9765b1de94c6 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_machine-1.12.4
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=85b2fd0252f07ba19f84b65930f278c6
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_machine-9999 b/metadata/md5-cache/dev-ros/pr2_machine-9999
index 86f98de8d37d..37aaef033239 100644
--- a/metadata/md5-cache/dev-ros/pr2_machine-9999
+++ b/metadata/md5-cache/dev-ros/pr2_machine-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=xxx.machine files that describe the different hosts a node can be spawned on
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_machine https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=cd34aa75928710a6e973ec4da579a980
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bc7c9c14387f513127a44722aa874613
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
deleted file mode 100644
index 7fb8c95081ff..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c272ccf165b4e2665ca5ee09ca947aa9
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
deleted file mode 100644
index 2ff6f77fbe77..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c272ccf165b4e2665ca5ee09ca947aa9
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2
deleted file mode 100644
index d180d616d4e9..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c272ccf165b4e2665ca5ee09ca947aa9
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.3 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.3
deleted file mode 100644
index 89c7fd650330..000000000000
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c272ccf165b4e2665ca5ee09ca947aa9
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4 b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
index 3e2d3635fc4d..a5d5349e4006 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
-EAPI=5
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages for representing PR2 state
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c272ccf165b4e2665ca5ee09ca947aa9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/pr2_msgs-9999 b/metadata/md5-cache/dev-ros/pr2_msgs-9999
index 1d0c7a8d3023..ba0fbc415c08 100644
--- a/metadata/md5-cache/dev-ros/pr2_msgs-9999
+++ b/metadata/md5-cache/dev-ros/pr2_msgs-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
-DESCRIPTION=Messages for representing PR2 state, such as battery information and the PR2 fingertip sensors
-EAPI=5
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] )
+DESCRIPTION=Messages for representing PR2 state
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_msgs https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c272ccf165b4e2665ca5ee09ca947aa9
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=bd4a603c018bbf01381945ef6ffad0a7
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
deleted file mode 100644
index 893c3c81cb9a..000000000000
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.4.tar.gz -> python_qt_binding-0.3.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5e79cc5a1959a570d341676ddb4a79e
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1 b/metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1
deleted file mode 100644
index ca2e57040751..000000000000
--- a/metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.3.5.tar.gz -> python_qt_binding-0.3.5.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6a33d9c247f32fcfd486662ddc36bc12
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3 b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3
new file mode 100644
index 000000000000..cc652db3feab
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-0.4.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/python_qt_binding/archive/0.4.3.tar.gz -> python_qt_binding-0.4.3.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=14f113e6532515a4eb784a9e11f9a0c3
diff --git a/metadata/md5-cache/dev-ros/python_qt_binding-9999 b/metadata/md5-cache/dev-ros/python_qt_binding-9999
index b67318fe096f..79e6b1bbbaf9 100644
--- a/metadata/md5-cache/dev-ros/python_qt_binding-9999
+++ b/metadata/md5-cache/dev-ros/python_qt_binding-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Infrastructure for an integrated graphical user interface based on Qt
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/python_qt_binding https://github.com/ros-visualization/python_qt_binding
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-python/PyQt5[gui,widgets,python_targets_python3_6(-)?,-python_single
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=f5e79cc5a1959a570d341676ddb4a79e
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=14f113e6532515a4eb784a9e11f9a0c3
diff --git a/metadata/md5-cache/dev-ros/rviz-1.13.6-r1 b/metadata/md5-cache/dev-ros/rviz-1.13.6-r1
deleted file mode 100644
index 33a8376bf0fd..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.13.6-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python3_6 test test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.13.6.tar.gz -> rviz-1.13.6.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=21afa4a3367e183df4529a1e6298b12c
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.0 b/metadata/md5-cache/dev-ros/rviz-1.14.0
deleted file mode 100644
index 72c327bface6..000000000000
--- a/metadata/md5-cache/dev-ros/rviz-1.14.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=3D visualization tool for ROS
-EAPI=7
-HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python3_6 test test
-LICENSE=BSD
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.0.tar.gz -> rviz-1.14.0.tar.gz
-_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eafe9dd39d8a622bf727f731a84566e8
diff --git a/metadata/md5-cache/dev-ros/rviz-1.14.1 b/metadata/md5-cache/dev-ros/rviz-1.14.1
new file mode 100644
index 000000000000..4880d3369388
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/rviz-1.14.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-ros/cmake_modules virtual/pkgconfig sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=3D visualization tool for ROS
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-visualization/rviz/archive/1.14.1.tar.gz -> rviz-1.14.1.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=6b341a7fdbedb155820a5b311fb4c78b
diff --git a/metadata/md5-cache/dev-ros/rviz-9999 b/metadata/md5-cache/dev-ros/rviz-9999
index 35666973f7ea..89a91c3cca10 100644
--- a/metadata/md5-cache/dev-ros/rviz-9999
+++ b/metadata/md5-cache/dev-ros/rviz-9999
@@ -1,15 +1,15 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+BDEPEND=dev-ros/cmake_modules virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl] sys-devel/make dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/cmake_modules virtual/pkgconfig test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-cpp/gtest ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=3D visualization tool for ROS
 EAPI=7
 HOMEPAGE=https://wiki.ros.org/rviz https://github.com/ros-visualization/rviz
-IUSE=python_targets_python3_6 test test
+IUSE=python_targets_python3_6 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs test
 LICENSE=BSD
 PROPERTIES=live
-RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/map_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-libs/boost:=[threads] media-libs/assimp <dev-games/ogre-1.10:=[-double-precision] virtual/opengl dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtopengl:5 dev-cpp/eigen:3 dev-cpp/yaml-cpp:= dev-libs/urdfdom:= dev-libs/tinyxml2:= dev-ros/angles dev-ros/image_geometry dev-ros/image_transport dev-ros/interactive_markers dev-ros/laser_geometry dev-ros/message_filters dev-ros/pluginlib >=dev-ros/python_qt_binding-0.3.0[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/resource_retriever dev-ros/rosbag[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rosconsole dev-libs/console_bridge:= dev-ros/roscpp dev-ros/roslib[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/rospy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/tf dev-ros/urdf dev-ros/media_export dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/nav_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-ros/sensor_msgs[ros_messages_python(-),python_targets_python3_6(-)?,-python_single_target_python3_6(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=eafe9dd39d8a622bf727f731a84566e8
+_md5_=6b341a7fdbedb155820a5b311fb4c78b
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 0109dbbfd689..d00e3b4109b4 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/jwt-2.2.1 b/metadata/md5-cache/dev-ruby/jwt-2.2.1
index 0506a00d58e9..6cea343b2fba 100644
--- a/metadata/md5-cache/dev-ruby/jwt-2.2.1
+++ b/metadata/md5-cache/dev-ruby/jwt-2.2.1
@@ -4,7 +4,7 @@ DESCRIPTION=A Ruby implementation of JSON Web Token draft 06
 EAPI=6
 HOMEPAGE=https://github.com/jwt/ruby-jwt
 IUSE=ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby25 ruby_targets_ruby26 ruby_targets_ruby27 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/jwt/ruby-jwt/archive/v2.2.1.tar.gz -> jwt-2.2.1.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8c8b8eebf9e4cdd73588968f2f126509
+_md5_=a033c3af61613da6cb02318f8212a00a
diff --git a/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1 b/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
index baccf608e2db..5ce8fa1798c9 100644
--- a/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
+++ b/metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=Ruby toolkit for the Github API
 EAPI=7
 HOMEPAGE=https://github.com/octokit/octokit.rb
 IUSE=test ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 doc test test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby24? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby24(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby25(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( >=dev-ruby/faraday-0.9[ruby_targets_ruby26(-)] =dev-ruby/sawyer-0.8*[ruby_targets_ruby26(-)] ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby26? ( dev-lang/ruby:2.6 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24(-)] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25(-)] ) ruby_targets_ruby26? ( virtual/rubygems[ruby_targets_ruby26(-)] )
 REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 ruby_targets_ruby26 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/octokit/octokit.rb/archive/v4.18.0.tar.gz -> octokit-4.18.0.tar.gz
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	ruby-fakegem	6ee14a23a169409059ed36d4dddc3197	ruby-ng	a1c89995f9f6dd045e93d13a92ca81a9	ruby-utils	cdb4c1e4283adb7707b7dd48ccaa7ad2	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ce75cb736ae8ad5a3b20b9a57ca6a88
+_md5_=0b43e0439b81cb62f048b2dc8dcf4881
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 4818d83d7c98..48145c48cd98 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/conan-1.26.1 b/metadata/md5-cache/dev-util/conan-1.26.1
new file mode 100644
index 000000000000..45287355f9b3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/conan-1.26.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/bottle-0.12.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/colorama-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/deprecation-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/future-0.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/node-semver-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/patch-ng-1.17.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pluginbase-0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tqdm-4.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nose-1.3.7-r4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-lang/go dev-vcs/git dev-vcs/subversion >=dev-python/mock-1.3.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/nose-1.3.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/parameterized-0.6.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/webtest-2.0.18[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-util/cmake )
+DESCRIPTION=Distributed C/C++ package manager
+EAPI=7
+HOMEPAGE=https://conan.io/
+IUSE=test python_targets_python3_6 python_targets_python3_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/bottle-0.12.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/colorama-0.3.3[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/deprecation-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/distro-1.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/fasteners-0.14.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/future-0.16.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/jinja-2.10.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/node-semver-0.6.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/patch-ng-1.17.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pluginbase-0.5[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pygments-2.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyjwt-1.4[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/python-dateutil-2.7.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/pyyaml-5.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/requests-2.8.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/six-1.12.0[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/tqdm-4.28.1[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] python_targets_python3_6? ( dev-lang/python:3.6[sqlite] ) python_targets_python3_7? ( dev-lang/python:3.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)] >=dev-python/setuptools-42.0.2[python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/conan-io/conan/archive/1.26.1.tar.gz -> conan-1.26.1.tar.gz
+_eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=9f53aa97e90608002fa3452fcb420a54
diff --git a/metadata/md5-cache/dev-util/idea-community-2020.1.3.201.8538.31 b/metadata/md5-cache/dev-util/idea-community-2020.1.3.201.8538.31
index adde0954d93d..8e5892fc56a1 100644
--- a/metadata/md5-cache/dev-util/idea-community-2020.1.3.201.8538.31
+++ b/metadata/md5-cache/dev-util/idea-community-2020.1.3.201.8538.31
@@ -5,7 +5,7 @@ DESCRIPTION=A complete toolset for web, mobile and enterprise development
 EAPI=7
 HOMEPAGE=https://www.jetbrains.com/idea
 IUSE=+jbr8 -jbr11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 jbr8? ( GPL-2 ) jbr11? ( GPL-2 ) GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
 RDEPEND=!dev-util/idea-community:14 !dev-util/idea-community:15 >=virtual/jdk-1.7:* dev-java/jansi-native dev-libs/libdbusmenu =dev-util/lldb-9*
 REQUIRED_USE=jbr8? ( !jbr11 )
@@ -13,4 +13,4 @@ RESTRICT=splitdebug
 SLOT=0
 SRC_URI=https://download.jetbrains.com/idea/ideaIC-2020.1.3-no-jbr.tar.gz -> ideaIC-1.3.201.8538.31.tar.gz jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-i586-b1483.37.tar.gz -> jbrx-8u202-linux-i586-b1483.37.tar.gz ) amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-8u202-linux-x64-b1483.37.tar.gz -> jbrx-8u202-linux-x64-b1483.37.tar.gz ) ) jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-11_0_2-linux-x64-b164.tar.gz -> jbr-11_0_2-linux-x64-b164.tar.gz ) )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5
-_md5_=b146a539c7c99b9e38906313366b1b40
+_md5_=05442bd3ae88bffa45105c0c809d4f93
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1 b/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
index 73a07f3a5faf..dae276374a00 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
@@ -4,7 +4,7 @@ DESCRIPTION=pkgcore-based QA utility for ebuild repos
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD
 RDEPEND=>=dev-python/snakeoil-0.8.8[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=sys-apps/pkgcore-0.10.11[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/chardet[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/pathspec[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.7.6.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c711816ef204cff558f9caef2127fa1b
+_md5_=926fc5fe77e7ba394e4fb05aedfbb259
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index c931a603c8a2..c7f926c4ff4e 100644
Binary files a/metadata/md5-cache/gnome-base/Manifest.gz and b/metadata/md5-cache/gnome-base/Manifest.gz differ
diff --git a/metadata/md5-cache/gnome-base/gnome-shell-3.36.4-r2 b/metadata/md5-cache/gnome-base/gnome-shell-3.36.4-r2
new file mode 100644
index 000000000000..4b7f537590f7
--- /dev/null
+++ b/metadata/md5-cache/gnome-base/gnome-shell-3.36.4-r2
@@ -0,0 +1,17 @@
+BDEPEND=dev-lang/sassc dev-libs/libxslt app-text/asciidoc >=dev-util/gdbus-codegen-2.45.3 dev-util/glib-utils gtk-doc? ( >=dev-util/gtk-doc-1.17 app-text/docbook-xml-dtd:4.3 ) >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.63.2 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.36.0:0/6[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) media-libs/mesa[X(+)] dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Provides core UI functions for the GNOME 3 desktop
+EAPI=7
+HOMEPAGE=https://wiki.gnome.org/Projects/GnomeShell
+IUSE=+bluetooth +browser-extension elogind gtk-doc +ibus +networkmanager systemd telepathy python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 test
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+PDEPEND=>=gnome-base/gdm-3.5[introspection] >=gnome-base/gnome-control-center-3.26[bluetooth(+)?,networkmanager(+)?] browser-extension? ( gnome-extra/chrome-gnome-shell )
+RDEPEND=>=gnome-extra/evolution-data-server-3.33.1:= >=app-crypt/gcr-3.7.5[introspection] >=dev-libs/glib-2.57.2:2 >=dev-libs/gobject-introspection-1.49.1:= >=dev-libs/gjs-1.63.2 >=x11-libs/gtk+-3.15.0:3[introspection] >=x11-wm/mutter-3.36.0:0/6[introspection] >=sys-auth/polkit-0.100[introspection] >=gnome-base/gsettings-desktop-schemas-3.33.1 >=x11-libs/startup-notification-0.11 >=app-i18n/ibus-1.5.2 >=gnome-base/gnome-desktop-3.35.90:3=[introspection] bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] ) >=media-libs/gstreamer-0.11.92:1.0 media-libs/gst-plugins-base:1.0 networkmanager? ( >=net-misc/networkmanager-1.10.4:=[introspection] net-libs/libnma[introspection] >=app-crypt/libsecret-0.18 dev-libs/dbus-glib ) systemd? ( >=sys-apps/systemd-31 >=gnome-base/gnome-desktop-3.34.2:3=[systemd] ) elogind? ( >=sys-auth/elogind-237 ) app-arch/gnome-autoar dev-libs/json-glib >=app-accessibility/at-spi2-atk-2.5.3 x11-libs/gdk-pixbuf:2[introspection] dev-libs/libxml2:2 x11-libs/libX11 >=media-sound/pulseaudio-2[glib] >=dev-libs/atk-2[introspection] dev-libs/libical:= >=x11-libs/libXfixes-5.0 python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) media-libs/mesa[X(+)] >=sys-apps/accountsservice-0.6.14[introspection] app-accessibility/at-spi2-core:2[introspection] app-misc/geoclue[introspection] >=dev-libs/libgweather-3.26:2[introspection] >=sys-power/upower-0.99:=[introspection] x11-libs/pango[introspection] gnome-base/librsvg:2[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-3.8.3 x11-misc/xdg-utils >=x11-themes/adwaita-icon-theme-3.26 networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) ibus? ( >=app-i18n/ibus-1.4.99[dconf(+),gtk,introspection] ) telepathy? ( >=net-im/telepathy-logger-0.2.4[introspection] >=net-libs/telepathy-glib-0.19[introspection] ) media-fonts/cantarell
+REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ?? ( elogind systemd )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-shell/3.36/gnome-shell-3.36.4.tar.xz https://dev.gentoo.org/~leio/distfiles/gnome-shell-3.36.4-r2-patchset.tar.xz
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=405aa608049eea99c0f449ebed85ad8d
diff --git a/metadata/md5-cache/gui-apps/Manifest.gz b/metadata/md5-cache/gui-apps/Manifest.gz
index beb5637db445..60fd29455d87 100644
Binary files a/metadata/md5-cache/gui-apps/Manifest.gz and b/metadata/md5-cache/gui-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-apps/grim-1.3.0 b/metadata/md5-cache/gui-apps/grim-1.3.0
new file mode 100644
index 000000000000..a0e7904d8234
--- /dev/null
+++ b/metadata/md5-cache/gui-apps/grim-1.3.0
@@ -0,0 +1,14 @@
+BDEPEND=man? ( app-text/scdoc ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland jpeg? ( virtual/jpeg ) x11-libs/cairo
+DESCRIPTION=Grab images from a Wayland compositor.
+EAPI=7
+HOMEPAGE=https://github.com/emersion/grim
+IUSE=+man jpeg
+KEYWORDS=~amd64 ~arm64
+LICENSE=MIT
+RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland jpeg? ( virtual/jpeg ) x11-libs/cairo
+SLOT=0
+SRC_URI=https://github.com/emersion/grim/archive/v1.3.0.tar.gz -> grim-1.3.0.tar.gz
+_eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=e260fcc2e9134410f4d8a87aaaa3ee72
diff --git a/metadata/md5-cache/gui-apps/slurp-9999 b/metadata/md5-cache/gui-apps/slurp-9999
index 6d92539e0369..e7e8d558d105 100644
--- a/metadata/md5-cache/gui-apps/slurp-9999
+++ b/metadata/md5-cache/gui-apps/slurp-9999
@@ -1,13 +1,13 @@
 BDEPEND=man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo
+DEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo x11-libs/libxcb
 DESCRIPTION=Select a region in a Wayland compositor and print it to the standard output.
 EAPI=7
 HOMEPAGE=https://github.com/emersion/slurp
 IUSE=+man
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo
+RDEPEND=>=dev-libs/wayland-protocols-1.14 dev-libs/wayland x11-libs/cairo x11-libs/libxcb
 SLOT=0
 _eclasses_=git-r3	8ec5b53812bce105ae7943930e4660f8	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4226ad4345f556b1f37e69131061997c
+_md5_=e71d3848ce6cb42af39f0daca33fb2a7
diff --git a/metadata/md5-cache/gui-libs/Manifest.gz b/metadata/md5-cache/gui-libs/Manifest.gz
index f3672989e51f..2b26c0816a10 100644
Binary files a/metadata/md5-cache/gui-libs/Manifest.gz and b/metadata/md5-cache/gui-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-libs/wlroots-0.11.0 b/metadata/md5-cache/gui-libs/wlroots-0.11.0
new file mode 100644
index 000000000000..9409ff3b74a3
--- /dev/null
+++ b/metadata/md5-cache/gui-libs/wlroots-0.11.0
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-libs/wayland-protocols-1.17 >=dev-util/meson-0.54.0 virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+DEFINED_PHASES=compile configure install postinst test
+DEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
+DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
+EAPI=7
+HOMEPAGE=https://github.com/swaywm/wlroots
+IUSE=elogind icccm systemd x11-backend X +filecaps
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image ) filecaps? ( sys-libs/libcap )
+REQUIRED_USE=?? ( elogind systemd )
+SLOT=0/9999
+SRC_URI=https://github.com/swaywm/wlroots/archive/0.11.0.tar.gz -> wlroots-0.11.0.tar.gz
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=1dfeb9085351a73c335b09b02dd2c29b
diff --git a/metadata/md5-cache/gui-libs/wlroots-9999 b/metadata/md5-cache/gui-libs/wlroots-9999
index 50e7d4c9dd30..ea31f78ff4ca 100644
--- a/metadata/md5-cache/gui-libs/wlroots-9999
+++ b/metadata/md5-cache/gui-libs/wlroots-9999
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-libs/wayland-protocols-1.17 >=dev-util/meson-0.54.0 virtual/pkgconfig filecaps? ( sys-libs/libcap ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst test unpack
-DEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
+DEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image )
 DESCRIPTION=Pluggable, composable, unopinionated modules for building a Wayland compositor
 EAPI=7
 HOMEPAGE=https://github.com/swaywm/wlroots
 IUSE=elogind icccm systemd x11-backend X +filecaps
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image ) filecaps? ( sys-libs/libcap )
+RDEPEND=>=dev-libs/libinput-1.9.0:0= >=dev-libs/wayland-1.18.0 >=dev-libs/wayland-protocols-1.17.0 media-libs/mesa[egl,gles2,gbm] virtual/libudev x11-libs/libdrm x11-libs/libxkbcommon x11-libs/pixman elogind? ( >=sys-auth/elogind-237 ) icccm? ( x11-libs/xcb-util-wm ) systemd? ( >=sys-apps/systemd-237 ) x11-backend? ( x11-libs/libxcb:0= ) X? ( x11-base/xorg-server[wayland] x11-libs/libxcb:0= x11-libs/xcb-util-image ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=?? ( elogind systemd )
 SLOT=0/9999
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	8ec5b53812bce105ae7943930e4660f8	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1b77c4671e48e53e9f44936fd987dd33
+_md5_=1dfeb9085351a73c335b09b02dd2c29b
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 71f3c6259c94..0493d7ee8a04 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/sway-1.5_rc1 b/metadata/md5-cache/gui-wm/sway-1.5
similarity index 73%
rename from metadata/md5-cache/gui-wm/sway-1.5_rc1
rename to metadata/md5-cache/gui-wm/sway-1.5
index e5f5c0d9b4bc..1c28b16ca30c 100644
--- a/metadata/md5-cache/gui-wm/sway-1.5_rc1
+++ b/metadata/md5-cache/gui-wm/sway-1.5
@@ -1,14 +1,15 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
+BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( >=app-text/scdoc-1.9.3 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2
 DEFINED_PHASES=compile configure install postinst preinst prepare test
-DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=] <gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=7
 HOMEPAGE=https://swaywm.org
 IUSE=elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
+RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) >=gui-libs/wlroots-0.11.0:=[elogind=,systemd=,X=] <gui-libs/wlroots-0.12.0:=[elogind=,systemd=,X=]
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/1.5-rc1.tar.gz -> sway-1.5_rc1.tar.gz
+SRC_URI=https://github.com/swaywm/sway/archive/1.5.tar.gz -> sway-1.5.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d82c68f69d80711f379628e77899809
+_md5_=0bd13f0565715939e79828bea5075297
diff --git a/metadata/md5-cache/gui-wm/sway-9999 b/metadata/md5-cache/gui-wm/sway-9999
index 35bb1b96a179..1295f2eaa517 100644
--- a/metadata/md5-cache/gui-wm/sway-9999
+++ b/metadata/md5-cache/gui-wm/sway-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-libs/wayland-protocols-1.14 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=dev-libs/wayland-protocols-1.14 >=dev-util/meson-0.53.0 virtual/pkgconfig man? ( ~app-text/scdoc-9999 ) >=dev-util/meson-0.54.0 >=dev-util/ninja-1.8.2 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
 DEPEND=>=dev-libs/json-c-0.13:0= >=dev-libs/libinput-1.6.0:0= dev-libs/libpcre dev-libs/wayland x11-libs/cairo x11-libs/libxkbcommon x11-libs/pango x11-libs/pixman media-libs/mesa[gles2,libglvnd] elogind? ( >=sys-auth/elogind-239 ) swaybar? ( x11-libs/gdk-pixbuf:2 ) swaybg? ( gui-apps/swaybg ) swayidle? ( gui-apps/swayidle ) swaylock? ( gui-apps/swaylock ) systemd? ( >=sys-apps/systemd-239 ) wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] ) X? ( x11-libs/libxcb:0= ) ~gui-libs/wlroots-9999:=[elogind=,systemd=,X=]
 DESCRIPTION=i3-compatible Wayland window manager
@@ -11,4 +11,4 @@ RDEPEND=x11-misc/xkeyboard-config >=dev-libs/json-c-0.13:0= >=dev-libs/libinput-
 REQUIRED_USE=?? ( elogind systemd ) tray? ( || ( elogind systemd ) )
 SLOT=0
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	8ec5b53812bce105ae7943930e4660f8	meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2b8e82102efff61875b552ac2787f008
+_md5_=0bd13f0565715939e79828bea5075297
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 89b1d4ae1894..4286251304da 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/flameshot-0.6.0 b/metadata/md5-cache/media-gfx/flameshot-0.6.0
index 3e863cc3469f..7c3e12f3da7c 100644
--- a/metadata/md5-cache/media-gfx/flameshot-0.6.0
+++ b/metadata/md5-cache/media-gfx/flameshot-0.6.0
@@ -1,3 +1,4 @@
+BDEPEND=dev-qt/linguist-tools:5
 DEFINED_PHASES=configure install postinst postrm prepare
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-qt/qtwidgets:5 dev-qt/qtsvg:5 dev-qt/qtnetwork:5 dev-qt/qtdbus:5 sys-apps/dbus
 DESCRIPTION=Powerful yet simple to use screenshot software
@@ -9,4 +10,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsingleapplication[qt5(+),X] dev-
 SLOT=0
 SRC_URI=https://github.com/lupoDharkael/flameshot/archive/v0.6.0.tar.gz -> flameshot-0.6.0.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=3e908c25e1f3f2a8532ab4dccff8d45c
+_md5_=fc4f41ff36b7398ec4c9746b0aff9326
diff --git a/metadata/md5-cache/media-gfx/gimp-2.10.18-r1 b/metadata/md5-cache/media-gfx/gimp-2.10.18-r1
index b1792e934630..111284f4f2e2 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.10.18-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.10.18-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=6
 HOMEPAGE=https://www.gimp.org/
 IUSE=aalib alsa aqua debug doc gnome heif jpeg2k mng openexr postscript python udev unwind vector-icons webp wmf xpm cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +python_single_target_python2_7 test
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 ~x86
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=app-text/poppler-0.50[cairo] >=app-text/poppler-data-0.4.7 >=dev-libs/atk-2.2.0 >=dev-libs/glib-2.56.0:2 >=dev-libs/json-glib-1.2.6 dev-libs/libxml2:2 dev-libs/libxslt >=gnome-base/librsvg-2.40.6:2 >=media-gfx/mypaint-brushes-1.3.0 >=media-libs/babl-0.1.74 >=media-libs/fontconfig-2.12.4 >=media-libs/freetype-2.1.7 >=media-libs/gegl-0.4.22:0.4[cairo] >=media-libs/gexiv2-0.10.6 >=media-libs/harfbuzz-0.9.19 >=media-libs/lcms-2.8:2 >=media-libs/libmypaint-1.3.0:= >=media-libs/libpng-1.6.25:0= >=media-libs/tiff-3.5.7:0 net-libs/glib-networking[ssl] sys-libs/zlib virtual/jpeg >=x11-libs/cairo-1.12.2 >=x11-libs/gdk-pixbuf-2.31:2 >=x11-libs/gtk+-2.24.32:2 x11-libs/libXcursor >=x11-libs/pango-1.29.4 aalib? ( media-libs/aalib ) alsa? ( >=media-libs/alsa-lib-1.0.0 ) aqua? ( >=x11-libs/gtk-mac-integration-2.0.0 ) heif? ( >=media-libs/libheif-1.3.2:= ) jpeg2k? ( >=media-libs/openjpeg-2.1.0:2= ) mng? ( media-libs/libmng:= ) openexr? ( >=media-libs/openexr-1.6.1:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 >=dev-lang/python-exec-2:=[python_targets_python2_7] ) python_single_target_python2_7? ( >=dev-python/pycairo-1.0.2[python_targets_python2_7(-)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)] ) ) udev? ( dev-libs/libgudev:= ) unwind? ( >=sys-libs/libunwind-1.1.0:= ) webp? ( >=media-libs/libwebp-0.6.0:= ) wmf? ( >=media-libs/libwmf-0.2.8 ) xpm? ( x11-libs/libXpm ) x11-themes/hicolor-icon-theme gnome? ( gnome-base/gvfs )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 ) )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gimp/v2.10/gimp-2.10.18.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome.org	532d56d07b9eace4831aaa817d2b756a	gnome2	2df69d3da6a26b1ca7cd81185f0599d6	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5f6a7e6bc0298bf87fcc5416e5e5d741
+_md5_=f507943eb9447d7c563bc66b1347f105
diff --git a/metadata/md5-cache/media-gfx/iscan-3.62.0 b/metadata/md5-cache/media-gfx/iscan-3.62.0
index 78062850ce09..55912910940e 100644
--- a/metadata/md5-cache/media-gfx/iscan-3.62.0
+++ b/metadata/md5-cache/media-gfx/iscan-3.62.0
@@ -11,4 +11,4 @@ RDEPEND=dev-libs/boost:= media-gfx/sane-backends media-libs/tiff virtual/jpeg vi
 SLOT=0
 SRC_URI=https://support.epson.net/linux/src/scanner/imagescanv3/common/imagescan_3.62.0.orig.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=48bb7df50e19b145938e722b2eb2313c
+_md5_=c3d66a23d4e0ec23a9b2a94afcad92fa
diff --git a/metadata/md5-cache/media-gfx/jhead-3.04 b/metadata/md5-cache/media-gfx/jhead-3.04
index 8c9ed6d224a8..5daa60bbe960 100644
--- a/metadata/md5-cache/media-gfx/jhead-3.04
+++ b/metadata/md5-cache/media-gfx/jhead-3.04
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=Exif Jpeg camera setting parser and thumbnail remover
 EAPI=7
 HOMEPAGE=http://www.sentex.net/~mwandel/jhead
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.sentex.net/~mwandel/jhead/jhead-3.04.tar.gz
-_md5_=fde0c59da9d83fb78006836e96ce42fd
+_md5_=8363dad881b647ed98830d570d6baf51
diff --git a/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1 b/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
index b2dbf580c509..eeac76ac7a00 100644
--- a/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
+++ b/metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
@@ -3,9 +3,9 @@ DEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16
 DESCRIPTION=Default MyPaint brushes
 EAPI=6
 HOMEPAGE=https://github.com/mypaint/mypaint-brushes
-KEYWORDS=~alpha amd64 arm64 ~hppa ~ia64 ppc64 x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc64 x86
 LICENSE=CC0-1.0
 SLOT=1.0
 SRC_URI=https://github.com/mypaint/mypaint-brushes/archive/v1.3.0.tar.gz -> mypaint-brushes-1.3.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=bf3289e6a35d85082309602fe4977195
+_md5_=78aeee1725e2ee995fd27157f9728aea
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f34c0c76928a..74cae407222f 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/bcg729-1.0.4-r1 b/metadata/md5-cache/media-libs/bcg729-1.0.4-r1
index 3535aa1d271f..b18148afca54 100644
--- a/metadata/md5-cache/media-libs/bcg729-1.0.4-r1
+++ b/metadata/md5-cache/media-libs/bcg729-1.0.4-r1
@@ -4,10 +4,10 @@ DESCRIPTION=encoder and decoder of the ITU G729 Annex A/B speech codec
 EAPI=7
 HOMEPAGE=https://github.com/BelledonneCommunications/bcg729
 IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 RDEPEND=!media-plugins/mediastreamer-bcg729
 SLOT=0
 SRC_URI=https://github.com/BelledonneCommunications/bcg729/archive/1.0.4.tar.gz -> bcg729-1.0.4.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=db7c5cd0c5b9aa43ed74cc83816e6c91
+_md5_=fa5e87b0aa8a6d379bf82413a57dc3f3
diff --git a/metadata/md5-cache/media-libs/liblo-0.31 b/metadata/md5-cache/media-libs/liblo-0.31
index b6ce2c47866d..9b9b982c571c 100644
--- a/metadata/md5-cache/media-libs/liblo-0.31
+++ b/metadata/md5-cache/media-libs/liblo-0.31
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight OSC (Open Sound Control) implementation
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/liblo/
 IUSE=doc ipv6 static-libs
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/liblo/liblo-0.31.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1ecf698f9daac4144431e60f17b66179
+_md5_=521ab3c9b82f785415410c49e95f5111
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 8d5772f99fe4..9baadfad80e1 100644
Binary files a/metadata/md5-cache/media-video/Manifest.gz and b/metadata/md5-cache/media-video/Manifest.gz differ
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.2.4 b/metadata/md5-cache/media-video/ffmpeg-4.2.4
index ad1b68d2f746..c0800b56acc3 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.2.4
+++ b/metadata/md5-cache/media-video/ffmpeg-4.2.4
@@ -5,7 +5,7 @@ DESCRIPTION=Complete solution to record/convert/stream audio and video. Includes
 EAPI=7
 HOMEPAGE=https://ffmpeg.org/
 IUSE=alsa chromium doc +encode oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl hardcoded-tables +iconv libressl libxml2 lzma +network opencl openssl +postproc samba sdl sdl vaapi vdpau X X X X +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio libdrm jack amr amr codec2 dav1d fdk jpeg2k bluray gme gsm libaribb24 mmal modplug opus libilbc librtmp ssh speex srt svg video_cards_nvidia vorbis vpx zvbi appkit bs2b chromaprint cuda flite frei0r fribidi fontconfig ladspa libass libtesseract lv2 truetype vidstab rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar libaom openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu cpu_flags_ppc_altivec cpu_flags_ppc_vsx cpu_flags_ppc_vsx2 cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) libaribb24? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) codec2? ( media-libs/codec2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dav1d? ( >=media-libs/dav1d-0.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( >=media-libs/kvazaar-1.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libdrm? ( x11-libs/libdrm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libtesseract? ( >=app-text/tesseract-4.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libxml2? ( dev-libs/libxml2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lv2? ( media-libs/lv2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/lilv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( virtual/opencl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[client,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) srt? ( >=net-libs/srt-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.0.18.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vidstab? ( >=media-libs/vidstab-1.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.7.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) postproc? ( !media-libs/libpostproc ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libressl? ( openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
 REQUIRED_USE=cuda? ( video_cards_nvidia ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) rubberband? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) libressl?
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.2.4.tar.bz2 https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-altivec.patch.gz https://dev.gentoo.org/~gyakovlev/distfiles/ffmpeg-4.2.2-ppc64-gcc.patch.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=aeb8eff1c88e535a531d82365e0b92a4
+_md5_=d535bbf49e6543c4fd8a3c0755f1b591
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index a002b17f2a7e..cea3928ef3ba 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1
deleted file mode 100644
index e4b5e6c05099..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.21.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=7
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IUSE=caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/archive/v1.21.1.tar.gz -> netdata-1.21.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=ccd96a5bc8519fc9572b1d389490639b
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1 b/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1
deleted file mode 100644
index 845c4b97f17a..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.22.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=7
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IUSE=caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/archive/v1.22.0.tar.gz -> netdata-1.22.0.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=070261960b3840458460e4d2cd23c73c
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1 b/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1
deleted file mode 100644
index 64770c867920..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.22.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=7
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IUSE=caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/archive/v1.22.1.tar.gz -> netdata-1.22.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=87d2dca0438a500f229045bb6ff05f52
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.23.1 b/metadata/md5-cache/net-analyzer/netdata-1.23.1
deleted file mode 100644
index 9566cc1049fd..000000000000
--- a/metadata/md5-cache/net-analyzer/netdata-1.23.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 filecaps? ( sys-libs/libcap ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) virtual/pkgconfig
-DESCRIPTION=Linux real time system monitoring, done right!
-EAPI=7
-HOMEPAGE=https://github.com/netdata/netdata https://my-netdata.io/
-IUSE=caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen +filecaps kernel_linux python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3+ MIT BSD
-RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
-REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
-SLOT=0
-SRC_URI=https://github.com/netdata/netdata/archive/v1.23.1.tar.gz -> netdata-1.23.1.tar.gz
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=87d2dca0438a500f229045bb6ff05f52
diff --git a/metadata/md5-cache/net-analyzer/netdata-1.23.0 b/metadata/md5-cache/net-analyzer/netdata-1.23.2
similarity index 98%
rename from metadata/md5-cache/net-analyzer/netdata-1.23.0
rename to metadata/md5-cache/net-analyzer/netdata-1.23.2
index 11278319933b..30d274106fc0 100644
--- a/metadata/md5-cache/net-analyzer/netdata-1.23.0
+++ b/metadata/md5-cache/net-analyzer/netdata-1.23.2
@@ -10,6 +10,6 @@ LICENSE=GPL-3+ MIT BSD
 RDEPEND=acct-group/netdata acct-user/netdata app-misc/jq >=app-shells/bash-4:0 || ( net-analyzer/openbsd-netcat net-analyzer/netcat ) net-misc/curl net-misc/wget sys-apps/util-linux virtual/awk caps? ( sys-libs/libcap ) cups? ( net-print/cups ) dbengine? ( app-arch/lz4 dev-libs/judy dev-libs/openssl:= ) dev-libs/libuv compression? ( sys-libs/zlib ) ipmi? ( sys-libs/freeipmi ) jsonc? ( dev-libs/json-c:= ) kinesis? ( dev-libs/aws-sdk-cpp[kinesis] ) mongodb? ( dev-libs/mongo-c-driver ) nfacct? ( net-firewall/nfacct net-libs/libmnl ) nodejs? ( net-libs/nodejs ) prometheus? ( dev-libs/protobuf:= app-arch/snappy ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) python_single_target_python3_6? ( dev-python/pyyaml[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pyyaml[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pyyaml[python_targets_python3_8(-)] ) mysql? ( || ( python_single_target_python3_6? ( dev-python/mysqlclient[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysqlclient[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysqlclient[python_targets_python3_8(-)] ) python_single_target_python3_6? ( dev-python/mysql-python[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/mysql-python[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/mysql-python[python_targets_python3_8(-)] ) ) ) postgres? ( python_single_target_python3_6? ( dev-python/psycopg:2[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/psycopg:2[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/psycopg:2[python_targets_python3_8(-)] ) ) tor? ( python_single_target_python3_6? ( net-libs/stem[python_targets_python3_6(-)] ) python_single_target_python3_7? ( net-libs/stem[python_targets_python3_7(-)] ) python_single_target_python3_8? ( net-libs/stem[python_targets_python3_8(-)] ) ) ) xen? ( app-emulation/xen-tools dev-libs/yajl ) filecaps? ( sys-libs/libcap )
 REQUIRED_USE=mysql? ( python ) python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) tor? ( python )
 SLOT=0
-SRC_URI=https://github.com/netdata/netdata/archive/v1.23.0.tar.gz -> netdata-1.23.0.tar.gz
+SRC_URI=https://github.com/netdata/netdata/archive/v1.23.2.tar.gz -> netdata-1.23.2.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	fcaps	da689a8e04bbbb3518888ff668fee45b	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=87d2dca0438a500f229045bb6ff05f52
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index b83cf4556a65..11efbb27daa8 100644
Binary files a/metadata/md5-cache/net-dns/Manifest.gz and b/metadata/md5-cache/net-dns/Manifest.gz differ
diff --git a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.44 b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.44
index 8ff5f9f95bc3..d06378e1e3a9 100644
--- a/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.44
+++ b/metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.44
@@ -4,11 +4,11 @@ DESCRIPTION=A flexible DNS proxy, with support for encrypted DNS protocols
 EAPI=7
 HOMEPAGE=https://github.com/DNSCrypt/dnscrypt-proxy
 IUSE=pie +filecaps
-KEYWORDS=~amd64 arm ~arm64 ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ~ppc64 ~x86
 LICENSE=Apache-2.0 BSD ISC MIT MPL-2.0
 RDEPEND=acct-group/dnscrypt-proxy acct-user/dnscrypt-proxy filecaps? ( sys-libs/libcap )
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/DNSCrypt/dnscrypt-proxy/archive/2.0.44.tar.gz -> dnscrypt-proxy-2.0.44.tar.gz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=1c30f285d8ee68a733d23ef6979cb765
+_md5_=5e582da11ae65d9eb93537b32418bc38
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index f1ece825c369..086c56111663 100644
Binary files a/metadata/md5-cache/net-fs/Manifest.gz and b/metadata/md5-cache/net-fs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-fs/samba-4.11.11 b/metadata/md5-cache/net-fs/samba-4.11.11
index d6b89fe4b4cd..7951cbdbe434 100644
--- a/metadata/md5-cache/net-fs/samba-4.11.11
+++ b/metadata/md5-cache/net-fs/samba-4.11.11
@@ -4,7 +4,7 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux snapper syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=net-libs/gnutls-3.2.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.0.12[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.1.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.2.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
 REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.11.11.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=3c980c920d694b857cc02c8159e16b67
+_md5_=59f1e3362c0757fc3e24b0f53b375f93
diff --git a/metadata/md5-cache/net-fs/samba-4.12.4 b/metadata/md5-cache/net-fs/samba-4.12.4
index b2f0926a0e68..a85dd275fc09 100644
--- a/metadata/md5-cache/net-fs/samba-4.12.4
+++ b/metadata/md5-cache/net-fs/samba-4.12.4
@@ -4,7 +4,7 @@ DESCRIPTION=Samba Suite Version 4
 EAPI=6
 HOMEPAGE=https://www.samba.org/
 IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gpg iprint json ldap pam profiling-data python quota selinux snapper syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-3
 RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libtasn1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-perl/Parse-Yapp >=net-libs/gnutls-3.4.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/libnsl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/e2fsprogs-libs[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-2.1.4[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] <sys-libs/ldb-2.2.0[ldap(+)?,python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/liburing[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/ncurses:0= sys-libs/readline:0= >=sys-libs/talloc-2.3.1[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.3[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.2[python?,python_single_target_python3_6(-)?,python_single_target_python3_7(-)?,python_single_target_python3_8(-)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( sys-libs/pam ) acl? ( virtual/acl ) python_single_target_python3_6? ( dev-python/subunit[python_targets_python3_6(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_6(-)] ) ) python_single_target_python3_7? ( dev-python/subunit[python_targets_python3_7(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_7(-)] ) ) python_single_target_python3_8? ( dev-python/subunit[python_targets_python3_8(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python3_8(-)] ) ) ceph? ( sys-cluster/ceph ) cluster? ( net-libs/rpcsvc-proto !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gpg? ( app-crypt/gpgme ) json? ( dev-libs/jansson ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snapper? ( sys-apps/dbus ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) zeroconf? ( net-dns/avahi ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+),xml(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba )
 REQUIRED_USE=addc? ( python json winbind ) addns? ( python ) ads? ( acl ldap winbind ) cluster? ( ads ) gpg? ( addc ) test? ( python ) ?? ( system-heimdal system-mitkrb5 ) ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.12.4.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	pam	a1771fc1e5831c201eaf18451747d94b	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=2a7a3944a3dc385d1664c01a944586a3
+_md5_=2d7b107bbc941b074f19bcf3df6fd96b
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 47f05930d6e9..ae50e3c5c24c 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libcrafter-1.0 b/metadata/md5-cache/net-libs/libcrafter-1.0
new file mode 100644
index 000000000000..fea330eb3388
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libcrafter-1.0
@@ -0,0 +1,14 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=A high level C++ network packet sniffing and crafting library
+EAPI=7
+HOMEPAGE=https://github.com/pellegre/libcrafter
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=https://github.com/pellegre/libcrafter/archive/version-1.0.tar.gz -> libcrafter-1.0.tar.gz
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=a89d2b3cf25f93ef537a2a7bbccbd6f5
diff --git a/metadata/md5-cache/net-libs/libcrafter-9999 b/metadata/md5-cache/net-libs/libcrafter-9999
index 3576e5fa948c..373a0d805639 100644
--- a/metadata/md5-cache/net-libs/libcrafter-9999
+++ b/metadata/md5-cache/net-libs/libcrafter-9999
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=net-libs/libpcap >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=a high level library for C++ designed to make easier the creation and decoding of network packets
-EAPI=5
+DEPEND=net-libs/libpcap
+DESCRIPTION=A high level C++ network packet sniffing and crafting library
+EAPI=7
 HOMEPAGE=https://github.com/pellegre/libcrafter
 IUSE=static-libs
 LICENSE=BSD
 PROPERTIES=live
 RDEPEND=net-libs/libpcap
 SLOT=0
-_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=676bb6c6092627d6a904562e0a785fb7
+_eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	git-r3	8ec5b53812bce105ae7943930e4660f8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=2ddc1c5827db633371f36b482877b9f0
diff --git a/metadata/md5-cache/net-libs/libpri-1.6.0 b/metadata/md5-cache/net-libs/libpri-1.6.0
index 892ebfe464cb..ed88b881b3fb 100644
--- a/metadata/md5-cache/net-libs/libpri-1.6.0
+++ b/metadata/md5-cache/net-libs/libpri-1.6.0
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install
 DESCRIPTION=Primary Rate ISDN (PRI) library
 EAPI=6
 HOMEPAGE=http://www.asterisk.org/
-KEYWORDS=amd64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://downloads.asterisk.org/pub/telephony/libpri/releases/libpri-1.6.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=56f5f088aed7d5a101aa4dacc049713f
+_md5_=493de305d2b360c65f2a989898727e51
diff --git a/metadata/md5-cache/net-libs/libslirp-4.3.1 b/metadata/md5-cache/net-libs/libslirp-4.3.1
index d0bf932977eb..2a9084325b72 100644
--- a/metadata/md5-cache/net-libs/libslirp-4.3.1
+++ b/metadata/md5-cache/net-libs/libslirp-4.3.1
@@ -4,10 +4,10 @@ DEPEND=dev-libs/glib:=
 DESCRIPTION=A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services.
 EAPI=7
 HOMEPAGE=https://gitlab.freedesktop.org/slirp/libslirp
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=~amd64 ~ppc ~ppc64
 LICENSE=BSD
 RDEPEND=dev-libs/glib:=
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v4.3.1/libslirp-v4.3.1.tar.gz -> libslirp-4.3.1.tar.gz
 _eclasses_=meson	71d293a701d6362387e1214da368c848	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=34ae8a4a12fe2a2b71a47bd32629e23a
+_md5_=7193d289dbc2af4f906856dfa48d5eed
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1 b/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
index dd6a16d74dbd..cef55769fbca 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=7
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/3.12.0
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.16.7.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=033e4e7c20aa86409b017a40f0267e72
+_md5_=97ee687d37790d82bee823e0fd25fe0f
diff --git a/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1 b/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
index 31d6cf395ff9..3c1c3cb6b84f 100644
--- a/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
+++ b/metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Cryptographic library for embedded systems
 EAPI=7
 HOMEPAGE=https://tls.mbed.org/
 IUSE=cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/5.13.1
 SRC_URI=https://github.com/ARMmbed/mbedtls/archive/mbedtls-2.23.0.tar.gz
 _eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1a0625d89e47b708767ce6ca7e557602
+_md5_=72942298ef43ca75076bd581bd509d8b
diff --git a/metadata/md5-cache/net-libs/osptoolkit-4.13.0 b/metadata/md5-cache/net-libs/osptoolkit-4.13.0
index 52cb9f90204a..2d4e19f4aa66 100644
--- a/metadata/md5-cache/net-libs/osptoolkit-4.13.0
+++ b/metadata/md5-cache/net-libs/osptoolkit-4.13.0
@@ -3,10 +3,10 @@ DEPEND=dev-libs/openssl:0=
 DESCRIPTION=Open Settlement Protocol development kit
 EAPI=6
 HOMEPAGE=http://www.transnexus.com/OSP%20Toolkit/OSP%20Toolkit%20Documents/OSP%20Toolkit%20Documents.htm
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/osp-toolkit/OSPToolkit-4.13.0.tar.gz
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=4e6be9f858cceb46d2a0948c7c02aa19
+_md5_=2b98e91fb66a7a906cbbccbac11f0698
diff --git a/metadata/md5-cache/net-libs/pjproject-2.9-r2 b/metadata/md5-cache/net-libs/pjproject-2.9-r2
index 95ec8870ccfa..eed8336e14c0 100644
--- a/metadata/md5-cache/net-libs/pjproject-2.9-r2
+++ b/metadata/md5-cache/net-libs/pjproject-2.9-r2
@@ -5,10 +5,10 @@ DESCRIPTION=Open source SIP, Media, and NAT Traversal Library
 EAPI=7
 HOMEPAGE=https://www.pjsip.org/
 IUSE=amr debug epoll examples ipv6 libressl opus resample silk ssl static-libs webrtc g711 g722 g7221 gsm ilbc speex l16 g729 sdl ffmpeg v4l2 openh264 libyuv alsa portaudio
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-libs/libsrtp:= alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) ffmpeg? ( media-video/ffmpeg:= ) g729? ( media-libs/bcg729 ) gsm? ( media-sound/gsm ) ilbc? ( media-libs/libilbc ) openh264? ( media-libs/openh264 ) opus? ( media-libs/opus ) portaudio? ( media-libs/portaudio ) resample? ( media-libs/libsamplerate ) sdl? ( media-libs/libsdl ) speex? ( media-libs/speexdsp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://www.pjsip.org/release/2.9/pjproject-2.9.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=014ef36f58912fd45568d0da1eb79d6b
+_md5_=3deae2c546d740080f215e61568dbe60
diff --git a/metadata/md5-cache/net-libs/quiche-9999 b/metadata/md5-cache/net-libs/quiche-9999
index ed543344ff60..bca146dfab1c 100644
--- a/metadata/md5-cache/net-libs/quiche-9999
+++ b/metadata/md5-cache/net-libs/quiche-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=virtual/rust-1.39.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/cmake dev-lang/go dev-lang/perl >=virtual/rust-1.37.0 dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=>=virtual/rust-1.39.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-util/cmake >=virtual/rust-1.37.0 dev-util/ninja >=dev-util/cmake-3.9.6 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Implementation of the QUIC transport protocol and HTTP/3
 EAPI=7
@@ -8,4 +8,4 @@ LICENSE=|| ( Apache-2.0 Boost-1.0 ) || ( Apache-2.0 MIT ) || ( Apache-2.0-with-L
 PROPERTIES=live
 SLOT=0/0
 _eclasses_=cargo	59ecae2c29d723be70671fd182038195	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	rust-toolchain	70000bd1329808f6a050a7ae3cb277fd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=475fb4ef17e7259f8b736ac92eca63a0
+_md5_=bb7e397fc732047b94fd65cb07f5790d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e3728233b10a..e466cc7d7a6e 100644
Binary files a/metadata/md5-cache/net-misc/Manifest.gz and b/metadata/md5-cache/net-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/net-misc/asterisk-13.33.0 b/metadata/md5-cache/net-misc/asterisk-13.33.0
index c84270470b3d..96f666aa3294 100644
--- a/metadata/md5-cache/net-misc/asterisk-13.33.0
+++ b/metadata/md5-cache/net-misc/asterisk-13.33.0
@@ -5,11 +5,11 @@ DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
 IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libedit libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog vorbis xmpp kernel_linux
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt dev-libs/jansson dev-libs/libxml2:2 dev-libs/libxslt sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) lua? ( dev-lang/lua:* ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) pjproject? ( net-libs/pjproject ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-13.33.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=915d6b53fda8f4f5ade9a814a60015bf
+_md5_=cd8d8546c9de0b0971a932858e7f3873
diff --git a/metadata/md5-cache/net-misc/asterisk-16.10.0 b/metadata/md5-cache/net-misc/asterisk-16.10.0
index e53939bcb247..016dafebe95c 100644
--- a/metadata/md5-cache/net-misc/asterisk-16.10.0
+++ b/metadata/md5-cache/net-misc/asterisk-16.10.0
@@ -5,11 +5,11 @@ DESCRIPTION=Asterisk: A Modular Open Source PBX System
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
 IUSE=+voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap alsa bluetooth calendar +caps cluster curl dahdi debug doc freetds gtalk http iconv ilbc ldap libressl lua mysql newt odbc osplookup oss pjproject portaudio postgres radius selinux snmp span speex srtp +ssl static statsd syslog unbound vorbis xmpp kernel_linux
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11 dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/ncurses:0= sys-libs/zlib alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) cluster? ( sys-cluster/corosync ) curl? ( net-misc/curl ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua:* ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) pjproject? ( >=net-libs/pjproject-2.9 ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp:0 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger )
 REQUIRED_USE=gtalk? ( xmpp ) ^^ ( voicemail_storage_file voicemail_storage_odbc voicemail_storage_imap ) voicemail_storage_odbc? ( odbc )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/asterisk/releases/asterisk-16.10.0.tar.gz https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3c8e6ce69c128404b1b84e0caca790a0
+_md5_=9e4c1e05ba90817468896314df341275
diff --git a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1 b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
index e0f91bd1db0c..85b738e4c51e 100644
--- a/metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
+++ b/metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
@@ -3,10 +3,10 @@ DESCRIPTION=Core sounds for asterisk
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
 IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav l10n_en-AU l10n_en-GB l10n_es l10n_fr l10n_it l10n_ja l10n_ru l10n_sv
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=!<net-misc/asterisk-extra-sounds-1.5.2
 REQUIRED_USE=|| ( alaw g722 g729 gsm siren7 siren14 sln16 ulaw wav )
 SLOT=0
 SRC_URI=alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-wav-1.6.1.tar.gz ) l10n_en-AU? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_AU-wav-1.6.1.tar.gz ) ) l10n_en-GB? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en_GB-wav-1.6.1.tar.gz ) ) l10n_es? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-es-wav-1.6.1.tar.gz ) ) l10n_fr? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-fr-wav-1.6.1.tar.gz ) ) l10n_it? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-it-wav-1.6.1.tar.gz ) ) l10n_ja? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ja-wav-1.6.1.tar.gz ) ) l10n_ru? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-ru-wav-1.6.1.tar.gz ) ) l10n_sv? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-alaw-1.6.1.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-g722-1.6.1.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-g729-1.6.1.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-gsm-1.6.1.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-siren7-1.6.1.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-siren14-1.6.1.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-sln16-1.6.1.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-sv-wav-1.6.1.tar.gz ) )
-_md5_=1d77a3a8513fa9e84249f2813071068d
+_md5_=970a203a000c4ac2ecf1cd7076774398
diff --git a/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2 b/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
index 60326249ceed..b88ac092c6b8 100644
--- a/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
+++ b/metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
@@ -3,9 +3,9 @@ DESCRIPTION=Extra sounds for asterisk
 EAPI=7
 HOMEPAGE=https://www.asterisk.org/
 IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav l10n_en-GB l10n_fr
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=CC-BY-SA-3.0
 REQUIRED_USE=|| ( alaw g722 g729 gsm siren7 siren14 sln16 ulaw wav )
 SLOT=0
 SRC_URI=alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-1.5.2.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-1.5.2.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-1.5.2.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-1.5.2.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren7-1.5.2.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-siren14-1.5.2.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-sln16-1.5.2.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-1.5.2.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en-wav-1.5.2.tar.gz ) l10n_en-GB? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-alaw-1.5.2.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-g722-1.5.2.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-g729-1.5.2.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-gsm-1.5.2.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-siren7-1.5.2.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-siren14-1.5.2.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-sln16-1.5.2.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-ulaw-1.5.2.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-en_GB-wav-1.5.2.tar.gz ) ) l10n_fr? ( alaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-alaw-1.5.2.tar.gz ) g722? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g722-1.5.2.tar.gz ) g729? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-g729-1.5.2.tar.gz ) gsm? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-gsm-1.5.2.tar.gz ) siren7? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren7-1.5.2.tar.gz ) siren14? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-siren14-1.5.2.tar.gz ) sln16? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-sln16-1.5.2.tar.gz ) ulaw? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz ) wav? ( https://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-extra-sounds-fr-wav-1.5.2.tar.gz ) )
-_md5_=a723e1191a4f1ca3dffd3185e6c0d66c
+_md5_=70b3ff790da366ac343f6c59c52c2980
diff --git a/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1 b/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1
index 154adfed360f..7cd1f4197bd6 100644
--- a/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1
+++ b/metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1
@@ -3,9 +3,9 @@ DESCRIPTION=asterisk moh music
 EAPI=7
 HOMEPAGE=http://www.asterisk.org/
 IUSE=alaw g722 g729 +gsm siren7 siren14 sln16 ulaw wav
-KEYWORDS=amd64 ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ppc ~ppc64 x86
 LICENSE=CC-BY-SA-3.0
 REQUIRED_USE=|| ( alaw g722 g729 gsm siren7 siren14 sln16 ulaw wav )
 SLOT=0
 SRC_URI=alaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-alaw-2.03.tar.gz ) g722? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g722-2.03.tar.gz ) g729? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-g729-2.03.tar.gz ) gsm? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-gsm-2.03.tar.gz ) siren7? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-siren7-2.03.tar.gz ) siren14? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-siren14-2.03.tar.gz ) sln16? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-sln16-2.03.tar.gz ) ulaw? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-ulaw-2.03.tar.gz ) wav? ( http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz )
-_md5_=c40fce84ace7b70a5b22695e9c6e4b93
+_md5_=a5451ce9cb957eb195e461b835007ce1
diff --git a/metadata/md5-cache/net-misc/curl-7.71.0 b/metadata/md5-cache/net-misc/curl-7.71.0
index 3755d9ee7526..a20c3e05d8ca 100644
--- a/metadata/md5-cache/net-misc/curl-7.71.0
+++ b/metadata/md5-cache/net-misc/curl-7.71.0
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.71.0.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=eaf2dcc52f036c9e2b48dee8dfdfff52
+_md5_=f96fb60ff0155476c6aa2f87a0d49028
diff --git a/metadata/md5-cache/net-misc/curl-7.71.1 b/metadata/md5-cache/net-misc/curl-7.71.1
index 81eaf080d257..033778377624 100644
--- a/metadata/md5-cache/net-misc/curl-7.71.1
+++ b/metadata/md5-cache/net-misc/curl-7.71.1
@@ -1,16 +1,16 @@
 BDEPEND=virtual/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 DESCRIPTION=A Client that groks URLs
 EAPI=7
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns alt-svc brotli +ftp gopher http2 idn +imap ipv6 kerberos ldap metalink +pop3 +progress-meter rtmp samba +smtp ssh ssl static-libs test telnet +tftp threads curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl nghttp3 quiche elibc_Winnt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=curl
-RDEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=ldap? ( net-nds/openldap[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) brotli? ( app-arch/brotli:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( curl_ssl_gnutls? ( net-libs/gnutls:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) curl_ssl_nss? ( dev-libs/nss:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nghttp3? ( net-libs/nghttp3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] net-libs/ngtcp2[ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) quiche? ( >=net-libs/quiche-0.5.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) idn? ( net-dns/libidn2:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) adns? ( net-dns/c-ares:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=virtual/krb5-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rtmp? ( media-video/rtmpdump[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( net-libs/libssh2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.71.1.tar.xz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	prefix	c2993e4c430c1ee24f278983d6189501	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=90cf84e915e8e61a5d83b62aff1a5b9d
+_md5_=c1e3b527867a877a9171e3af952db1e9
diff --git a/metadata/md5-cache/net-misc/dahdi-3.1.0-r1 b/metadata/md5-cache/net-misc/dahdi-3.1.0-r1
index 440b5c4a2c9f..7b865efcad82 100644
--- a/metadata/md5-cache/net-misc/dahdi-3.1.0-r1
+++ b/metadata/md5-cache/net-misc/dahdi-3.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Kernel modules for Digium compatible hardware (formerly known as Zap
 EAPI=7
 HOMEPAGE=https://www.asterisk.org
 IUSE=flash oslec kernel_linux kernel_linux
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=kernel_linux? ( virtual/modutils )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/dahdi-linux-3.1.0.tar.gz https://www.junghanns.net/downloads/jnet-dahdi-drivers-1.0.14.tar.gz https://downloads.uls.co.za/gentoo/dahdi/gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fwload-vpmadt032-1.25.0.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4a-a0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a4b-d001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8a-1d0017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-a8b-1f001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-hx8-2.06.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-032-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-064-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-128-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-oct6114-256-1.05.01.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-tc400m-MR6.12.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te133-7a001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te134-780017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te435-13001e.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te436-10017.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-te820-1.76.tar.gz https://downloads.digium.com/pub/telephony/firmware/releases/dahdi-fw-vpmoct032-1.12.0.tar.gz
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=368ad99b28151ee4da9727ca5c995530
+_md5_=d68440fe571498800f0d7046974e784b
diff --git a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0 b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
index 96b1415bbdb7..1003a35cac23 100644
--- a/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
+++ b/metadata/md5-cache/net-misc/dahdi-tools-3.1.0
@@ -5,10 +5,10 @@ DESCRIPTION=Userspace tools to configure the kernel modules from net-misc/dahdi
 EAPI=7
 HOMEPAGE=https://www.asterisk.org
 IUSE=ppp
-KEYWORDS=amd64 ~ppc ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/newt net-misc/dahdi sys-kernel/linux-headers virtual/libusb:0 ppp? ( net-dialup/ppp )
 SLOT=0
 SRC_URI=https://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-3.1.0.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	perl-functions	6ec4c4d8fc8324200f1c14e8d158c59b	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=8d09a66653de86ed9c00c114435f3047
+_md5_=e092a0e97f3e10bacec3059fb0e7d7bc
diff --git a/metadata/md5-cache/net-misc/putty-0.74 b/metadata/md5-cache/net-misc/putty-0.74
index 14c919a26175..b30692b23d83 100644
--- a/metadata/md5-cache/net-misc/putty-0.74
+++ b/metadata/md5-cache/net-misc/putty-0.74
@@ -5,10 +5,10 @@ DESCRIPTION=A Free Telnet/SSH Client
 EAPI=7
 HOMEPAGE=https://www.chiark.greenend.org.uk/~sgtatham/putty/
 IUSE=doc +gtk gtk2 ipv6 gssapi
-KEYWORDS=~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ppc ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=!net-misc/pssh gtk? ( dev-libs/glib:2 x11-libs/gdk-pixbuf x11-libs/libX11 x11-libs/pango gtk2? ( x11-libs/gtk+:2 ) !gtk2? ( x11-libs/gtk+:3[X] ) ) gssapi? ( virtual/krb5 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~jer/putty-icons.tar.bz2 https://the.earth.li/~sgtatham/putty/0.74/putty-0.74.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	desktop	7fd20552ce4cc97e8acb132a499a7dd8	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d0963a3228ed0f1b91b01b3e4bbcee9c
+_md5_=2f5477fc37b9febc296c09af564e8b17
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index c9c9df731bf3..befbf8601264 100644
Binary files a/metadata/md5-cache/net-wireless/Manifest.gz and b/metadata/md5-cache/net-wireless/Manifest.gz differ
diff --git a/metadata/md5-cache/net-wireless/unifi-5.14.15 b/metadata/md5-cache/net-wireless/unifi-5.14.18
similarity index 81%
rename from metadata/md5-cache/net-wireless/unifi-5.14.15
rename to metadata/md5-cache/net-wireless/unifi-5.14.18
index ddd6c6024436..dd458de1c1a8 100644
--- a/metadata/md5-cache/net-wireless/unifi-5.14.15
+++ b/metadata/md5-cache/net-wireless/unifi-5.14.18
@@ -9,6 +9,6 @@ LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3
 RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
 RESTRICT=bindist mirror
 SLOT=0/5.14
-SRC_URI=https://dl.ui.com/unifi/5.14.15-c3f8d69687/UniFi.unix.zip -> unifi-5.14.15.zip
+SRC_URI=https://dl.ui.com/unifi/5.14.18-ff62fc7d5c/UniFi.unix.zip -> unifi-5.14.18.zip
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=b86a16de5f2967f468d41ece78628340
+_md5_=65e7965889182400e3a635389855c53e
diff --git a/metadata/md5-cache/net-wireless/unifi-6.0.4 b/metadata/md5-cache/net-wireless/unifi-6.0.4
new file mode 100644
index 000000000000..ea21390684a3
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-6.0.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=app-arch/unzip virtual/pkgconfig
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=6
+HOMEPAGE=https://www.ubnt.com
+IUSE=systemd
+KEYWORDS=~amd64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8
+RESTRICT=bindist mirror
+SLOT=0/6.0
+SRC_URI=https://dl.ui.com/unifi/6.0.4-d88cbf373712731c30d0/UniFi.unix.zip -> unifi-6.0.4.zip
+_eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=feea9b0e6d12386aeca949f8a3d8bfd5
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 5aeb86875384..3a264efb33dc 100644
Binary files a/metadata/md5-cache/ros-meta/Manifest.gz and b/metadata/md5-cache/ros-meta/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ros/audio_play-0.3.2 b/metadata/md5-cache/ros-meta/audio_common-0.3.6
similarity index 64%
rename from metadata/md5-cache/dev-ros/audio_play-0.3.2
rename to metadata/md5-cache/ros-meta/audio_common-0.3.6
index e21700c44ded..021f8ff6c108 100644
--- a/metadata/md5-cache/dev-ros/audio_play-0.3.2
+++ b/metadata/md5-cache/ros-meta/audio_common-0.3.6
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Outputs audio to a speaker from a source node
+DEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Common code for working with audio in ROS
 EAPI=5
-HOMEPAGE=https://wiki.ros.org/audio_play https://github.com/ros-drivers/audio_common
+HOMEPAGE=https://wiki.ros.org/audio_common https://github.com/ros-drivers/audio_common
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/audio_common_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-libs/boost:=[threads] media-libs/gstreamer:1.0 media-libs/gst-plugins-good:1.0 media-libs/gst-plugins-base:1.0 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/audio_capture dev-ros/audio_common_msgs dev-ros/audio_play python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.2.tar.gz -> audio_common-0.3.2.tar.gz
+SRC_URI=https://github.com/ros-drivers/audio_common/archive/0.3.6.tar.gz -> audio_common-0.3.6.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6f23119a0cdb129965afc487214835dc
+_md5_=5dc20f922db1fcfdb298cd8793ae550b
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.4 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
similarity index 52%
rename from metadata/md5-cache/dev-ros/gazebo_dev-2.8.4
rename to metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
index 5b742cc6b698..db817a69c404 100644
--- a/metadata/md5-cache/dev-ros/gazebo_dev-2.8.4
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Interface for using ROS with the gazebo simulator
 EAPI=5
-HOMEPAGE=https://wiki.ros.org/gazebo_dev https://github.com/ros-simulation/gazebo_ros_pkgs
+HOMEPAGE=https://wiki.ros.org/gazebo_ros_pkgs https://github.com/ros-simulation/gazebo_ros_pkgs
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=sci-electronics/gazebo python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+LICENSE=BSD
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.4.tar.gz -> gazebo_ros_pkgs-2.8.4.tar.gz
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.9.1.tar.gz -> gazebo_ros_pkgs-2.9.1.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=9272b7fc6b39eae0800e872cf98ad7ea
+_md5_=7f8bbb7a4bd74d4dbcab23a49f83d084
diff --git a/metadata/md5-cache/ros-meta/geographic_info-0.5.5 b/metadata/md5-cache/ros-meta/geographic_info-0.5.5
new file mode 100644
index 000000000000..51b0ea2a1f2d
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/geographic_info-0.5.5
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Geographic information metapackage
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/geographic_info https://github.com/ros-geographic-info/geographic_info
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-geographic-info/geographic_info/archive/0.5.5.tar.gz -> geographic_info-0.5.5.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b598195239c5c26edbff065f28c7475f
diff --git a/metadata/md5-cache/ros-meta/geographic_info-9999 b/metadata/md5-cache/ros-meta/geographic_info-9999
index 47709241f678..1277891fc676 100644
--- a/metadata/md5-cache/ros-meta/geographic_info-9999
+++ b/metadata/md5-cache/ros-meta/geographic_info-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/geodesy dev-ros/geographic_msgs >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=Geographic information metapackage
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/geographic_info https://github.com/ros-geographic-info/geographic_info
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/geodesy dev-ros/geographic_msgs python_targets_python3_6? ( dev-
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7800bcf0c9c63a4746018ffa77c4b790
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=b598195239c5c26edbff065f28c7475f
diff --git a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.0 b/metadata/md5-cache/ros-meta/hector_slam-0.4.1
similarity index 66%
rename from metadata/md5-cache/dev-ros/hector_slam_launch-0.4.0
rename to metadata/md5-cache/ros-meta/hector_slam-0.4.1
index a7930c4a91ef..080aaa28e563 100644
--- a/metadata/md5-cache/dev-ros/hector_slam_launch-0.4.0
+++ b/metadata/md5-cache/ros-meta/hector_slam-0.4.1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios
+DESCRIPTION=hector_mapping and related packages
 EAPI=5
-HOMEPAGE=https://wiki.ros.org/hector_slam_launch https://github.com/tu-darmstadt-ros-pkg/hector_slam
+HOMEPAGE=https://wiki.ros.org/hector_slam https://github.com/tu-darmstadt-ros-pkg/hector_slam
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/hector_mapping dev-ros/hector_map_server dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_geotiff_plugins python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/hector_compressed_map_transport dev-ros/hector_geotiff_plugins dev-ros/hector_imu_tools dev-ros/hector_map_server dev-ros/hector_marker_drawing dev-ros/hector_trajectory_server dev-ros/hector_geotiff dev-ros/hector_imu_attitude_to_tf dev-ros/hector_mapping dev-ros/hector_map_tools dev-ros/hector_nav_msgs dev-ros/hector_slam_launch python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.0.tar.gz -> hector_slam-0.4.0.tar.gz
+SRC_URI=https://github.com/tu-darmstadt-ros-pkg/hector_slam/archive/0.4.1.tar.gz -> hector_slam-0.4.1.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1177eae72d52165ff55ecee6c8e01c45
+_md5_=bc7701c40d3f62beffe63ac020e4925e
diff --git a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7 b/metadata/md5-cache/ros-meta/image_common-1.12.0
similarity index 65%
rename from metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
rename to metadata/md5-cache/ros-meta/image_common-1.12.0
index 27361032261d..30856e05b9a0 100644
--- a/metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
+++ b/metadata/md5-cache/ros-meta/image_common-1.12.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= test? ( dev-ros/rostest ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=C++ interface for camera calibration information
+DEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Common code for working with images in ROS
 EAPI=5
-HOMEPAGE=https://wiki.ros.org/camera_info_manager https://github.com/ros-perception/image_common
+HOMEPAGE=https://wiki.ros.org/image_common https://github.com/ros-perception/image_common
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/camera_calibration_parsers dev-ros/image_transport dev-ros/roscpp dev-ros/roslib dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-libs/boost:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/camera_calibration_parsers dev-ros/camera_info_manager dev-ros/image_transport dev-ros/polled_camera python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-perception/image_common/archive/1.11.7.tar.gz -> image_common-1.11.7.tar.gz
+SRC_URI=https://github.com/ros-perception/image_common/archive/1.12.0.tar.gz -> image_common-1.12.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=e7df4d824d0b198dde798e130ffd517c
+_md5_=f8d97a3b5edf9b1c9869013235da1e1b
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1 b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1
deleted file mode 100644
index 6fd6c17f04ee..000000000000
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_processors dev-ros/imu_transformer sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for processing and pre-processing IMU messages for easier use by later subscribers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.1.tar.gz -> imu_pipeline-0.2.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=919e34bbd7aa155ffab2c3661ea38e42
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2 b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2
deleted file mode 100644
index ea926f6cbf44..000000000000
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_processors dev-ros/imu_transformer sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for processing and pre-processing IMU messages for easier use by later subscribers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.2.tar.gz -> imu_pipeline-0.2.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2270411ecd08c5f5068bfb170b6c7a33
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.3 b/metadata/md5-cache/ros-meta/imu_pipeline-0.2.3
deleted file mode 100644
index 1bee342b1ee4..000000000000
--- a/metadata/md5-cache/ros-meta/imu_pipeline-0.2.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/imu_processors dev-ros/imu_transformer sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for processing and pre-processing IMU messages for easier use by later subscribers
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.2.3.tar.gz -> imu_pipeline-0.2.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=102b408482bccce80f9df5946f3016f9
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0 b/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
new file mode 100644
index 000000000000..4d87610114d0
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/ninja dev-util/cmake
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for processing IMU messages for easier use by later subscribers
+EAPI=7
+HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
+IUSE=python_targets_python3_6 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/imu_pipeline/archive/0.3.0.tar.gz -> imu_pipeline-0.3.0.tar.gz
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cba40ad7b6c7d268798e5b55d22ec184
diff --git a/metadata/md5-cache/ros-meta/imu_pipeline-9999 b/metadata/md5-cache/ros-meta/imu_pipeline-9999
index 5ff0e64d86de..a76c300b50be 100644
--- a/metadata/md5-cache/ros-meta/imu_pipeline-9999
+++ b/metadata/md5-cache/ros-meta/imu_pipeline-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/imu_processors dev-ros/imu_transformer >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Tools for processing and pre-processing IMU messages for easier use by later subscribers
-EAPI=5
+DEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Tools for processing IMU messages for easier use by later subscribers
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/imu_pipeline https://github.com/ros-perception/imu_pipeline
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/imu_processors dev-ros/imu_transformer python_targets_python3_6?
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=919e34bbd7aa155ffab2c3661ea38e42
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=cba40ad7b6c7d268798e5b55d22ec184
diff --git a/metadata/md5-cache/ros-meta/mavros-1.2.0 b/metadata/md5-cache/ros-meta/mavros-1.2.0
new file mode 100644
index 000000000000..338d847aedd3
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/mavros-1.2.0
@@ -0,0 +1,10 @@
+DEFINED_PHASES=-
+DEPEND=dev-ros/mavros_msgs dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras
+DESCRIPTION=Metapackage for mavros packages
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/mavros
+KEYWORDS=~amd64 ~arm
+LICENSE=metapackage
+RDEPEND=dev-ros/mavros_msgs dev-ros/libmavconn dev-ros/mavros dev-ros/mavros_extras
+SLOT=0
+_md5_=59e07b0106663415dd65bafb2a933c92
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.10 b/metadata/md5-cache/ros-meta/pr2_common-1.11.10
deleted file mode 100644
index 9da0bdcdb2a9..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.10.tar.gz -> pr2_common-1.11.10.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.11 b/metadata/md5-cache/ros-meta/pr2_common-1.11.11
deleted file mode 100644
index e64b120063a4..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.11
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.11.tar.gz -> pr2_common-1.11.11.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.13 b/metadata/md5-cache/ros-meta/pr2_common-1.11.13
deleted file mode 100644
index ea3b6fd300a7..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.13
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.13.tar.gz -> pr2_common-1.11.13.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.14 b/metadata/md5-cache/ros-meta/pr2_common-1.11.14
deleted file mode 100644
index ef271481f4c6..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.14
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.14.tar.gz -> pr2_common-1.11.14.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.11.9 b/metadata/md5-cache/ros-meta/pr2_common-1.11.9
deleted file mode 100644
index e8f7156b29d6..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.11.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.11.9.tar.gz -> pr2_common-1.11.9.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.0 b/metadata/md5-cache/ros-meta/pr2_common-1.12.0
deleted file mode 100644
index 1529453e7c6b..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.0.tar.gz -> pr2_common-1.12.0.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.1 b/metadata/md5-cache/ros-meta/pr2_common-1.12.1
deleted file mode 100644
index 880e1eb97b17..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.1.tar.gz -> pr2_common-1.12.1.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ec273cf015e6dbc2d28e6611c045070
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.2 b/metadata/md5-cache/ros-meta/pr2_common-1.12.2
deleted file mode 100644
index c813e30d02fd..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.2.tar.gz -> pr2_common-1.12.2.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=7ec273cf015e6dbc2d28e6611c045070
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.3 b/metadata/md5-cache/ros-meta/pr2_common-1.12.3
deleted file mode 100644
index 642b1b716821..000000000000
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
-HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
-IUSE=python_targets_python3_6 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.3.tar.gz -> pr2_common-1.12.3.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=2581d8e3e89bfed7346a29180441ff4f
diff --git a/metadata/md5-cache/ros-meta/pr2_common-1.12.4 b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
index b61f5a37880c..a324eb9d77b9 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-1.12.4
+++ b/metadata/md5-cache/ros-meta/pr2_common-1.12.4
@@ -1,7 +1,8 @@
+BDEPEND=dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64
@@ -11,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pr2/pr2_common/archive/1.12.4.tar.gz -> pr2_common-1.12.4.tar.gz
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=d5aa85a1f3cf3ad5681a4caa7c28cb2f
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae13f29d59fa7a528df52a0186e64ac7
diff --git a/metadata/md5-cache/ros-meta/pr2_common-9999 b/metadata/md5-cache/ros-meta/pr2_common-9999
index d74e7867cfb4..58fd5b61a14a 100644
--- a/metadata/md5-cache/ros-meta/pr2_common-9999
+++ b/metadata/md5-cache/ros-meta/pr2_common-9999
@@ -1,7 +1,8 @@
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] dev-util/ninja dev-util/cmake
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine >=dev-vcs/git-1.8.2.1[curl] sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_description dev-ros/pr2_machine python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 DESCRIPTION=URDF description and 3D models of robot components of the PR2 robot
-EAPI=5
+EAPI=7
 HOMEPAGE=https://wiki.ros.org/pr2_common https://github.com/pr2/pr2_common
 IUSE=python_targets_python3_6 test
 LICENSE=BSD
@@ -10,5 +11,5 @@ RDEPEND=dev-ros/pr2_msgs dev-ros/pr2_dashboard_aggregator dev-ros/pr2_descriptio
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1ca7237c20ae297bb800a9a51b21d861
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	git-r3	8ec5b53812bce105ae7943930e4660f8	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=ae13f29d59fa7a528df52a0186e64ac7
diff --git a/metadata/md5-cache/dev-ros/geometric_shapes-0.6.1 b/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
similarity index 53%
rename from metadata/md5-cache/dev-ros/geometric_shapes-0.6.1
rename to metadata/md5-cache/ros-meta/vision_opencv-1.15.0
index b82ba3b41455..888c6f27229f 100644
--- a/metadata/md5-cache/dev-ros/geometric_shapes-0.6.1
+++ b/metadata/md5-cache/ros-meta/vision_opencv-1.15.0
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= test? ( dev-cpp/gtest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
-DESCRIPTION=Generic definitions of geometric shapes and bodies
+DEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests sys-devel/make >=dev-util/cmake-3.9.6 python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-util/catkin[python_targets_python3_6(-)?,-python_single_target_python3_6(-)] dev-python/empy[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+DESCRIPTION=Converts between ROS Image messages and OpenCV images
 EAPI=5
-HOMEPAGE=https://wiki.ros.org/geometric_shapes https://github.com/ros-planning/geometric_shapes
+HOMEPAGE=https://wiki.ros.org/vision_opencv https://github.com/ros-perception/vision_opencv
 IUSE=python_targets_python3_6 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= media-libs/qhull media-libs/assimp sci-libs/octomap dev-ros/random_numbers dev-ros/resource_retriever dev-ros/eigen_stl_containers dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/shape_msgs[ros_messages_cxx(-)] dev-libs/console_bridge:= python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
+RDEPEND=dev-ros/cv_bridge dev-ros/image_geometry dev-ros/opencv_tests python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ros-planning/geometric_shapes/archive/0.6.1.tar.gz -> geometric_shapes-0.6.1.tar.gz
+SRC_URI=https://github.com/ros-perception/vision_opencv/archive/1.15.0.tar.gz -> vision_opencv-1.15.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	ros-catkin	12d8b1bd7e97fcb10e31884ca5222479	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c9f7f6a3fb081a5008c34d91823b80a0
+_md5_=30ee4716b4f646c0b486b2138e7e034b
diff --git a/metadata/md5-cache/sci-astronomy/Manifest.gz b/metadata/md5-cache/sci-astronomy/Manifest.gz
index 4b157f52ebc8..a513b820bf38 100644
Binary files a/metadata/md5-cache/sci-astronomy/Manifest.gz and b/metadata/md5-cache/sci-astronomy/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-0.20.2 b/metadata/md5-cache/sci-astronomy/stellarium-0.20.2
new file mode 100644
index 000000000000..20a439f1e5fb
--- /dev/null
+++ b/metadata/md5-cache/sci-astronomy/stellarium-0.20.2
@@ -0,0 +1,15 @@
+BDEPEND=nls? ( dev-qt/linguist-tools:5 ) dev-util/ninja dev-util/cmake test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] ) dev-qt/qtconcurrent:5 test? ( dev-qt/qttest:5 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=3D photo-realistic skies in real time
+EAPI=7
+HOMEPAGE=https://stellarium.org/
+IUSE=debug deep-sky gps media nls stars test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 dev-qt/qtprintsupport:5 dev-qt/qtscript:5 dev-qt/qtserialport:5 dev-qt/qtwidgets:5 media-fonts/dejavu sys-libs/zlib virtual/opengl gps? ( dev-qt/qtpositioning:5 ) media? ( dev-qt/qtmultimedia:5[widgets] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v0.20.2/stellarium-0.20.2.tar.gz deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.10/catalog.dat -> stellarium-dso-catalog-3.10.dat ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
+_eclasses_=cmake	19b0421555865baefd505831dd4303e3	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg	c7ba313ea1eaf266f95cc6235f7d6a07	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=fa6aaaa0d17b75fb89274e956288e401
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 3481a46c3079..74a6630fdf26 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/clustalw-2.1-r1 b/metadata/md5-cache/sci-biology/clustalw-2.1-r1
index 3c98002ee6b6..151fed471ff2 100644
--- a/metadata/md5-cache/sci-biology/clustalw-2.1-r1
+++ b/metadata/md5-cache/sci-biology/clustalw-2.1-r1
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=General purpose multiple alignment program for DNA and proteins
 EAPI=6
 HOMEPAGE=http://www.clustal.org/
-KEYWORDS=amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris
 LICENSE=GPL-3 LGPL-3
 SLOT=2
 SRC_URI=http://www.clustal.org/download/current/clustalw-2.1.tar.gz
-_md5_=98ada346b1b1e5cd7a314be5358d0829
+_md5_=b9cc8011470a17e4492271edf55bc870
diff --git a/metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1 b/metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1
new file mode 100644
index 000000000000..61765c472c49
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1
@@ -0,0 +1,11 @@
+BDEPEND=doc? ( >=app-doc/doxygen-1.8.7 )
+DEFINED_PHASES=configure install
+DESCRIPTION=C++ classes for performing conversions between geographic coordinates
+EAPI=7
+HOMEPAGE=https://geographiclib.sourceforge.io/
+IUSE=doc
+KEYWORDS=~amd64 ~arm
+LICENSE=MIT
+SLOT=0/19
+SRC_URI=mirror://sourceforge/geographiclib/GeographicLib-1.50.1.tar.gz
+_md5_=96f4e7afd5471f41e25a614e62492f48
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 494b1d64f320..40e78dd015ff 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 02cec8741290..162aee36ba79 100644
Binary files a/metadata/md5-cache/sci-libs/Manifest.gz and b/metadata/md5-cache/sci-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-libs/proj-7.0.1 b/metadata/md5-cache/sci-libs/proj-7.0.1
index 8afc3ffbadf0..ed46f5ffee64 100644
--- a/metadata/md5-cache/sci-libs/proj-7.0.1
+++ b/metadata/md5-cache/sci-libs/proj-7.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=PROJ coordinate transformation software
 EAPI=7
 HOMEPAGE=https://proj4.org/
 IUSE=curl europe static-libs test +tiff
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+KEYWORDS=~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=dev-db/sqlite:3 curl? ( net-misc/curl ) tiff? ( media-libs/tiff )
 REQUIRED_USE=test? ( !europe )
 RESTRICT=!test? ( test )
 SLOT=0/19
 SRC_URI=https://download.osgeo.org/proj/proj-7.0.1.tar.gz https://download.osgeo.org/proj/proj-datumgrid-1.8.tar.gz europe? ( https://download.osgeo.org/proj/proj-datumgrid-europe-1.6.tar.gz )
-_md5_=87e38427d0d52da4363fac4669408b5e
+_md5_=30452935e02f3df671bfa020eca9ea2b
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 43adc9b699a6..a3f3d8bae852 100644
Binary files a/metadata/md5-cache/sys-apps/Manifest.gz and b/metadata/md5-cache/sys-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.7 b/metadata/md5-cache/sys-apps/diffutils-3.7
index e876188d2686..431f2966ac47 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.7
+++ b/metadata/md5-cache/sys-apps/diffutils-3.7
@@ -4,9 +4,9 @@ DESCRIPTION=Tools to make diffs and compare files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/diffutils/
 IUSE=nls static
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.7.tar.xz mirror://gnu-alpha/diffutils/diffutils-3.7.tar.xz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=91a365f47458648e70d371ae15ab5620
+_md5_=f681c69e8d81365b00a3fd41ae0d4641
diff --git a/metadata/md5-cache/sys-apps/dstat-0.7.4-r2 b/metadata/md5-cache/sys-apps/dstat-0.7.4-r2
new file mode 100644
index 000000000000..45cf5bb40821
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/dstat-0.7.4-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DESCRIPTION=Versatile replacement for vmstat, iostat and ifstat
+EAPI=7
+HOMEPAGE=http://dag.wieers.com/home-made/dstat/
+IUSE=doc examples python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/six[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+SLOT=0
+SRC_URI=https://github.com/dagwieers/dstat/archive/v0.7.4.tar.gz -> dstat-0.7.4.tar.gz
+_eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=89b2f92188f13ba5b0ecd4eaa1081a61
diff --git a/metadata/md5-cache/sys-apps/pkgcore-0.10.12 b/metadata/md5-cache/sys-apps/pkgcore-0.10.12
index 9215e9a0193e..2e83212e903b 100644
--- a/metadata/md5-cache/sys-apps/pkgcore-0.10.12
+++ b/metadata/md5-cache/sys-apps/pkgcore-0.10.12
@@ -4,7 +4,7 @@ DESCRIPTION=a framework for package management
 EAPI=6
 HOMEPAGE=https://github.com/pkgcore/pkgcore
 IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=BSD MIT
 RDEPEND=dev-python/lxml[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] >=dev-python/snakeoil-0.8.7[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
 REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcore/pkgcore-0.10.12.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	distutils-r1	0dda1d9008ac0b2530588115a772d99d	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	79e26ce8f853c9daebe9a4956e37cc1b	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=34a82533fe4e7ad634cddf71174287bd
+_md5_=52da067be79e68150075b3b0c31cda89
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 5f1b8445de26..5a6c8069daaa 100644
Binary files a/metadata/md5-cache/sys-block/Manifest.gz and b/metadata/md5-cache/sys-block/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-block/libzbc-5.5.1 b/metadata/md5-cache/sys-block/libzbc-5.5.1
index bd45ead8acc8..70416af43ce7 100644
--- a/metadata/md5-cache/sys-block/libzbc-5.5.1
+++ b/metadata/md5-cache/sys-block/libzbc-5.5.1
@@ -4,9 +4,9 @@ DESCRIPTION=A library and tools for working with ZBC and ZAC disks
 EAPI=6
 HOMEPAGE=https://github.com/hgst/libzbc
 IUSE=gtk
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=BSD-2 GPL-3 LGPL-3
 SLOT=0
 SRC_URI=https://github.com/hgst/libzbc/archive/v5.5.1.tar.gz -> libzbc-5.5.1.tar.gz
 _eclasses_=autotools	7d999b62b8749fad43fff00620cedf47	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=3b05d7e7309dac5192b485099358e7bf
+_md5_=57674f108faa068e4dc116753184a719
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 45546e7593ae..befe4e0238b5 100644
Binary files a/metadata/md5-cache/sys-cluster/Manifest.gz and b/metadata/md5-cache/sys-cluster/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-cluster/spark-bin-2.3.1-r1 b/metadata/md5-cache/sys-cluster/spark-bin-2.3.1-r1
deleted file mode 100644
index a671cf7cf295..000000000000
--- a/metadata/md5-cache/sys-cluster/spark-bin-2.3.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup
-DEPEND=>=virtual/jdk-1.8 >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=Lightning-fast unified analytics engine
-EAPI=6
-HOMEPAGE=https://spark.apache.org
-IUSE=elibc_FreeBSD
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
-SLOT=0
-SRC_URI=mirror://apache/spark/spark-2.3.1/spark-2.3.1-bin-hadoop2.7.tgz -> spark-bin-2.3.1.tgz
-_eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=16fd775eb2f02d015a372a48615ed519
diff --git a/metadata/md5-cache/sys-cluster/spark-bin-2.4.5 b/metadata/md5-cache/sys-cluster/spark-bin-2.4.6
similarity index 82%
rename from metadata/md5-cache/sys-cluster/spark-bin-2.4.5
rename to metadata/md5-cache/sys-cluster/spark-bin-2.4.6
index 4aa52ee80e93..5f7651c76352 100644
--- a/metadata/md5-cache/sys-cluster/spark-bin-2.4.5
+++ b/metadata/md5-cache/sys-cluster/spark-bin-2.4.6
@@ -8,6 +8,6 @@ KEYWORDS=~amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
-SRC_URI=mirror://apache/spark/spark-2.4.5/spark-2.4.5-bin-hadoop2.7.tgz -> spark-bin-2.4.5.tgz
+SRC_URI=mirror://apache/spark/spark-2.4.6/spark-2.4.6-bin-hadoop2.7.tgz -> spark-bin-2.4.6.tgz
 _eclasses_=java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	16d46032afaca1d6d0621f82084880cb
 _md5_=d34d88cfcd9bf1606065939d18f94d19
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 09610e57b739..77103780d5b5 100644
Binary files a/metadata/md5-cache/sys-devel/Manifest.gz and b/metadata/md5-cache/sys-devel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-devel/binutils-config-5.3.1 b/metadata/md5-cache/sys-devel/binutils-config-5.3.1
index 7428cd9e556f..c00bba20634a 100644
--- a/metadata/md5-cache/sys-devel/binutils-config-5.3.1
+++ b/metadata/md5-cache/sys-devel/binutils-config-5.3.1
@@ -3,10 +3,10 @@ DESCRIPTION=Utility to change the binutils version being used
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Toolchain
 IUSE=+native-symlinks
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/gentoo-functions
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~slyfox/distfiles/binutils-config-5.3.1.tar.xz
 _eclasses_=prefix	c2993e4c430c1ee24f278983d6189501
-_md5_=e2ea39dead4286cb6460be45e9212eed
+_md5_=cbb7003b9cabc1a36a4e8c875dc58b04
diff --git a/metadata/md5-cache/sys-devel/clang-10.0.0 b/metadata/md5-cache/sys-devel/clang-10.0.0
index 7b76465765bb..4f6a85337c03 100644
--- a/metadata/md5-cache/sys-devel/clang-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=C language family frontend for LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-common ~sys-devel/clang-runtime-10.0.0 default-compiler-rt? ( =sys-libs/compiler-rt-10.0.0* ) default-libcxx? ( >=sys-libs/libcxx-10.0.0 )
 RDEPEND=~sys-devel/llvm-10.0.0:10=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_RISCV?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_WebAssembly?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_ARC?,llvm_targets_AVR?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_single_target_python3_6? ( dev-lang/python:3.6 >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7 >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8 >=dev-lang/python-exec-2:=[python_targets_python3_8] ) !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=1cb9d2313713e20f43026513f807a05f
+_md5_=c3bb39d21af6f2144ebc731d53341f15
diff --git a/metadata/md5-cache/sys-devel/clang-common-10.0.0 b/metadata/md5-cache/sys-devel/clang-common-10.0.0
index ecf285735b64..f82cc3094029 100644
--- a/metadata/md5-cache/sys-devel/clang-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-common-10.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files shared between multiple slots of clang
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fb4c64b107c1bf02e1a17f458f775265
+_md5_=ba16e066651f6aa98188b676744ef180
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
index 233de99c194a..2f7ffa72a185 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-10.0.0
@@ -3,10 +3,10 @@ DESCRIPTION=Meta-ebuild for clang runtime libraries
 EAPI=7
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-10.0.0:10.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-10.0.0:10.0.0 ) ) libcxx? ( >=sys-libs/libcxx-10.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-10.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=10.0.0
 _eclasses_=multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=45aec37c2c3450674737d388b799ce97
+_md5_=9e969e246d09b44c82d1c5d323648645
diff --git a/metadata/md5-cache/sys-devel/gcc-8.4.0-r1 b/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
index 0ad07f485fc8..3900b4ce2c72 100644
--- a/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-8.4.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit mpx +pie +ssp +pch systemtap
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=8.4.0
 SRC_URI=mirror://gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz mirror://gentoo/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-8.4.0-patches-2.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-8.4.0-patches-2.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	32e93e5c509fb946d8367fe246015c04	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=2ce4867bd954feeac0e05aeedd6f7e5d
+_md5_=99128b7aff134af233511fccb4d588a0
diff --git a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1 b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
index 6edb6e012fb6..c11023d9743d 100644
--- a/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
+++ b/metadata/md5-cache/sys-devel/gcc-9.3.0-r1
@@ -5,7 +5,7 @@ DESCRIPTION=The GNU Compiler Collection
 EAPI=7
 HOMEPAGE=https://gcc.gnu.org/
 IUSE=test vanilla +nls altivec debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada +vtv jit +pie +ssp +pch systemtap d lto
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86
 LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
 PDEPEND=elibc_glibc? ( >=sys-libs/glibc-2.13 ) >=sys-devel/gcc-config-1.7
 RDEPEND=sys-libs/zlib nls? ( virtual/libintl ) virtual/libiconv >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=9.3.0
 SRC_URI=mirror://gnu/gcc/gcc-9.3.0/gcc-9.3.0.tar.xz mirror://gentoo/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~rhill/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~zorry/patches/gcc/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~blueness/dist/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-9.3.0-patches-3.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-9.3.0-patches-3.tar.bz2
 _eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	fixheadtails	662e80584ee2337b981d7188078e7c74	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	prefix	c2993e4c430c1ee24f278983d6189501	toolchain	32e93e5c509fb946d8367fe246015c04	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=fe4c28759d172987706425b22d486295
+_md5_=fab9331ef89829e49167aed0d4d75d72
diff --git a/metadata/md5-cache/sys-devel/lld-10.0.0 b/metadata/md5-cache/sys-devel/lld-10.0.0
index c03e9c33fda1..077f983e2b19 100644
--- a/metadata/md5-cache/sys-devel/lld-10.0.0
+++ b/metadata/md5-cache/sys-devel/lld-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=The LLVM linker (link editor)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=~sys-devel/llvm-10.0.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=ac86194176d8cc01229da0641ad13e8e
+_md5_=3ec8cd9076a2c5e2dd9f06373cd58979
diff --git a/metadata/md5-cache/sys-devel/llvm-10.0.0 b/metadata/md5-cache/sys-devel/llvm-10.0.0
index 9bd6b1a652e3..83d4325c9cdd 100644
--- a/metadata/md5-cache/sys-devel/llvm-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=Low Level Virtual Machine
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=debug doc exegesis gold libedit +libffi ncurses test xar xml z3 kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_AVR abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common gold? ( >=sys-devel/llvmgold-10 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) gold? ( || ( >=sys-devel/binutils-2.31.1-r4:*[plugins] <sys-devel/binutils-2.31.1-r4:*[cxx] ) ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=10
 SRC_URI=!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-10.0.0-manpages.tar.bz2 ) https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=5e488a9a356aa20b2cf13fdf65cd5f17
+_md5_=276f2b7c12750ea32f4443ec623982ef
diff --git a/metadata/md5-cache/sys-devel/llvm-common-10.0.0 b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
index a4cdd6275f7b..c080022c5a79 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-10.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-common-10.0.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=install unpack
 DESCRIPTION=Common files shared between multiple slots of LLVM
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multiprocessing	cac3169468f893670dac3e7cb940e045
-_md5_=617903bc9d50b6fb47e99f6bdd89479a
+_md5_=d95d46f5c0cf88bf290da136219135bb
diff --git a/metadata/md5-cache/sys-devel/llvmgold-10 b/metadata/md5-cache/sys-devel/llvmgold-10
index 961c82c6df88..cad0c3ef3854 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-10
+++ b/metadata/md5-cache/sys-devel/llvmgold-10
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=7
 HOMEPAGE=https://llvm.org/
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:10[gold] !sys-devel/llvm:0
 SLOT=0
-_md5_=e8189648d0c2cc535808c8978e50988f
+_md5_=90889e72c128f01b0367273cd09e5306
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 6c676fe11f5e..5a64f8851c6c 100644
Binary files a/metadata/md5-cache/sys-kernel/Manifest.gz and b/metadata/md5-cache/sys-kernel/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
new file mode 100644
index 000000000000..da2b2b5834fb
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.4.52 !sys-kernel/vanilla-kernel-bin:5.4.52 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.52
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=4cb5ba34df6bfa25f0057562e0432e72
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.9
new file mode 100644
index 000000000000..e8eaa2919ada
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.9
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel:5.7.9 !sys-kernel/vanilla-kernel-bin:5.7.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.9
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-10.extras.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=23cfd7fb1dfbc6e0f7752967aa435464
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
new file mode 100644
index 000000000000..45bf0ad5bd81
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.52 !sys-kernel/vanilla-kernel:5.4.52 !sys-kernel/vanilla-kernel-bin:5.4.52 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.52
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52-1.xpak -> gentoo-kernel-5.4.52-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52-1.xpak -> gentoo-kernel-5.4.52-1.x86.xpak )
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=a20bdd6958940f81fa50e2ccd2ec6d97
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.9 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.9
new file mode 100644
index 000000000000..a05f9d38bdc8
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.9
@@ -0,0 +1,14 @@
+BDEPEND=test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config install postinst postrm preinst prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with genpatches
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/gentoo-kernel:5.7.9 !sys-kernel/vanilla-kernel:5.7.9 !sys-kernel/vanilla-kernel-bin:5.7.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.9
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.9-1.xpak -> gentoo-kernel-5.7.9-1.amd64.xpak ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.9-1.xpak -> gentoo-kernel-5.7.9-1.x86.xpak )
+_eclasses_=kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d
+_md5_=c800f5811a862c7ceb508cd4162b9fe7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.133 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.133
new file mode 100644
index 000000000000..370a72602cbe
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.133
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.19 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=4.19.133
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-132.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-132.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-132.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-132.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-132.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-132.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-132.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-132.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-132.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=f579836af89b032504fdc258afca4945
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.52 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.52
new file mode 100644
index 000000000000..09c95c0c1235
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.52
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.4.52
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-52.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-52.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-52.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-52.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-52.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-52.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-52.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=ed5b1a6a24ec0f50417b30c37aea260c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.9 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.9
new file mode 100644
index 000000000000..6c6e8d49ccbc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.7.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 5.7 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=5.7.9
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-10.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-10.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-10.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-10.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-10.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-10.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.7-10.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.7-10.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.7-10.experimental.tar.xz )
+_eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fc1f4a11868da89143c7788987d8dd2c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
new file mode 100644
index 000000000000..728161f1150a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
@@ -0,0 +1,14 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.4.52 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.4.52
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.52.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fca6ff1d0067edd16aadae2dd9ffdf10
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.9 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.9
new file mode 100644
index 000000000000..8f75fae2bada
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.9
@@ -0,0 +1,15 @@
+BDEPEND=debug? ( dev-util/dwarves ) test? ( dev-tcltk/expect sys-kernel/dracut amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend test
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=7
+HOMEPAGE=https://www.kernel.org/
+IUSE=debug savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=!sys-kernel/vanilla-kernel-bin:5.7.9 || ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+REQUIRED_USE=arm? ( savedconfig ) arm64? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv )
+SLOT=5.7.9
+SRC_URI=test? ( amd64? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-amd64.qcow2 ) x86? ( https://dev.gentoo.org/~mgorny/dist/tinycorelinux-10.1-x86.qcow2 ) ) https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.7.9.tar.xz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.7.8 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/14d239184a721485a823f30f5aede1c6190558ad/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.7.8 )
+_eclasses_=kernel-build	43d32565dd9cb9407e8012847c57e035	kernel-install	aa03731232b5b5a2ae49e85cb2f65400	mount-boot	20014ae7a3e81eb2c65a4d4d86d2560d	multilib	2477ebe553d3e4d2c606191fe6c33602	portability	e8f7ef3a41965b21a734550f8a94c1c6	savedconfig	0bc45cb0429003c9abc73bae24a0d5bd	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=60237c516903cc97c5fd906872e19dec
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.132 b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.133
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-4.19.132
rename to metadata/md5-cache/sys-kernel/vanilla-sources-4.19.133
index 43e3f0f62006..3470814c4dc1 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.132
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-4.19.133
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=4.19.132
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.132.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
+SLOT=4.19.133
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.19.133.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.19.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.51 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.52
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.4.51
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.4.52
index 0edb4d9af68b..28daf623920b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.51
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.4.52
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.4.51
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.51.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
+SLOT=5.4.52
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.52.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.8 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.9
similarity index 91%
rename from metadata/md5-cache/sys-kernel/vanilla-sources-5.7.8
rename to metadata/md5-cache/sys-kernel/vanilla-sources-5.7.9
index dd97b9028377..3b46cd9fb7e6 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.8
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.7.9
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=!build? ( dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=5.7.8
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.8.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
+SLOT=5.7.9
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.7.9.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.7.tar.xz
 _eclasses_=eapi7-ver	f9ec87e93172b25ce65a85303dc06964	estack	686eaab303305a908fd57b2fd7617800	kernel-2	b018f94025c867de0d2a56af55679a7a	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
 _md5_=6f4c9c7dfd6c9ad338d0aac3b2d3c582
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 8741cc887237..801b1db65624 100644
Binary files a/metadata/md5-cache/sys-libs/Manifest.gz and b/metadata/md5-cache/sys-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
index 26fa54fe31bf..073574e6c8b3 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-10.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=Compiler runtime library for clang (built-in part)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang test
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b95eff217db8eba77532a73109bd2fc4
+_md5_=6b9d4d53e85c4d15e0277b072f1d0e39
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
index f4e3741df272..5a986aa567f7 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
@@ -5,11 +5,11 @@ DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
 EAPI=7
 HOMEPAGE=https://llvm.org/
 IUSE=+clang +libfuzzer +profile +sanitize test +xray elibc_glibc
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=libfuzzer? ( || ( sanitize xray ) )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=10.0.0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	llvm	21d8c0949a2693d7109cc6a25fabfcaf	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=b9c497a7526a7ec81a3e6571a3f8b84b
+_md5_=2ddacab416fc1cefff04189cbbbc4f82
diff --git a/metadata/md5-cache/sys-libs/ldb-2.0.12 b/metadata/md5-cache/sys-libs/ldb-2.0.12
index 6cbe261fc983..2b999a62faf0 100644
--- a/metadata/md5-cache/sys-libs/ldb-2.0.12
+++ b/metadata/md5-cache/sys-libs/ldb-2.0.12
@@ -4,7 +4,7 @@ DESCRIPTION=An LDAP-like embedded database
 EAPI=6
 HOMEPAGE=https://ldb.samba.org
 IUSE=doc +ldap +lmdb python test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86
 LICENSE=LGPL-3
 RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.2.0[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.4.2[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.10.0[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ldap? ( net-nds/openldap ) lmdb? ( >=dev-db/lmdb-0.9.16[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_single_target_python3_6? ( dev-lang/python:3.6[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[threads(+)] >=dev-lang/python-exec-2:=[python_targets_python3_8] ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 ) ) test? ( python )
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/2.0.12
 SRC_URI=https://www.samba.org/ftp/pub/ldb/ldb-2.0.12.tar.gz
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	waf-utils	cf9742c01975dc707eb982114a9d70fa
-_md5_=9ce58efaf002fa1072f5fe2bc3d41db7
+_md5_=cc449ad24b19988da7ab322f98df1d7b
diff --git a/metadata/md5-cache/sys-libs/libomp-10.0.0 b/metadata/md5-cache/sys-libs/libomp-10.0.0
index ca75fad8bd6c..2102c0b61a04 100644
--- a/metadata/md5-cache/sys-libs/libomp-10.0.0
+++ b/metadata/md5-cache/sys-libs/libomp-10.0.0
@@ -5,7 +5,7 @@ DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=7
 HOMEPAGE=https://openmp.llvm.org
 IUSE=cuda hwloc kernel_linux offload ompt test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64 kernel_linux
-KEYWORDS=amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( sys-apps/hwloc:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cuda? ( dev-util/nvidia-cuda-toolkit:= ) )
 REQUIRED_USE=offload? ( cuda? ( abi_x86_64 ) )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/archive/llvmorg-10.0.0.tar.gz
 _eclasses_=cmake-multilib	b396704c8c04bb210b7b45dff5c67fea	cmake-utils	7555f0a45c22f33391d9c0c80f57cf23	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	llvm.org	fcd1ffd6013d407b2d62ccce8cbf7773	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=a7d58189ecc738449fa5304eaac73d43
+_md5_=6895980b46971b9be65a1850a07e8dae
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index cd3ce4715a3b..fbe250c59666 100644
Binary files a/metadata/md5-cache/www-apps/Manifest.gz and b/metadata/md5-cache/www-apps/Manifest.gz differ
diff --git a/metadata/md5-cache/www-apps/gitea-1.11.6 b/metadata/md5-cache/www-apps/gitea-1.11.8
similarity index 80%
rename from metadata/md5-cache/www-apps/gitea-1.11.6
rename to metadata/md5-cache/www-apps/gitea-1.11.8
index 941baf1c5ab5..276d67075aca 100644
--- a/metadata/md5-cache/www-apps/gitea-1.11.6
+++ b/metadata/md5-cache/www-apps/gitea-1.11.8
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/go build-client? ( >=net-libs/nodejs-10[npm] ) filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.10 virtual/pkgconfig
+BDEPEND=<dev-lang/go-1.14.0 build-client? ( >=net-libs/nodejs-10[npm] ) filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.10 virtual/pkgconfig
 DEFINED_PHASES=compile install postinst prepare test unpack
 DEPEND=pam? ( sys-libs/pam )
 DESCRIPTION=A painless self-hosted Git service
@@ -10,6 +10,6 @@ LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 RDEPEND=pam? ( sys-libs/pam ) acct? ( acct-group/git acct-user/git[gitea] ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.11.6/gitea-src-1.11.6.tar.gz
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.11.8/gitea-src-1.11.8.tar.gz
 _eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	golang-vcs-snapshot	12177e83bede6f7fb87eae383864b40b	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=28b467d5d61958b6a16a628fbe0cb45b
+_md5_=439586769aa59411808d8cc9a28e54f5
diff --git a/metadata/md5-cache/www-apps/gitea-1.12.1 b/metadata/md5-cache/www-apps/gitea-1.12.1
new file mode 100644
index 000000000000..b9ae3ad68850
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gitea-1.12.1
@@ -0,0 +1,15 @@
+BDEPEND=build-client? ( >=net-libs/nodejs-10[npm] ) filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
+DESCRIPTION=A painless self-hosted Git service
+EAPI=7
+HOMEPAGE=https://gitea.io
+IUSE=+acct build-client pam sqlite +filecaps
+KEYWORDS=~amd64 ~arm ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.12.1/gitea-src-1.12.1.tar.gz -> gitea-1.12.1.tar.gz
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=fe702724809fec6b7f37bb93aa31d75c
diff --git a/metadata/md5-cache/www-apps/gitea-9999 b/metadata/md5-cache/www-apps/gitea-9999
index eb5361031c63..7f0a20d07ab4 100644
--- a/metadata/md5-cache/www-apps/gitea-9999
+++ b/metadata/md5-cache/www-apps/gitea-9999
@@ -1,14 +1,14 @@
-BDEPEND=dev-lang/go >=net-libs/nodejs-10[npm] filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.10 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile install postinst prepare test unpack
-DEPEND=pam? ( sys-libs/pam )
+BDEPEND=>=net-libs/nodejs-10[npm] filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.12 app-arch/unzip virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=compile install postinst prepare unpack
+DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
 DESCRIPTION=A painless self-hosted Git service
 EAPI=7
 HOMEPAGE=https://gitea.io
 IUSE=+acct pam sqlite +filecaps
 LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
 PROPERTIES=live
-RDEPEND=pam? ( sys-libs/pam ) acct? ( acct-group/git acct-user/git[gitea] ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
+RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git filecaps? ( sys-libs/libcap ) virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
-_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	8ec5b53812bce105ae7943930e4660f8	golang-base	c57d2c3f9e1a02d0feb8b87c7b689892	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=37f6ba5c86e869fffabf5991372377c5
+_eclasses_=fcaps	da689a8e04bbbb3518888ff668fee45b	git-r3	8ec5b53812bce105ae7943930e4660f8	go-module	45394825d9260b479aa1cf252ea58e01	multilib	2477ebe553d3e4d2c606191fe6c33602	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	tmpfiles	6170dc7770585fb3f16efdee789a3218	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
+_md5_=c2668bf91496e7ca8c39485f0ce78dd8
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 36d5c8c23d2c..dd5bbb0ff97f 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-85.0.4183.15 b/metadata/md5-cache/www-client/chromium-85.0.4183.26
similarity index 94%
rename from metadata/md5-cache/www-client/chromium-85.0.4183.15
rename to metadata/md5-cache/www-client/chromium-85.0.4183.26
index 9820d26fda86..06bcd53676e4 100644
--- a/metadata/md5-cache/www-client/chromium-85.0.4183.15
+++ b/metadata/md5-cache/www-client/chromium-85.0.4183.26
@@ -11,6 +11,6 @@ RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= de
 REQUIRED_USE=component-build? ( !suid ) wayland? ( ozone )
 RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
 SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.15.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://www.x.org/releases/individual/proto/xcb-proto-1.14.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-85-patchset-2/chromium-85-patchset-2.tar.xz
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-85.0.4183.26.tar.xz https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip https://github.com/stha09/chromium-patches/releases/download/chromium-85-patchset-2/chromium-85-patchset-2.tar.xz
 _eclasses_=check-reqs	7e3fd1855a5e1b50bb9e80827b3f672d	chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	132cbb376048d079b5a012f5467c4e7f	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	portability	e8f7ef3a41965b21a734550f8a94c1c6	python-any-r1	54a3178500786b0a7ede4a23b7f2a6ad	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=0957d0ac51812d2c265955bd5cfe7cc0
+_md5_=e158ef099f00ad851ab11f00ef06321b
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.15 b/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.26
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.15
rename to metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.26
index 80e10b6061f9..aa89c3e531dc 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.15
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.26
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4183.15-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4183.26-1_amd64.deb
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	desktop	7fd20552ce4cc97e8acb132a499a7dd8	eapi7-ver	f9ec87e93172b25ce65a85303dc06964	epatch	ed88001f77c6dd0d5f09e45c1a5b480e	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	gnome2-utils	893e828f0f25f070f0b38d20c83c7670	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	2477ebe553d3e4d2c606191fe6c33602	pax-utils	a41d1fd1c111289ffa04490de6ee79d7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
 _md5_=7a41e42aa6aabb9c2ad50b2425df90d6
diff --git a/metadata/md5-cache/www-client/opera-beta-70.0.3728.46 b/metadata/md5-cache/www-client/opera-beta-70.0.3728.46
new file mode 100644
index 000000000000..f2f77c29b5b1
--- /dev/null
+++ b/metadata/md5-cache/www-client/opera-beta-70.0.3728.46
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DESCRIPTION=A fast and secure web browser
+EAPI=7
+HOMEPAGE=https://www.opera.com/
+IUSE=kernel_linux +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_fi +l10n_fil +l10n_fr +l10n_fr-CA +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_ko +l10n_lt +l10n_lv +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64
+LICENSE=OPERA-2014
+RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype net-misc/curl net-print/cups sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libnotify x11-libs/pango[X]
+SLOT=0
+SRC_URI=amd64? ( https://download1.operacdn.com/pub/opera-beta/70.0.3728.46/linux/opera-beta_70.0.3728.46_amd64.deb https://download2.operacdn.com/pub/opera-beta/70.0.3728.46/linux/opera-beta_70.0.3728.46_amd64.deb https://download3.operacdn.com/pub/opera-beta/70.0.3728.46/linux/opera-beta_70.0.3728.46_amd64.deb https://download4.operacdn.com/pub/opera-beta/70.0.3728.46/linux/opera-beta_70.0.3728.46_amd64.deb )
+_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	fcb2aa98e1948b835b5ae66ca52868c5	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
+_md5_=0b9146bb7876262cb23b575125f532c8
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index eb82f072b13b..e1ec51ee6f53 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.15_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.26_alpha
similarity index 91%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.15_alpha
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.26_alpha
index 4e02f2ae705e..8b385e53339c 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.15_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.26_alpha
@@ -7,6 +7,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4183.15-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_85.0.4183.26-1_amd64.deb
 _eclasses_=multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
 _md5_=fa4ad51e7a151139019e9e894db010f1
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index 0bf855ad6076..11def8927588 100644
Binary files a/metadata/md5-cache/x11-drivers/Manifest.gz and b/metadata/md5-cache/x11-drivers/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.57 b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.57
index e8213aab19aa..a8c5262a6db1 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-450.57
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-450.57
@@ -5,7 +5,7 @@ DESCRIPTION=NVIDIA Accelerated Graphics Driver
 EAPI=7
 HOMEPAGE=https://www.nvidia.com/Download/Find.aspx
 IUSE=compat +driver gtk3 kernel_FreeBSD kernel_linux +kms +libglvnd multilib static-libs +tools uvm wayland +X kernel_linux kernel_linux kernel_linux abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_riscv_lp64d abi_riscv_lp64 abi_s390_32 abi_s390_64
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=GPL-2 NVIDIA-r2
 RDEPEND=driver? ( kernel_linux? ( acct-group/video ) ) kernel_linux? ( >=sys-libs/glibc-2.6.1 ) tools? ( dev-libs/atk dev-libs/glib:2 dev-libs/jansson gtk3? ( x11-libs/gtk+:3 ) x11-libs/cairo x11-libs/gdk-pixbuf[X] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXv x11-libs/libXxf86vm x11-libs/pango[X] ) X? ( !libglvnd? ( >=app-eselect/eselect-opengl-1.0.9 ) libglvnd? ( media-libs/libglvnd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !app-eselect/eselect-opengl ) app-misc/pax-utils ) tools? ( !media-video/nvidia-settings ) uvm? ( >=virtual/opencl-3 ) wayland? ( dev-libs/wayland[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( <x11-base/xorg-server-1.20.99:= >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libvdpau-1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_riscv_lp64d(-)?,abi_riscv_lp64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( net-libs/libtirpc ) kernel_linux? ( virtual/modutils )
 REQUIRED_USE=tools? ( X ) static-libs? ( tools )
@@ -13,4 +13,4 @@ RESTRICT=bindist mirror test
 SLOT=0/450
 SRC_URI=amd64-fbsd? ( https://us.download.nvidia.com/XFree86/FreeBSD-x86_64/450.57/NVIDIA-FreeBSD-x86_64-450.57.tar.gz ) amd64? ( https://us.download.nvidia.com/XFree86/Linux-x86_64/450.57/NVIDIA-Linux-x86_64-450.57.run ) tools? ( https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-450.57.tar.bz2 )
 _eclasses_=desktop	7fd20552ce4cc97e8acb132a499a7dd8	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	f1194291b9a1baca337c1c89b5f7f365	linux-info	c90a203b1c14cfa77bd3e37a0e96c955	linux-mod	9991808b521b5a8c569c9c4ccf8893f6	multibuild	b2c915190b051f55a23b9354b9849847	multilib	2477ebe553d3e4d2c606191fe6c33602	multilib-build	8ad5b5535b73a8971881f09277b939f4	multilib-minimal	8bddda43703ba94d8341f4e247f97566	nvidia-driver	a97e90b59a0f3927b9782cb2cae0445e	portability	e8f7ef3a41965b21a734550f8a94c1c6	readme.gentoo-r1	22ae82e140bdd95d17a34fd5fd733190	systemd	71fd8d2065d102753fb9e4d20eaf3e9f	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	udev	452708c3f55cf6e918b045adb949a9e6	unpacker	8ee8c1a2f31437d1766aac890d07a7f4
-_md5_=e81af24ed4a0afaba5c33586ae3cd539
+_md5_=fa3dd31085cee769224ee8b97aba7ca4
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index b71c50fc947b..6d6cef1011e9 100644
Binary files a/metadata/md5-cache/x11-misc/Manifest.gz and b/metadata/md5-cache/x11-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/x11-misc/qt5ct-1.0 b/metadata/md5-cache/x11-misc/qt5ct-1.0
index c86e66e9bf45..d7bfd73d4235 100644
--- a/metadata/md5-cache/x11-misc/qt5ct-1.0
+++ b/metadata/md5-cache/x11-misc/qt5ct-1.0
@@ -4,10 +4,10 @@ DESCRIPTION=Qt5 configuration tool, similar to qtconfig for Qt4
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/qt5ct/
 IUSE=+dbus
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD-2
 RDEPEND=dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5= dev-qt/qtwidgets:5 dbus? ( dev-qt/qtdbus:5 dev-qt/qtgui:5[dbus] )
 SLOT=0
 SRC_URI=https://download.sourceforge.net/qt5ct/qt5ct-1.0.tar.bz2
 _eclasses_=estack	686eaab303305a908fd57b2fd7617800	multilib	2477ebe553d3e4d2c606191fe6c33602	qmake-utils	4eb5e05ef7ee630c003e3f0edc094135	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb
-_md5_=73b65d4ff5b8ba6de3fcaacba6f7520f
+_md5_=eaea6362fcf9af1b512b15740d92c0d9
diff --git a/metadata/md5-cache/x11-misc/zim-0.73.1 b/metadata/md5-cache/x11-misc/zim-0.73.1
index da6d5412c7ab..31af01b6adb6 100644
--- a/metadata/md5-cache/x11-misc/zim-0.73.1
+++ b/metadata/md5-cache/x11-misc/zim-0.73.1
@@ -5,7 +5,7 @@ DESCRIPTION=A desktop wiki
 EAPI=7
 HOMEPAGE=https://zim-wiki.org/ https://github.com/zim-desktop-wiki/zim-desktop-wiki
 IUSE=test python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~arm x86
 LICENSE=BSD GPL-2+
 RDEPEND=python_single_target_python3_6? ( dev-python/pygobject:3[python_targets_python3_6(-)] dev-python/pyxdg[python_targets_python3_6(-)] ) python_single_target_python3_7? ( dev-python/pygobject:3[python_targets_python3_7(-)] dev-python/pyxdg[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] dev-python/pyxdg[python_targets_python3_8(-)] ) x11-libs/gtk+:3[introspection] x11-misc/xdg-utils python_single_target_python3_6? ( dev-lang/python:3.6[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_6] ) python_single_target_python3_7? ( dev-lang/python:3.7[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_7] ) python_single_target_python3_8? ( dev-lang/python:3.8[sqlite] >=dev-lang/python-exec-2:=[python_targets_python3_8] )
 REQUIRED_USE=^^ ( python_single_target_python3_6 python_single_target_python3_7 python_single_target_python3_8 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/zim-desktop-wiki/zim-desktop-wiki/archive/0.73.1.tar.gz -> zim-0.73.1.tar.gz
 _eclasses_=distutils-r1	0dda1d9008ac0b2530588115a772d99d	multilib	2477ebe553d3e4d2c606191fe6c33602	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	674c48c926cbb44e91b656e0399d8f54	python-utils-r1	cae3d65c47270c9a8c4880076996c09c	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	virtualx	e49dbce7ac14426e1155497476915307	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=03900f43911f55df4368f8594c1b8709
+_md5_=9ef94a646185658801580d4119486ada
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index ab98aa219123..f2dedc60436b 100644
Binary files a/metadata/md5-cache/xfce-base/Manifest.gz and b/metadata/md5-cache/xfce-base/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-base/libxfce4util-4.15.2 b/metadata/md5-cache/xfce-base/libxfce4util-4.15.2
new file mode 100644
index 000000000000..a6fd5249a561
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/libxfce4util-4.15.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/glib-2.42 introspection? ( dev-libs/gobject-introspection:= ) dev-util/intltool dev-util/gtk-doc-am sys-devel/gettext virtual/pkgconfig vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+DESCRIPTION=A basic utility library for the Xfce desktop environment
+EAPI=7
+HOMEPAGE=https://git.xfce.org/xfce/libxfce4util/
+IUSE=introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2+ GPL-2+
+RDEPEND=>=dev-libs/glib-2.42 introspection? ( dev-libs/gobject-introspection:= )
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/7
+SRC_URI=https://archive.xfce.org/src/xfce/libxfce4util/4.15/libxfce4util-4.15.2.tar.bz2
+_eclasses_=eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
+_md5_=3f8d9b92f490fdc725847c5296eacf68
diff --git a/metadata/md5-cache/xfce-base/xfconf-4.15.0 b/metadata/md5-cache/xfce-base/xfconf-4.15.0
new file mode 100644
index 000000000000..63630309ff73
--- /dev/null
+++ b/metadata/md5-cache/xfce-base/xfconf-4.15.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare test
+DEPEND=>=dev-libs/glib-2.42 sys-apps/dbus >=xfce-base/libxfce4util-4.14:= introspection? ( dev-libs/gobject-introspection:= ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1 dev-util/gdbus-codegen dev-util/glib-utils dev-util/intltool virtual/pkgconfig sys-devel/gettext vala? ( || ( dev-lang/vala:0.48 dev-lang/vala:0.46 dev-lang/vala:0.44 dev-lang/vala:0.40 dev-lang/vala:0.36 ) )
+DESCRIPTION=A configuration management system for Xfce
+EAPI=7
+HOMEPAGE=https://www.xfce.org/projects/
+IUSE=debug introspection vala
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/glib-2.42 sys-apps/dbus >=xfce-base/libxfce4util-4.14:= introspection? ( dev-libs/gobject-introspection:= ) !<xfce-base/xfce4-panel-4.13.1 !<xfce-base/xfce4-settings-4.13.1
+REQUIRED_USE=vala? ( introspection )
+SLOT=0/3
+SRC_URI=https://archive.xfce.org/src/xfce/xfconf/4.15/xfconf-4.15.0.tar.bz2
+_eclasses_=bash-completion-r1	e5f9c3faab3ab3d1e7e007daa8c736ef	eutils	fcb2aa98e1948b835b5ae66ca52868c5	multilib	2477ebe553d3e4d2c606191fe6c33602	toolchain-funcs	605c126bed8d87e4378d5ff1645330cb	vala	5b72a65a36d681d65aef5f7b4b8b2cb6
+_md5_=a333c2968200df39a3aa508575e196b1
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 6688a3a9444a..a57c9ba2c06b 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10 b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
index 693061d67934..7c9890a80052 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
+++ b/metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
@@ -4,9 +4,9 @@ DESCRIPTION=Screen saver and locker (port of MATE screensaver)
 EAPI=7
 HOMEPAGE=https://git.xfce.org/apps/xfce4-screensaver/about/
 IUSE=consolekit elogind +locking opengl pam systemd
-KEYWORDS=~alpha amd64 ~ppc ~ppc64 x86
+KEYWORDS=~alpha amd64 ~arm64 ~ppc ~ppc64 x86
 LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/dbus-glib-0.30 >=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=x11-libs/libwnck-3.20:3 x11-libs/libICE:= x11-libs/libX11:= x11-libs/libXScrnSaver:= x11-libs/libXext:= x11-libs/libXxf86vm:= >=x11-libs/libXrandr-1.3:= >=x11-libs/libxklavier-5.2:= >=xfce-base/garcon-0.5.0:= >=xfce-base/libxfce4ui-4.12.1:= >=xfce-base/libxfce4util-4.12.1:= >=xfce-base/xfconf-4.12.1:= consolekit? ( sys-auth/consolekit ) elogind? ( sys-auth/elogind ) locking? ( pam? ( sys-libs/pam ) ) opengl? ( virtual/opengl ) systemd? ( sys-apps/systemd:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-screensaver/0.1/xfce4-screensaver-0.1.10.tar.bz2
-_md5_=f84d0931a65c91554a7397292c6d4589
+_md5_=c78f7d71b5176055ac74b6ce98deeddf
diff --git a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3 b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
index d5476ca103ad..7327770f11a3 100644
--- a/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
+++ b/metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
@@ -4,9 +4,9 @@ DESCRIPTION=Daemon to control volume up/down and mute keys for pulseaudio
 EAPI=6
 HOMEPAGE=https://git.xfce.org/apps/xfce4-volumed-pulse/
 IUSE=libnotify
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-3
 RDEPEND=>=dev-libs/glib-2.16:2= dev-libs/keybinder:3= >=media-sound/pulseaudio-0.9.19:=[glib] >=x11-libs/gtk+-3.20:3= >=xfce-base/xfconf-4.8:= libnotify? ( x11-libs/libnotify:= )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/apps/xfce4-volumed-pulse/0.2/xfce4-volumed-pulse-0.2.3.tar.bz2
-_md5_=94bae96477b1cd8d6fb516cb82918e68
+_md5_=94150cfc2e2515fd6fe6eb42fb55dc6e
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 45f65a099092..2f263507f7fc 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 12044 BLAKE2B 547415c33cd1d5d0e90a80f7a59574b3586b17cced894eeab2dd80042c3bb6aca4b85cda93f72c8edb89d80a5480978ea22a242f346c7a98fad2a95a214b4874 SHA512 a55a6789e7d66503ccbe69d73f70534bb16956cbc073435959464fead34e7db53e6daf9c756eb92e635e27550f6e05cf0aab7bd9d83a005f5e26dc0513b3d06f
-TIMESTAMP 2020-07-16T10:08:23Z
+TIMESTAMP 2020-07-17T06:08:29Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8QJxdfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl8RQF1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCAig//eDoJiHAdHo0LnZyx9oWrdB7Wtfzms69mjpTNyYMVHOeYjOXh0+FD7kS1
-KJuH1nxzr5M2e1RzRA0QvpR3h9QUDsdmBBv6SW2y4hTWXMJnxzfoQxcOxt8nMOKd
-g8oIZo7ZbPpeMi2e41fyJvsHwU7amHcUeJG51XgF7Y/fxEgdWHWeeoEr5aKLzRWg
-tQdPCV8qY2D6hH7yX/NsS5uG2C9ze7q/oFjXIpCL5qG4xjV6PK2GJKWdrphaiJKs
-Ej1xO3XZnJi3hWdXEfxiaJJaKbPtvK93NFjgjLiw3xMhdVDvtyt00aaLYHdYh8rw
-KVdLSQnQzlwlcaCTz3MFXJaDZHYSD9+02TMoq2WvU4j2SR89ny2xBbmIznpnSFno
-5v/XJLwAHl7T8VUvorj/VW2hi4zMkZwp4x552xEeK2cy+RNNJHTyZhdBHMv39k/W
-hbtrv7o2B6CkDOhLfTV66Lz1j8dOn2rhKjme+MWKlguv+gJq2UjdhtyHe1f+qqjM
-RlfgDJs75VMe64xqFx/L8QExZd7B6TF4KVC4W30NFdlfznVIOz1bbqe1dZPwNUmd
-3ozmfTviHfNuBWA7pl94392p/8FX0S1xoiSfdb2DbUnSHxA5o1AtIKNgOFBxj7UJ
-o+ver1Arh/CelNYBc5TmkLS1OYej3dU3zP18nzFSkR/Mw8bwZJA=
-=ReK6
+klCZkg//QJVqnIbfD37sXuZhB/C6Ni2zUibUCTBMy1AT3Q6JlQ3Uh9dsZwXKbSbc
+h6RIJ5UI0rBVxiUMzg5oAV6wa5NLjcF09nEeTYDWEGg9g8nCKd6w3dXXxI7mEnw2
+3Tv/4VDuJfjMIrI8GBBbbwOOqXC0donHd1QWG85+6WXIDgJckCbtEGkdgSLnXM4l
+fP6A+UkxiBjJDzHMjl1TUH3Ey7z0Ttc2Q6SnoW2AfxvZq8iHowERvRnW5egaUJvx
+qBqW4pal19QRxEulgthcxLnnRjW7bKgfgLgBUr/UbzuMz7Ti25gIWayJ0b6M+bj+
+5dLCuAkgyQXB1ndeHrXQYMIFE6zAdyc2tOfN1xJq8KQZvtUJa9iU21KFR40M3i2q
+ItiaVOJG8UBjYCV53iOvli84BrPgEZjcvggqnEmw6Ech8Q4sGxN6ur4FXZ3Kjs7N
+a1xzrkHx+DV6TvG155ouARlDjVxn/odtF1uQ6i/kvHrqirs2M1DgTCxLiA4Q/NoV
+7oAu4MxY1U9Iw4Oozr9N/lIL7O7OVGd7pW6b0AqoG8i4ol9FDPadSPqGB3yAgbTY
+KxGnZbxX65mI4XUypsC99fgFmHJ0YcBt3HVdQwXpZ4CAKLTdOhDoJDVFg+rNZfBm
+NOs3ENmv4KFn1hFQEhY9Rv/o+Q0BVJjQGOBImwoc+9o62DY6RaM=
+=p513
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 516d00e727ad..345ee6956a2c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Jul 2020 10:08:20 +0000
+Fri, 17 Jul 2020 06:08:26 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 9653e8983fb4..53708fccccff 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu 16 Jul 2020 10:08:20 AM UTC
+Fri 17 Jul 2020 06:08:26 AM UTC
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index e64c55ecbeab..29435b7eafd3 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -554,7 +554,7 @@
 2005062039 ./app-admin/eselect/eselect-1.4.16.ebuild
 2005062039 ./app-admin/eselect/eselect-9999.ebuild
 1910042139 ./app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
-2006091639 ./app-admin/exo/exo-1.11.0.ebuild
+2007161609 ./app-admin/exo/exo-1.14.0.ebuild
 2004032241 ./app-admin/fam/fam-2.7.0_p17_p2.ebuild
 2006221638 ./app-admin/fam/fam-2.7.0_p17_p3.ebuild
 1907151839 ./app-admin/fetchlog/fetchlog-1.4-r1.ebuild
@@ -785,6 +785,7 @@
 2004211009 ./app-admin/sudo/sudo-1.8.31.ebuild
 2005122039 ./app-admin/sudo/sudo-1.9.0-r1.ebuild
 2006191109 ./app-admin/sudo/sudo-1.9.1.ebuild
+2007161909 ./app-admin/sudo/sudo-1.9.2_rc2.ebuild
 2003261841 ./app-admin/superadduser/superadduser-1.15.ebuild
 2004211009 ./app-admin/superadduser/superadduser-1.0.9.ebuild
 2002111439 ./app-admin/supervisor/supervisor-4.0.4.ebuild
@@ -838,7 +839,7 @@
 2003280339 ./app-admin/yadm/yadm-2.4.0.ebuild
 2006121739 ./app-admin/graylog/graylog-3.3.1.ebuild
 2006080009 ./app-antivirus/clamav/clamav-0.102.3.ebuild
-2006211709 ./app-antivirus/clamav/clamav-0.102.3-r1.ebuild
+2007170439 ./app-antivirus/clamav/clamav-0.102.4.ebuild
 2006040938 ./app-antivirus/clamtk/clamtk-6.03.ebuild
 2006200239 ./app-antivirus/clamtk/clamtk-6.03-r1.ebuild
 2005190038 ./app-antivirus/fangfrisch/fangfrisch-1.2.0-r1.ebuild
@@ -1245,13 +1246,13 @@
 2007091108 ./app-crypt/ccid/ccid-1.4.33.ebuild
 1904282339 ./app-crypt/ccrypt/ccrypt-1.11.ebuild
 1912210209 ./app-crypt/ccrypt/ccrypt-1.11-r1.ebuild
-2007030309 ./app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
-2007090108 ./app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
-2007090108 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
+2007170709 ./app-crypt/certbot-apache/certbot-apache-1.5.0.ebuild
+2007170709 ./app-crypt/certbot-apache/certbot-apache-1.6.0.ebuild
+2007170709 ./app-crypt/certbot-apache/certbot-apache-9999.ebuild
 2002180109 ./app-crypt/certbot-dns-nsone/certbot-dns-nsone-0.39.0-r1.ebuild
-2007030309 ./app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
-2007090108 ./app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
-2007090108 ./app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
+2007170709 ./app-crypt/certbot-nginx/certbot-nginx-1.5.0.ebuild
+2007170709 ./app-crypt/certbot-nginx/certbot-nginx-1.6.0.ebuild
+2007170709 ./app-crypt/certbot-nginx/certbot-nginx-9999.ebuild
 2007030309 ./app-crypt/certbot/certbot-1.5.0.ebuild
 2007090108 ./app-crypt/certbot/certbot-1.6.0.ebuild
 2007090108 ./app-crypt/certbot/certbot-9999.ebuild
@@ -1977,7 +1978,7 @@
 2003312109 ./app-editors/mg/mg-20180408.ebuild
 1901101609 ./app-editors/moe/moe-1.10.ebuild
 1808152309 ./app-editors/moe/moe-1.9.ebuild
-2006120139 ./app-editors/mousepad/mousepad-0.4.2.ebuild
+2007161739 ./app-editors/mousepad/mousepad-0.4.2.ebuild
 2003261841 ./app-editors/nano/nano-9999.ebuild
 2004032241 ./app-editors/nano/nano-4.6-r1.ebuild
 2004081109 ./app-editors/nano/nano-4.9.2.ebuild
@@ -2473,10 +2474,10 @@
 2001291739 ./app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0-r1.ebuild
 2005140909 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-3.1.0-r4.ebuild
 2007110438 ./app-emulation/qemu-riscv64-bin/qemu-riscv64-bin-5.0.0.ebuild
-2006212039 ./app-emulation/qemu/qemu-5.0.0.ebuild
-2007100209 ./app-emulation/qemu/qemu-5.0.0-r1.ebuild
-2007111739 ./app-emulation/qemu/qemu-5.0.0-r2.ebuild
-2007111739 ./app-emulation/qemu/qemu-9999.ebuild
+2007161609 ./app-emulation/qemu/qemu-5.0.0-r1.ebuild
+2007161609 ./app-emulation/qemu/qemu-5.0.0-r2.ebuild
+2007161609 ./app-emulation/qemu/qemu-5.0.0.ebuild
+2007161609 ./app-emulation/qemu/qemu-9999.ebuild
 1803221738 ./app-emulation/qt-virt-manager/qt-virt-manager-9999.ebuild
 1912100639 ./app-emulation/reg/reg-0.16.1.ebuild
 1702282250 ./app-emulation/rex-client/rex-client-9999.ebuild
@@ -2686,6 +2687,7 @@
 2005172009 ./app-forensics/afl/afl-2.55b.ebuild
 2005172009 ./app-forensics/afl/afl-2.56b.ebuild
 1804180139 ./app-forensics/aide/aide-0.16-r1.ebuild
+2007161809 ./app-forensics/aide/aide-0.16.2_p20200614.ebuild
 1905191439 ./app-forensics/air/air-2.0.0-r2.ebuild
 2003261841 ./app-forensics/chkrootkit/chkrootkit-0.53.ebuild
 2004032241 ./app-forensics/chkrootkit/chkrootkit-0.52.ebuild
@@ -3027,6 +3029,7 @@
 1901100209 ./app-metrics/nginx-lua-prometheus/nginx-lua-prometheus-0.1_pre20170610.ebuild
 1912031309 ./app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.3.ebuild
 2007150209 ./app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7.ebuild
+2007170409 ./app-metrics/nginx-vts-exporter/nginx-vts-exporter-0.10.7-r1.ebuild
 1912031309 ./app-metrics/node_exporter/node_exporter-0.18.1.ebuild
 2003160239 ./app-metrics/node_exporter/node_exporter-1.0.0_rc0-r1.ebuild
 2003152309 ./app-metrics/node_exporter/node_exporter-1.0.0_rc0.ebuild
@@ -3176,8 +3179,9 @@
 1903180209 ./app-misc/fdutils/fdutils-5.5.20060227-r1.ebuild
 1805212238 ./app-misc/fdutils/fdutils-5.5.20060227.ebuild
 2005211138 ./app-misc/fhem/fhem-6.0.ebuild
-1910111840 ./app-misc/figlet/figlet-2.2.5-r1.ebuild
 1910111840 ./app-misc/figlet/figlet-2.2.5.ebuild
+2007161639 ./app-misc/figlet/figlet-2.2.5-r1.ebuild
+2007161639 ./app-misc/figlet/figlet-9999.ebuild
 2002230040 ./app-misc/flirc/flirc-3.22.4.ebuild
 2002230040 ./app-misc/flirc/flirc-3.24.0.ebuild
 2002230040 ./app-misc/flirc/flirc-3.25.2.ebuild
@@ -3618,12 +3622,16 @@
 2004032241 ./app-pda/jpilot/jpilot-1.8.2-r1.ebuild
 2005091109 ./app-pda/libimobiledevice/libimobiledevice-1.2.1_pre20200220.ebuild
 2005101639 ./app-pda/libimobiledevice/libimobiledevice-1.2.0-r1.ebuild
+2007161609 ./app-pda/libimobiledevice/libimobiledevice-1.3.0.ebuild
 2005091109 ./app-pda/libplist/libplist-2.1.0.ebuild
+2007161609 ./app-pda/libplist/libplist-2.2.0.ebuild
 1911201439 ./app-pda/libusbmuxd/libusbmuxd-1.0.10-r1.ebuild
 2005091109 ./app-pda/libusbmuxd/libusbmuxd-2.0.1.ebuild
+2007161609 ./app-pda/libusbmuxd/libusbmuxd-2.0.2.ebuild
 2004032241 ./app-pda/pilot-link/pilot-link-0.12.5-r2.ebuild
 2003240309 ./app-pda/usbmuxd/usbmuxd-1.1.0.ebuild
 2005121009 ./app-pda/usbmuxd/usbmuxd-1.1.1_pre20200121.ebuild
+2007161609 ./app-pda/usbmuxd/usbmuxd-1.1.1.ebuild
 1904080809 ./app-portage/cfg-update/cfg-update-1.8.9.ebuild
 1702282250 ./app-portage/conf-update/conf-update-1.0.3-r1.ebuild
 1907192139 ./app-portage/cpuid2cpuflags/cpuid2cpuflags-9999.ebuild
@@ -3752,7 +3760,7 @@
 2006141709 ./app-portage/nattka/nattka-9999.ebuild
 2006142209 ./app-portage/nattka/nattka-0.2.7.ebuild
 2006150009 ./app-portage/nattka/nattka-0.2.8.ebuild
-2007160739 ./app-portage/nattka/nattka-0.2.9.ebuild
+2007161609 ./app-portage/nattka/nattka-0.2.9.ebuild
 2005191438 ./app-portage/gander/gander-0.0.1.ebuild
 2001310039 ./app-shells/autojump/autojump-22.2.4-r4.ebuild
 2001310039 ./app-shells/autojump/autojump-22.5.1.ebuild
@@ -5305,7 +5313,7 @@
 2002201039 ./dev-db/sqlcl-bin/sqlcl-bin-19.4.0.354.0937.ebuild
 1902050109 ./dev-db/sqldeveloper/sqldeveloper-4.2.0.17.089.1709.ebuild
 2007152139 ./dev-db/sqlite/sqlite-3.31.1.ebuild
-2007152139 ./dev-db/sqlite/sqlite-3.32.3.ebuild
+2007170609 ./dev-db/sqlite/sqlite-3.32.3.ebuild
 2002112051 ./dev-db/sqlitebrowser/sqlitebrowser-3.11.1-r1.ebuild
 1711201845 ./dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
 1902152209 ./dev-db/sqliteodbc/sqliteodbc-0.99.ebuild
@@ -7527,7 +7535,7 @@
 1702282250 ./dev-java/ini4j/ini4j-0.5.1.ebuild
 1806251339 ./dev-java/ini4j/ini4j-0.5.2.ebuild
 1702282250 ./dev-java/invokebinder/invokebinder-1.6.ebuild
-1910051539 ./dev-java/iso-relax/iso-relax-20050331-r4.ebuild
+2007170209 ./dev-java/iso-relax/iso-relax-20050331-r4.ebuild
 1702282250 ./dev-java/istack-commons-buildtools/istack-commons-buildtools-2.22-r1.ebuild
 1702282250 ./dev-java/istack-commons-runtime/istack-commons-runtime-2.22.ebuild
 1702282250 ./dev-java/istack-commons-soimp/istack-commons-soimp-2.22.ebuild
@@ -7562,6 +7570,7 @@
 1702282250 ./dev-java/java-apicheck/java-apicheck-0_p20150907.ebuild
 2005071309 ./dev-java/java-config/java-config-2.2.0-r4.ebuild
 2007091509 ./dev-java/java-config/java-config-2.3.1.ebuild
+2007170039 ./dev-java/java-config/java-config-9999.ebuild
 1702282250 ./dev-java/java-dep-check/java-dep-check-0.3-r1.ebuild
 1702282250 ./dev-java/java-dep-check/java-dep-check-0.4.ebuild
 2005172009 ./dev-java/java-getopt/java-getopt-1.0.14.ebuild
@@ -7617,8 +7626,8 @@
 1909232039 ./dev-java/jdbc2-stdext/jdbc2-stdext-2.0-r3.ebuild
 1903162239 ./dev-java/jdbm/jdbm-0.12-r3.ebuild
 1912111539 ./dev-java/jdepend/jdepend-2.9-r5.ebuild
-1912110241 ./dev-java/jdom/jdom-2.0.6-r4.ebuild
 1912111539 ./dev-java/jdom/jdom-1.1.3.ebuild
+2007170209 ./dev-java/jdom/jdom-2.0.6-r4.ebuild
 1702282250 ./dev-java/jdynamite/jdynamite-1.2-r1.ebuild
 1702282250 ./dev-java/jebl/jebl-2013.02.18.ebuild
 1912031339 ./dev-java/jempbox/jempbox-1.7.1-r1.ebuild
@@ -7799,9 +7808,11 @@
 2005101109 ./dev-java/openjdk-bin/openjdk-bin-8.252_p09.ebuild
 2006020108 ./dev-java/openjdk-bin/openjdk-bin-11.0.7_p10-r1.ebuild
 2007152039 ./dev-java/openjdk-bin/openjdk-bin-11.0.8_p10.ebuild
+2007162209 ./dev-java/openjdk-bin/openjdk-bin-8.262_p10.ebuild
 2005081846 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-8.252_p09.ebuild
 2006020138 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.7_p10-r1.ebuild
 2007152109 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-11.0.8_p10-r1.ebuild
+2007162209 ./dev-java/openjdk-jre-bin/openjdk-jre-bin-8.262_p10.ebuild
 2005110809 ./dev-java/openjdk/openjdk-11.0.7_p10.ebuild
 2005240709 ./dev-java/openjdk/openjdk-8.252_p09.ebuild
 2007150109 ./dev-java/openjdk/openjdk-11.0.8_p10.ebuild
@@ -8060,6 +8071,10 @@
 2005092139 ./dev-lang/go/go-9999.ebuild
 2006060909 ./dev-lang/go/go-1.13.12.ebuild
 2006060909 ./dev-lang/go/go-1.14.4.ebuild
+2007170509 ./dev-lang/go/go-1.13.13.ebuild
+2007170539 ./dev-lang/go/go-1.13.14.ebuild
+2007170509 ./dev-lang/go/go-1.14.5.ebuild
+2007170539 ./dev-lang/go/go-1.14.6.ebuild
 1707191842 ./dev-lang/gprolog/gprolog-1.4.4.ebuild
 2005281409 ./dev-lang/gprolog/gprolog-1.4.5.ebuild
 1911101840 ./dev-lang/helium/helium-1.8.1.ebuild
@@ -8181,7 +8196,7 @@
 2006121739 ./dev-lang/php/php-7.4.7.ebuild
 2007151209 ./dev-lang/php/php-7.2.32.ebuild
 2007151209 ./dev-lang/php/php-7.3.20.ebuild
-2007151209 ./dev-lang/php/php-7.4.8.ebuild
+2007170339 ./dev-lang/php/php-7.4.8-r1.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.4.1.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.5.0.ebuild
 1912111539 ./dev-lang/polyml/polyml-5.5.1.ebuild
@@ -8195,11 +8210,11 @@
 2006092039 ./dev-lang/python/python-3.8.2-r2.ebuild
 2006101009 ./dev-lang/python/python-3.9.0_beta3.ebuild
 2006202209 ./dev-lang/python/python-3.6.10-r2.ebuild
-2007091209 ./dev-lang/python/python-3.8.3-r1.ebuild
-2007142139 ./dev-lang/python/python-3.6.11-r1.ebuild
-2007142139 ./dev-lang/python/python-3.7.8-r1.ebuild
 2007142139 ./dev-lang/python/python-3.8.4.ebuild
 2007142139 ./dev-lang/python/python-3.9.0_beta4.ebuild
+2007170139 ./dev-lang/python/python-3.6.11-r1.ebuild
+2007170139 ./dev-lang/python/python-3.7.8-r1.ebuild
+2007170139 ./dev-lang/python/python-3.8.3-r1.ebuild
 2005271909 ./dev-lang/qu-prolog/qu-prolog-10.1.ebuild
 2005271909 ./dev-lang/qu-prolog/qu-prolog-10.2.ebuild
 2005271939 ./dev-lang/qu-prolog/qu-prolog-10.3.ebuild
@@ -8501,7 +8516,7 @@
 2006132027 ./dev-libs/icu-le-hb/icu-le-hb-1.0.3-r1.ebuild
 2006062038 ./dev-libs/icu/icu-67.1.ebuild
 1702282250 ./dev-libs/igraph/igraph-0.7.1-r2.ebuild
-1910111840 ./dev-libs/iksemel/iksemel-1.4-r1.ebuild
+2007162109 ./dev-libs/iksemel/iksemel-1.4-r1.ebuild
 2004032241 ./dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r1.ebuild
 2005121709 ./dev-libs/ilbc-rfc3951/ilbc-rfc3951-0-r2.ebuild
 2003261841 ./dev-libs/iniparser/iniparser-4.1.ebuild
@@ -8669,8 +8684,8 @@
 2002230040 ./dev-libs/libf2c/libf2c-20130927-r1.ebuild
 1806020408 ./dev-libs/libfastjson/libfastjson-0.99.8.ebuild
 2003261841 ./dev-libs/libffi-compat/libffi-compat-3.2.1-r3.ebuild
-2004130109 ./dev-libs/libffi/libffi-3.3-r1.ebuild
-2007080109 ./dev-libs/libffi/libffi-3.3-r2.ebuild
+2007170009 ./dev-libs/libffi/libffi-3.3-r1.ebuild
+2007170009 ./dev-libs/libffi/libffi-3.3-r2.ebuild
 2005091739 ./dev-libs/libfilezilla/libfilezilla-0.21.0.ebuild
 2005202239 ./dev-libs/libfilezilla/libfilezilla-0.22.0.ebuild
 2006091709 ./dev-libs/libfilezilla/libfilezilla-0.20.2.ebuild
@@ -9163,6 +9178,7 @@
 2006211809 ./dev-libs/spdlog/spdlog-1.6.1.ebuild
 2007062239 ./dev-libs/spdlog/spdlog-1.6.1-r1.ebuild
 2007062239 ./dev-libs/spdlog/spdlog-9999.ebuild
+2007170039 ./dev-libs/spdlog/spdlog-1.7.0.ebuild
 1906051109 ./dev-libs/spsdeclib/spsdeclib-5.1-r1.ebuild
 2002151310 ./dev-libs/squareball/squareball-0.2.0.ebuild
 2002151310 ./dev-libs/squareball/squareball-9999.ebuild
@@ -9181,7 +9197,7 @@
 2004262009 ./dev-libs/tntnet/tntnet-2.2.1-r2.ebuild
 2006080009 ./dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
 2004032241 ./dev-libs/tre/tre-0.8.0-r1.ebuild
-2006222138 ./dev-libs/tre/tre-0.8.0-r2.ebuild
+2007170409 ./dev-libs/tre/tre-0.8.0-r2.ebuild
 1702282250 ./dev-libs/tut/tut-2013.12.18.ebuild
 1702282250 ./dev-libs/tut/tut-2016.12.19.ebuild
 1712042339 ./dev-libs/tvision/tvision-2.1.0_pre2-r4.ebuild
@@ -9296,7 +9312,7 @@
 2006301709 ./dev-libs/libudfread/libudfread-1.1.0.ebuild
 2004240039 ./dev-libs/level-zero/level-zero-0.91.10.ebuild
 2006041708 ./dev-libs/plasma-wayland-protocols/plasma-wayland-protocols-1.0.ebuild
-2006211709 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
+2007170439 ./dev-libs/tomsfastmath/tomsfastmath-0.13.1.ebuild
 2005290339 ./dev-libs/libtimezonemap/libtimezonemap-0.4.6.ebuild
 2006150539 ./dev-libs/libucl/libucl-0.8.1-r1.ebuild
 2006150539 ./dev-libs/libucl/libucl-9999.ebuild
@@ -9336,6 +9352,8 @@
 1910100839 ./dev-lisp/roswell/roswell-19.09.12.102.ebuild
 2001061409 ./dev-lisp/roswell/roswell-19.12.13.103.ebuild
 2002240909 ./dev-lisp/roswell/roswell-20.01.14.104.ebuild
+2007161809 ./dev-lisp/roswell/roswell-20.04.14.105.ebuild
+2007161809 ./dev-lisp/roswell/roswell-20.05.14.106.ebuild
 2002140109 ./dev-lisp/sbcl/sbcl-1.3.11.ebuild
 2002140109 ./dev-lisp/sbcl/sbcl-1.4.9.ebuild
 2002140109 ./dev-lisp/sbcl/sbcl-1.5.6.ebuild
@@ -10257,10 +10275,13 @@
 1912110241 ./dev-perl/Data-ICal/Data-ICal-0.220.0.ebuild
 2007151539 ./dev-perl/Data-ICal/Data-ICal-0.240.0.ebuild
 1912110241 ./dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.150.0.ebuild
+2007161539 ./dev-perl/Data-ObjectDriver/Data-ObjectDriver-0.190.0.ebuild
 2004032241 ./dev-perl/Data-OptList/Data-OptList-0.110.0.ebuild
 1912110241 ./dev-perl/Data-Page-Pageset/Data-Page-Pageset-1.20.0-r1.ebuild
 1912110241 ./dev-perl/Data-Page/Data-Page-2.20.0-r1.ebuild
+2007170809 ./dev-perl/Data-Page/Data-Page-2.30.0.ebuild
 1912110241 ./dev-perl/Data-Perl/Data-Perl-0.2.9-r1.ebuild
+2007170839 ./dev-perl/Data-Perl/Data-Perl-0.2.11.ebuild
 1912110241 ./dev-perl/Data-Random/Data-Random-0.120.0.ebuild
 1912110241 ./dev-perl/Data-Section/Data-Section-0.200.7.ebuild
 1912110241 ./dev-perl/Data-Serializer/Data-Serializer-0.600.0-r1.ebuild
@@ -11074,7 +11095,7 @@
 1702282250 ./dev-perl/Parse-ExuberantCTags/Parse-ExuberantCTags-1.20.0-r1.ebuild
 2004032241 ./dev-perl/Parse-RecDescent/Parse-RecDescent-1.967.15.ebuild
 2002112051 ./dev-perl/Parse-Syslog/Parse-Syslog-1.100.0-r1.ebuild
-2005021939 ./dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
+2007161609 ./dev-perl/Parse-Yapp/Parse-Yapp-1.210.0.ebuild
 1702282250 ./dev-perl/Passwd-Linux/Passwd-Linux-1.300.0.ebuild
 1702282250 ./dev-perl/Passwd-Unix/Passwd-Unix-0.710.0.ebuild
 2004032241 ./dev-perl/PatchReader/PatchReader-0.9.6-r1.ebuild
@@ -12247,7 +12268,7 @@
 1811060509 ./dev-python/blurb/blurb-1.0.7.ebuild
 2006042039 ./dev-python/booleanOperations/booleanOperations-0.9.0-r1.ebuild
 2007140309 ./dev-python/boto/boto-2.49.0-r2.ebuild
-2007160709 ./dev-python/boto/boto-2.49.0-r3.ebuild
+2007170339 ./dev-python/boto/boto-2.49.0-r3.ebuild
 2004292239 ./dev-python/boto3/boto3-9999.ebuild
 2007082308 ./dev-python/boto3/boto3-1.13.26.ebuild
 2007100939 ./dev-python/boto3/boto3-1.14.20.ebuild
@@ -12322,8 +12343,8 @@
 2004261809 ./dev-python/click-threading/click-threading-0.4.4.ebuild
 2004032241 ./dev-python/click/click-6.7-r1.ebuild
 2007081639 ./dev-python/click/click-7.1.2.ebuild
-2006151039 ./dev-python/cliff/cliff-3.3.0.ebuild
 2007081639 ./dev-python/cliff/cliff-3.1.0.ebuild
+2007161509 ./dev-python/cliff/cliff-3.3.0.ebuild
 2005051509 ./dev-python/clint/clint-0.5.1-r1.ebuild
 2001131309 ./dev-python/cloudlib/cloudlib-0.5.0.ebuild
 2007021140 ./dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
@@ -12364,7 +12385,7 @@
 2005072109 ./dev-python/crcmod/crcmod-1.7-r3.ebuild
 2007081939 ./dev-python/croniter/croniter-0.3.30.ebuild
 2004032241 ./dev-python/cryptography/cryptography-2.8-r1.ebuild
-2007091209 ./dev-python/cryptography/cryptography-2.9.ebuild
+2007170209 ./dev-python/cryptography/cryptography-2.9.ebuild
 2004270239 ./dev-python/css-parser/css-parser-1.0.4-r1.ebuild
 2005261339 ./dev-python/cssselect/cssselect-1.1.0.ebuild
 2005032209 ./dev-python/cssselect2/cssselect2-0.3.0.ebuild
@@ -12442,7 +12463,7 @@
 2001051415 ./dev-python/docutils-glep/docutils-glep-9999.ebuild
 2004032241 ./dev-python/docutils-glep/docutils-glep-1.2.ebuild
 2005270939 ./dev-python/docutils/docutils-0.16.ebuild
-2007082339 ./dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
+2007170509 ./dev-python/dogpile-cache/dogpile-cache-0.9.1.ebuild
 2001051415 ./dev-python/dogpile-core/dogpile-core-0.4.1.ebuild
 2007062239 ./dev-python/doit-py/doit-py-0.4.0-r2.ebuild
 2007091139 ./dev-python/doit-py/doit-py-0.5.0.ebuild
@@ -12455,7 +12476,7 @@
 2002041909 ./dev-python/duecredit/duecredit-0.7.0.ebuild
 2003251909 ./dev-python/dugong/dugong-3.7.3.ebuild
 2001051415 ./dev-python/dulwich/dulwich-0.19.6.ebuild
-2005311009 ./dev-python/dulwich/dulwich-0.19.15.ebuild
+2007170439 ./dev-python/dulwich/dulwich-0.19.15.ebuild
 2005181440 ./dev-python/easy-thumbnails/easy-thumbnails-2.7.ebuild
 2003271539 ./dev-python/ebuildtester/ebuildtester-0.1.16.ebuild
 2007082339 ./dev-python/ecdsa/ecdsa-0.15.ebuild
@@ -12564,8 +12585,8 @@
 2007091309 ./dev-python/gevent/gevent-20.6.2.ebuild
 2007132139 ./dev-python/gevent/gevent-20.6.0.ebuild
 2003251539 ./dev-python/geventhttpclient/geventhttpclient-1.3.1-r1.ebuild
-2007091209 ./dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
-2007091309 ./dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
+2007170709 ./dev-python/geventhttpclient/geventhttpclient-1.4.2.ebuild
+2007170439 ./dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
 2001260009 ./dev-python/girder-client/girder-client-2.3.0.ebuild
 2002180109 ./dev-python/git-review/git-review-1.28.0.ebuild
 2007081609 ./dev-python/gitdb/gitdb-4.0.5.ebuild
@@ -12621,7 +12642,7 @@
 2007152339 ./dev-python/httpbin/httpbin-0.7.0.ebuild
 2007160739 ./dev-python/httplib2/httplib2-0.18.1.ebuild
 2003271509 ./dev-python/httpretty/httpretty-0.9.6.ebuild
-2007160509 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+2007170339 ./dev-python/httpretty/httpretty-1.0.2-r1.ebuild
 2005260639 ./dev-python/httpstat/httpstat-1.2.1-r1.ebuild
 2006092339 ./dev-python/humanfriendly/humanfriendly-4.18.ebuild
 2006290209 ./dev-python/humanize/humanize-2.4.1.ebuild
@@ -12649,8 +12670,8 @@
 2003251909 ./dev-python/imapclient/imapclient-2.1.0.ebuild
 2003171839 ./dev-python/iminuit/iminuit-1.3.8.ebuild
 2004032241 ./dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
-2007091409 ./dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
 2007120609 ./dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
+2007170339 ./dev-python/importlib_metadata/importlib_metadata-1.6.1.ebuild
 2006050009 ./dev-python/importlib_resources/importlib_resources-1.5.0-r1.ebuild
 2007041809 ./dev-python/importlib_resources/importlib_resources-3.0.0-r1.ebuild
 2007041239 ./dev-python/incremental/incremental-17.5.0.ebuild
@@ -12701,17 +12722,17 @@
 2006101409 ./dev-python/jdcal/jdcal-1.4.ebuild
 2003271939 ./dev-python/jedi/jedi-0.14.1.ebuild
 2003271939 ./dev-python/jedi/jedi-0.15.2.ebuild
-2006201109 ./dev-python/jedi/jedi-0.17.1.ebuild
 2007091409 ./dev-python/jedi/jedi-0.17.0.ebuild
-2005311309 ./dev-python/jeepney/jeepney-0.4.3.ebuild
+2007170739 ./dev-python/jedi/jedi-0.17.1-r1.ebuild
+2007162239 ./dev-python/jeepney/jeepney-0.4.3.ebuild
 2005220809 ./dev-python/jellyfish/jellyfish-0.8.2.ebuild
 2001051415 ./dev-python/jikanpy/jikanpy-3.4.2.ebuild
 2007091409 ./dev-python/jinja/jinja-2.11.2.ebuild
 2004192015 ./dev-python/jinja2-time/jinja2-time-0.2.0.ebuild
 2002051839 ./dev-python/jinja2_pluralize/jinja2_pluralize-0.3.0.ebuild
 2003252209 ./dev-python/jira/jira-1.0.14-r3.ebuild
-2006150539 ./dev-python/jmespath/jmespath-0.10.0.ebuild
 2006270039 ./dev-python/jmespath/jmespath-0.9.3-r1.ebuild
+2007170509 ./dev-python/jmespath/jmespath-0.10.0.ebuild
 2006011008 ./dev-python/joblib/joblib-0.14.1.ebuild
 2006141709 ./dev-python/joblib/joblib-0.15.1.ebuild
 2007021140 ./dev-python/joblib/joblib-0.16.0.ebuild
@@ -12722,8 +12743,8 @@
 2007091209 ./dev-python/jsondiff/jsondiff-1.2.0.ebuild
 2002041539 ./dev-python/jsonext/jsonext-0.4.2.ebuild
 2001051415 ./dev-python/jsonmerge/jsonmerge-1.6.0.ebuild
-2006230909 ./dev-python/jsonpatch/jsonpatch-1.26.ebuild
 2006270039 ./dev-python/jsonpatch/jsonpatch-1.25.ebuild
+2007170509 ./dev-python/jsonpatch/jsonpatch-1.26.ebuild
 2006121909 ./dev-python/jsonpickle/jsonpickle-1.4.1-r1.ebuild
 2006092309 ./dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
 2004261339 ./dev-python/jsonref/jsonref-0.1.ebuild
@@ -12748,9 +12769,9 @@
 2004261109 ./dev-python/kazoo/kazoo-2.6.1.ebuild
 2007091209 ./dev-python/kazoo/kazoo-2.7.0.ebuild
 2001311209 ./dev-python/kconfiglib/kconfiglib-14.1.0.ebuild
-2007091409 ./dev-python/keyring/keyring-21.2.1.ebuild
+2007162239 ./dev-python/keyring/keyring-21.2.1.ebuild
 2006202239 ./dev-python/keystoneauth/keystoneauth-4.0.0.ebuild
-2007020109 ./dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
+2007170509 ./dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
 2001131309 ./dev-python/keystonemiddleware/keystonemiddleware-7.0.1.ebuild
 2001051415 ./dev-python/kiwisolver/kiwisolver-1.0.1.ebuild
 2007052109 ./dev-python/kiwisolver/kiwisolver-1.2.0.ebuild
@@ -12781,10 +12802,10 @@
 2006232139 ./dev-python/lit/lit-10.0.1_rc1.ebuild
 2006232139 ./dev-python/lit/lit-11.0.0.9999.ebuild
 2006292209 ./dev-python/lit/lit-10.0.1_rc2.ebuild
-2007041609 ./dev-python/lit/lit-10.0.0.ebuild
 2007072309 ./dev-python/lit/lit-10.0.1_rc3.ebuild
 2007081139 ./dev-python/lit/lit-10.0.1_rc4.ebuild
 2007152209 ./dev-python/lit/lit-12.0.0.9999.ebuild
+2007162139 ./dev-python/lit/lit-10.0.0.ebuild
 2003201309 ./dev-python/livereload/livereload-2.4.1.ebuild
 2003201309 ./dev-python/livereload/livereload-2.5.2.ebuild
 2005091109 ./dev-python/livereload/livereload-2.6.1.ebuild
@@ -12811,6 +12832,7 @@
 2007091209 ./dev-python/lz4/lz4-3.0.2.ebuild
 2004032241 ./dev-python/m2crypto/m2crypto-0.31.0-r2.ebuild
 2004171739 ./dev-python/m2crypto/m2crypto-0.35.2.ebuild
+2007162209 ./dev-python/m2crypto/m2crypto-0.36.0.ebuild
 2005271209 ./dev-python/m2r/m2r-0.2.1.ebuild
 2002051939 ./dev-python/maintboot/maintboot-0.1.0.ebuild
 2007091539 ./dev-python/mako/mako-1.1.3.ebuild
@@ -12870,7 +12892,7 @@
 2005131339 ./dev-python/mpmath/mpmath-1.1.0.ebuild
 2003211939 ./dev-python/msgpack/msgpack-0.6.2.ebuild
 2004081709 ./dev-python/multidict/multidict-4.5.2.ebuild
-2007132139 ./dev-python/multidict/multidict-4.7.6.ebuild
+2007161609 ./dev-python/multidict/multidict-4.7.6.ebuild
 2006270039 ./dev-python/munch/munch-2.5.0-r1.ebuild
 2001051415 ./dev-python/munkres/munkres-1.1.2.ebuild
 2002052009 ./dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -12953,9 +12975,9 @@
 2001051415 ./dev-python/openpyxl/openpyxl-3.0.0.ebuild
 2002051609 ./dev-python/openpyxl/openpyxl-9999.ebuild
 2007061739 ./dev-python/openpyxl/openpyxl-3.0.3.ebuild
-2005311009 ./dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
+2007170509 ./dev-python/openstackdocstheme/openstackdocstheme-1.18.1.ebuild
 2003162209 ./dev-python/openstacksdk/openstacksdk-0.36.0.ebuild
-2006202239 ./dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
+2007170509 ./dev-python/openstacksdk/openstacksdk-0.46.0.ebuild
 2002221109 ./dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
 2001131309 ./dev-python/os-brick/os-brick-2.8.2.ebuild
 2005302109 ./dev-python/os-brick/os-brick-3.0.1.ebuild
@@ -12964,7 +12986,7 @@
 2001131309 ./dev-python/os-diskconfig-python-novaclient-ext/os-diskconfig-python-novaclient-ext-9999.ebuild
 2001131309 ./dev-python/os-ken/os-ken-0.3.1.ebuild
 2001131309 ./dev-python/os-resource-classes/os-resource-classes-0.5.0.ebuild
-2006270039 ./dev-python/os-service-types/os-service-types-1.7.0.ebuild
+2007170509 ./dev-python/os-service-types/os-service-types-1.7.0.ebuild
 2001131309 ./dev-python/os-testr/os-testr-1.0.0.ebuild
 2005302109 ./dev-python/os-traits/os-traits-2.3.0.ebuild
 2001131309 ./dev-python/os-vif/os-vif-1.15.2.ebuild
@@ -13046,6 +13068,7 @@
 2007150909 ./dev-python/peewee/peewee-3.13.2.ebuild
 2001290609 ./dev-python/pelican-minify/pelican-minify-0.9.ebuild
 2004032241 ./dev-python/pep8/pep8-1.7.1.ebuild
+2007170739 ./dev-python/pep8/pep8-1.7.1-r1.ebuild
 2002052109 ./dev-python/pew/pew-1.1.1.ebuild
 2004032241 ./dev-python/pexpect/pexpect-4.6.0.ebuild
 2007152339 ./dev-python/pexpect/pexpect-4.8.0.ebuild
@@ -13108,6 +13131,7 @@
 2003271839 ./dev-python/prov/prov-1.5.3.ebuild
 2005161439 ./dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
 2005261339 ./dev-python/psutil/psutil-5.7.0.ebuild
+2007162209 ./dev-python/psutil/psutil-5.7.2.ebuild
 2004032241 ./dev-python/psycopg/psycopg-2.7.7.ebuild
 2006121409 ./dev-python/psycopg/psycopg-2.8.4.ebuild
 2006121409 ./dev-python/psycopg/psycopg-2.8.5.ebuild
@@ -13145,7 +13169,7 @@
 2003301709 ./dev-python/pybluez/pybluez-0.23.ebuild
 2001131309 ./dev-python/pycadf/pycadf-2.9.0-r1.ebuild
 2006060209 ./dev-python/pycairo/pycairo-1.18.2.ebuild
-2007142009 ./dev-python/pycairo/pycairo-1.19.1.ebuild
+2007170309 ./dev-python/pycairo/pycairo-1.19.1.ebuild
 2001051415 ./dev-python/pycapnp/pycapnp-0.6.4.ebuild
 2005302309 ./dev-python/pycares/pycares-3.1.1.ebuild
 2002230040 ./dev-python/pycdio/pycdio-2.1.0.ebuild
@@ -13180,9 +13204,9 @@
 2007091709 ./dev-python/pyelftools/pyelftools-0.26.ebuild
 2003251709 ./dev-python/pyenchant/pyenchant-2.0.0.ebuild
 2007112309 ./dev-python/pyenchant/pyenchant-3.1.0.ebuild
-2007120609 ./dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
 2007120609 ./dev-python/pyfakefs/pyfakefs-4.0.2.ebuild
 2007122339 ./dev-python/pyfakefs/pyfakefs-4.1.0.ebuild
+2007170339 ./dev-python/pyfakefs/pyfakefs-3.7.2.ebuild
 2003081509 ./dev-python/pyfeyn/pyfeyn-1.0.0-r2.ebuild
 2004032241 ./dev-python/pyflakes/pyflakes-2.1.1.ebuild
 2007090839 ./dev-python/pyflakes/pyflakes-2.2.0.ebuild
@@ -13297,7 +13321,7 @@
 2004252039 ./dev-python/pyrqlite/pyrqlite-2.0.ebuild
 2004261609 ./dev-python/pyrqlite/pyrqlite-9999.ebuild
 2005311909 ./dev-python/pyrsistent/pyrsistent-0.15.6.ebuild
-2007142009 ./dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
+2007170609 ./dev-python/pyrsistent/pyrsistent-0.16.0.ebuild
 2002281939 ./dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
 2003251439 ./dev-python/pyscaffold/pyscaffold-2.4.4.ebuild
 2005032209 ./dev-python/pyscard/pyscard-1.9.9.ebuild
@@ -13322,6 +13346,7 @@
 2006241108 ./dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
 2007111009 ./dev-python/pytest-asyncio/pytest-asyncio-0.12.0.ebuild
 2003261841 ./dev-python/pytest-cache/pytest-cache-1.0-r2.ebuild
+2007170739 ./dev-python/pytest-cache/pytest-cache-1.0-r3.ebuild
 2001051415 ./dev-python/pytest-catchlog/pytest-catchlog-1.2.2.ebuild
 2006161139 ./dev-python/pytest-cov/pytest-cov-2.8.1.ebuild
 2004291439 ./dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
@@ -13344,6 +13369,7 @@
 2007111139 ./dev-python/pytest-mock/pytest-mock-3.1.1.ebuild
 2007122339 ./dev-python/pytest-mock/pytest-mock-3.2.0.ebuild
 2003252109 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+2007170739 ./dev-python/pytest-pep8/pytest-pep8-1.0.6-r2.ebuild
 2002052339 ./dev-python/pytest-pylint/pytest-pylint-0.14.1.ebuild
 2004291409 ./dev-python/pytest-rerunfailures/pytest-rerunfailures-8.0.ebuild
 2004032241 ./dev-python/pytest-runner/pytest-runner-5.2.ebuild
@@ -13354,6 +13380,7 @@
 2001051415 ./dev-python/pytest-testmon/pytest-testmon-0.9.15.ebuild
 2007081139 ./dev-python/pytest-timeout/pytest-timeout-1.4.1-r1.ebuild
 2007111139 ./dev-python/pytest-timeout/pytest-timeout-1.3.4.ebuild
+2007170909 ./dev-python/pytest-timeout/pytest-timeout-1.4.2.ebuild
 2007122339 ./dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
 2004032241 ./dev-python/pytest-xdist/pytest-xdist-1.23.2.ebuild
 2005162309 ./dev-python/pytest-xdist/pytest-xdist-1.28.0.ebuild
@@ -13399,7 +13426,7 @@
 2004261009 ./dev-python/python-etcd/python-etcd-0.4.5-r1.ebuild
 2001051415 ./dev-python/python-ethtool/python-ethtool-0.14.ebuild
 2006150539 ./dev-python/python-evdev/python-evdev-1.3.0.ebuild
-2005311009 ./dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
+2007170439 ./dev-python/python-fastimport/python-fastimport-0.9.8.ebuild
 2004032241 ./dev-python/python-fchksum/python-fchksum-1.7.1-r1.ebuild
 2004261009 ./dev-python/python-gammu/python-gammu-2.11.ebuild
 2005070509 ./dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -13515,11 +13542,11 @@
 2001182209 ./dev-python/rednose/rednose-0.4.3.ebuild
 2006090639 ./dev-python/reflink/reflink-0.2.1-r1.ebuild
 2005090009 ./dev-python/regex/regex-2020.2.20.ebuild
-2007142009 ./dev-python/regex/regex-2020.4.4.ebuild
+2007170639 ./dev-python/regex/regex-2020.4.4.ebuild
 2005061009 ./dev-python/rencode/rencode-1.0.5-r1.ebuild
 2007091209 ./dev-python/rencode/rencode-1.0.6.ebuild
 2001051415 ./dev-python/reno/reno-2.7.0.ebuild
-2005311009 ./dev-python/reno/reno-2.11.3.ebuild
+2007170509 ./dev-python/reno/reno-2.11.3.ebuild
 2006071209 ./dev-python/reportlab/reportlab-3.5.42.ebuild
 2007140239 ./dev-python/repoze-lru/repoze-lru-0.7-r1.ebuild
 2005090239 ./dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
@@ -13536,7 +13563,7 @@
 2007120139 ./dev-python/requests/requests-2.24.0.ebuild
 2007152339 ./dev-python/requests/requests-2.23.0.ebuild
 2006110539 ./dev-python/requests_pkcs12/requests_pkcs12-1.7.ebuild
-2006270039 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
+2007170509 ./dev-python/requestsexceptions/requestsexceptions-1.4.0.ebuild
 2006121009 ./dev-python/responses/responses-0.10.15.ebuild
 2007111139 ./dev-python/responses/responses-0.10.14.ebuild
 2007111139 ./dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -13552,6 +13579,7 @@
 2003201309 ./dev-python/root_numpy/root_numpy-4.7.3-r1.ebuild
 2002092309 ./dev-python/rootpy/rootpy-1.0.1-r1.ebuild
 2002171909 ./dev-python/rope/rope-0.16.0.ebuild
+2007170739 ./dev-python/rope/rope-0.17.0.ebuild
 2004040939 ./dev-python/ropemode/ropemode-0.5.ebuild
 2002060909 ./dev-python/rosdistro/rosdistro-0.8.0.ebuild
 2005181839 ./dev-python/rosdistro/rosdistro-0.8.1.ebuild
@@ -13565,7 +13593,7 @@
 2003251909 ./dev-python/rpyc/rpyc-4.1.4.ebuild
 2003120139 ./dev-python/rq/rq-1.3.0.ebuild
 2002060909 ./dev-python/rsa/rsa-3.4.2-r1.ebuild
-2007160539 ./dev-python/rsa/rsa-4.2.ebuild
+2007170339 ./dev-python/rsa/rsa-4.2.ebuild
 2004032241 ./dev-python/rst-linker/rst-linker-1.11.ebuild
 2007111139 ./dev-python/rst-linker/rst-linker-2.0.0.ebuild
 2002060909 ./dev-python/rtimulib/rtimulib-7.2.1-r1.ebuild
@@ -13582,10 +13610,10 @@
 2004032241 ./dev-python/scandir/scandir-1.10.0-r1.ebuild
 2006120109 ./dev-python/scripttest/scripttest-1.3.0.ebuild
 2007141909 ./dev-python/scrypt/scrypt-0.8.13-r2.ebuild
-2007142009 ./dev-python/scrypt/scrypt-0.8.15.ebuild
+2007170539 ./dev-python/scrypt/scrypt-0.8.15.ebuild
 2003092139 ./dev-python/seaborn/seaborn-0.10.0.ebuild
-2007111209 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
-2006192139 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
+2007162239 ./dev-python/secretstorage/secretstorage-3.1.2.ebuild
+2007162239 ./dev-python/selenium/selenium-3.141.0-r1.ebuild
 2006241039 ./dev-python/semantic_version/semantic_version-2.8.4.ebuild
 2006241039 ./dev-python/semantic_version/semantic_version-2.8.5.ebuild
 2006170909 ./dev-python/semver/semver-2.10.2.ebuild
@@ -13610,6 +13638,7 @@
 2007111209 ./dev-python/simpleeval/simpleeval-0.9.10.ebuild
 2004032241 ./dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
 2005261339 ./dev-python/simplejson/simplejson-3.17.0.ebuild
+2007170909 ./dev-python/simplejson/simplejson-3.17.2.ebuild
 2002060939 ./dev-python/simplekml/simplekml-1.3.1.ebuild
 2001051415 ./dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
 2001051415 ./dev-python/simplesoapy/simplesoapy-9999.ebuild
@@ -13620,7 +13649,7 @@
 2006092339 ./dev-python/sip/sip-4.19.22.ebuild
 2006092239 ./dev-python/sip/sip-4.19.23.ebuild
 2005141509 ./dev-python/six/six-1.14.0.ebuild
-2007091209 ./dev-python/six/six-1.15.0.ebuild
+2007162109 ./dev-python/six/six-1.15.0.ebuild
 2003031239 ./dev-python/sleekxmpp/sleekxmpp-1.3.1-r1.ebuild
 2004261339 ./dev-python/slimit/slimit-0.8.1-r1.ebuild
 2001051415 ./dev-python/slixmpp/slixmpp-9999.ebuild
@@ -13668,8 +13697,8 @@
 2005061739 ./dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
 2005312038 ./dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.3.ebuild
 2007111239 ./dev-python/sphinxcontrib-httpdomain/sphinxcontrib-httpdomain-1.7.0.ebuild
-2003261841 ./dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
 2004032241 ./dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r1.ebuild
+2007170739 ./dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
 2005061739 ./dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
 2005312038 ./dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1-r1.ebuild
 2001051415 ./dev-python/sphinxcontrib-napoleon/sphinxcontrib-napoleon-0.6.1.ebuild
@@ -13686,12 +13715,14 @@
 2007111239 ./dev-python/sphinxcontrib-websupport/sphinxcontrib-websupport-1.2.2.ebuild
 2001051415 ./dev-python/sphinxtogithub/sphinxtogithub-1.1.0.ebuild
 2005270009 ./dev-python/spyder-kernels/spyder-kernels-1.9.1.ebuild
+2007170739 ./dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
 2005270009 ./dev-python/spyder/spyder-4.1.3.ebuild
+2007170739 ./dev-python/spyder/spyder-4.1.4.ebuild
 2005302109 ./dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
 2004261609 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-1.0.ebuild
 2004261609 ./dev-python/sqlalchemy-rqlite/sqlalchemy-rqlite-9999.ebuild
 2005182138 ./dev-python/sqlalchemy/sqlalchemy-1.3.11.ebuild
-2007141539 ./dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
+2007170609 ./dev-python/sqlalchemy/sqlalchemy-1.3.17.ebuild
 1905241809 ./dev-python/squaremap/squaremap-1.0.4.ebuild
 2002060939 ./dev-python/sshtunnel/sshtunnel-0.1.4-r2.ebuild
 2003251609 ./dev-python/sshtunnel/sshtunnel-0.1.5.ebuild
@@ -13705,15 +13736,14 @@
 2005311009 ./dev-python/stestr/stestr-2.1.0-r1.ebuild
 2006232209 ./dev-python/stevedore/stevedore-2.0.1.ebuild
 2007151439 ./dev-python/stevedore/stevedore-3.0.0.ebuild
-2007151439 ./dev-python/stevedore/stevedore-3.1.0.ebuild
+2007170509 ./dev-python/stevedore/stevedore-3.1.0.ebuild
 2005250944 ./dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
 2006040939 ./dev-python/stripe/stripe-2.46.0.ebuild
 2003301709 ./dev-python/subprocess32/subprocess32-3.5.4.ebuild
-2006132027 ./dev-python/subunit/subunit-1.2.0-r1.ebuild
-2007142009 ./dev-python/subunit/subunit-1.4.0.ebuild
+2007170509 ./dev-python/subunit/subunit-1.4.0.ebuild
 2004261609 ./dev-python/subvertpy/subvertpy-0.10.1.ebuild
 2001051415 ./dev-python/suds/suds-0.6-r1.ebuild
-2007160509 ./dev-python/sure/sure-1.4.11.ebuild
+2007170339 ./dev-python/sure/sure-1.4.11.ebuild
 2001051415 ./dev-python/svg-path/svg-path-3.0.ebuild
 2005181339 ./dev-python/svgwrite/svgwrite-1.4.ebuild
 2003120209 ./dev-python/swagger-spec-validator/swagger-spec-validator-2.5.0.ebuild
@@ -13761,10 +13791,12 @@
 2007020109 ./dev-python/tox/tox-3.16.1.ebuild
 2007061509 ./dev-python/tox/tox-3.15.2.ebuild
 2007150809 ./dev-python/tox/tox-3.17.0.ebuild
+2007170909 ./dev-python/tox/tox-3.17.1.ebuild
 2001051415 ./dev-python/tqdm/tqdm-9999.ebuild
 2003170539 ./dev-python/tqdm/tqdm-4.40.0.ebuild
 2006291009 ./dev-python/tqdm/tqdm-4.47.0.ebuild
 2007141739 ./dev-python/tqdm/tqdm-4.45.0.ebuild
+2007170909 ./dev-python/tqdm/tqdm-4.48.0.ebuild
 2006261309 ./dev-python/traceback2/traceback2-1.4.0.ebuild
 2003171139 ./dev-python/traitlets/traitlets-4.3.2.ebuild
 2007091139 ./dev-python/traitlets/traitlets-4.3.3.ebuild
@@ -13793,8 +13825,8 @@
 2007141509 ./dev-python/typing/typing-3.7.4.3.ebuild
 2007111239 ./dev-python/tzlocal/tzlocal-2.1.ebuild
 2007111309 ./dev-python/u-msgpack/u-msgpack-2.6.0.ebuild
-2003171139 ./dev-python/ujson/ujson-1.35-r1.ebuild
 2007111309 ./dev-python/ujson/ujson-3.0.0.ebuild
+2007170739 ./dev-python/ujson/ujson-1.35-r1.ebuild
 2006071409 ./dev-python/uncertainties/uncertainties-3.1.4.ebuild
 2006010910 ./dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
 2003272009 ./dev-python/unidecode/unidecode-0.04.21.ebuild
@@ -13812,7 +13844,7 @@
 2002061039 ./dev-python/urwidtrees/urwidtrees-1.0.2-r1.ebuild
 2003182209 ./dev-python/utidylib/utidylib-0.6.ebuild
 2005191609 ./dev-python/uvloop/uvloop-0.14.0.ebuild
-2007160739 ./dev-python/vcrpy/vcrpy-4.0.2.ebuild
+2007161609 ./dev-python/vcrpy/vcrpy-4.0.2.ebuild
 2002061039 ./dev-python/vcstools/vcstools-0.1.42.ebuild
 2004211009 ./dev-python/vcversioner/vcversioner-2.16.0.0.ebuild
 2006160909 ./dev-python/vdirsyncer/vdirsyncer-0.16.8.ebuild
@@ -13826,13 +13858,14 @@
 2006241108 ./dev-python/virtualenv/virtualenv-20.0.23.ebuild
 2007111439 ./dev-python/virtualenv/virtualenv-20.0.26.ebuild
 2007141909 ./dev-python/virtualenv/virtualenv-16.7.10.ebuild
+2007170909 ./dev-python/virtualenv/virtualenv-20.0.27.ebuild
 2005020739 ./dev-python/virtualenvwrapper/virtualenvwrapper-4.8.4-r1.ebuild
 2002061039 ./dev-python/visitor/visitor-0.1.3.ebuild
 2002061039 ./dev-python/vobject/vobject-0.9.6.1-r1.ebuild
 2005311909 ./dev-python/voluptuous/voluptuous-0.11.5.ebuild
 2001051415 ./dev-python/vpython/vpython-7.4.6.ebuild
 2006171739 ./dev-python/waitress/waitress-1.4.3.ebuild
-2007091209 ./dev-python/waitress/waitress-1.4.4.ebuild
+2007162139 ./dev-python/waitress/waitress-1.4.4.ebuild
 2005302109 ./dev-python/warlock/warlock-1.3.3.ebuild
 2002040009 ./dev-python/watchdog/watchdog-0.8.3-r2.ebuild
 2006261339 ./dev-python/watchdog/watchdog-0.10.3.ebuild
@@ -13846,14 +13879,12 @@
 2006092309 ./dev-python/webcolors/webcolors-1.11.1.ebuild
 2005261939 ./dev-python/webencodings/webencodings-0.5.1-r1.ebuild
 2004032241 ./dev-python/webob/webob-1.8.5-r3.ebuild
-2007091209 ./dev-python/webob/webob-1.8.6.ebuild
+2007162239 ./dev-python/webob/webob-1.8.6.ebuild
 2006110539 ./dev-python/websocket-client/websocket-client-0.57.0.ebuild
 2004232309 ./dev-python/websockify/websockify-0.9.0.ebuild
 2005262139 ./dev-python/webtest/webtest-2.0.33.ebuild
 2007141909 ./dev-python/webtest/webtest-2.0.35.ebuild
-2005062139 ./dev-python/werkzeug/werkzeug-0.16.0.ebuild
-2006120109 ./dev-python/werkzeug/werkzeug-0.16.1.ebuild
-2007142009 ./dev-python/werkzeug/werkzeug-1.0.1.ebuild
+2007170639 ./dev-python/werkzeug/werkzeug-1.0.1.ebuild
 2005252339 ./dev-python/wheel/wheel-0.34.2.ebuild
 2002061039 ./dev-python/whelk/whelk-2.7.1.ebuild
 2005111439 ./dev-python/whichcraft/whichcraft-0.6.1.ebuild
@@ -13869,7 +13900,7 @@
 2007141639 ./dev-python/wsgiproxy2/wsgiproxy2-0.4.6-r1.ebuild
 2004271139 ./dev-python/wsproto/wsproto-0.15.0.ebuild
 2004032241 ./dev-python/wstools/wstools-0.4.5-r1.ebuild
-2007091209 ./dev-python/wstools/wstools-0.4.8.ebuild
+2007162309 ./dev-python/wstools/wstools-0.4.8.ebuild
 2006241039 ./dev-python/wtforms/wtforms-2.2.1.ebuild
 2006241039 ./dev-python/wtforms/wtforms-2.3.1.ebuild
 2004261839 ./dev-python/www-authenticate/www-authenticate-0.9.2.ebuild
@@ -13890,7 +13921,7 @@
 2006040939 ./dev-python/yappi/yappi-1.2.5.ebuild
 2005031339 ./dev-python/yapsy/yapsy-1.12.2.ebuild
 2001131309 ./dev-python/yaql/yaql-1.1.3.ebuild
-2007111839 ./dev-python/yarl/yarl-1.4.2.ebuild
+2007161609 ./dev-python/yarl/yarl-1.4.2.ebuild
 2004200209 ./dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
 2002052009 ./dev-python/zVMCloudConnector/zVMCloudConnector-1.4.1.ebuild
 2007140239 ./dev-python/zc-lockfile/zc-lockfile-2.0.ebuild
@@ -13915,7 +13946,7 @@
 2005062339 ./dev-python/zstandard/zstandard-0.8.1.ebuild
 2005301009 ./dev-python/zstandard/zstandard-0.13.0.ebuild
 2006141139 ./dev-python/zstandard/zstandard-0.14.0.ebuild
-2007160739 ./dev-python/pathspec/pathspec-0.8.0.ebuild
+2007161609 ./dev-python/pathspec/pathspec-0.8.0.ebuild
 2005141939 ./dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
 2001271039 ./dev-python/test_server/test_server-0.0.31.ebuild
 2007141909 ./dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -13931,7 +13962,7 @@
 2007141909 ./dev-python/towncrier/towncrier-19.2.0.ebuild
 2007111109 ./dev-python/xmlschema/xmlschema-1.1.3.ebuild
 2007120109 ./dev-python/xmlschema/xmlschema-1.2.2.ebuild
-2007142009 ./dev-python/xmlschema/xmlschema-1.2.0.ebuild
+2007170809 ./dev-python/xmlschema/xmlschema-1.2.0.ebuild
 2005262009 ./dev-python/soupsieve/soupsieve-1.9.5.ebuild
 2005262009 ./dev-python/soupsieve/soupsieve-1.9.6.ebuild
 2007120609 ./dev-python/soupsieve/soupsieve-2.0.1.ebuild
@@ -13964,13 +13995,14 @@
 2004111109 ./dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
 2004111109 ./dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
 1912290609 ./dev-python/helpdev/helpdev-0.6.10.ebuild
+2007170739 ./dev-python/helpdev/helpdev-0.7.1.ebuild
 2006200009 ./dev-python/aiocontextvars/aiocontextvars-0.2.2.ebuild
 2006200009 ./dev-python/contextvars/contextvars-2.4.ebuild
 2006200009 ./dev-python/immutables/immutables-0.11.ebuild
 2006200009 ./dev-python/immutables/immutables-0.14.ebuild
-2005021509 ./dev-python/libsass/libsass-0.20.0.ebuild
-2003272009 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
-2003271939 ./dev-python/qtsass/qtsass-0.3.0.ebuild
+2007170739 ./dev-python/libsass/libsass-0.20.0.ebuild
+2007170739 ./dev-python/qdarkstyle/qdarkstyle-2.8.1.ebuild
+2007170739 ./dev-python/qtsass/qtsass-0.3.0.ebuild
 2007111809 ./dev-python/pikepdf/pikepdf-1.17.0.ebuild
 2007011139 ./dev-python/vdf/vdf-3.3.ebuild
 2007111309 ./dev-python/vdf/vdf-3.2-r1.ebuild
@@ -13981,7 +14013,9 @@
 2005270009 ./dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
 2005270009 ./dev-python/python-language-server/python-language-server-0.31.10.ebuild
 2005270009 ./dev-python/python-language-server/python-language-server-0.32.0.ebuild
+2007170739 ./dev-python/python-language-server/python-language-server-0.34.1.ebuild
 2001151509 ./dev-python/wurlitzer/wurlitzer-2.0.0.ebuild
+2007170739 ./dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
 2003271939 ./dev-python/pytest-qt/pytest-qt-3.3.0.ebuild
 2004231109 ./dev-python/patch-ng/patch-ng-1.17.4.ebuild
 2001241009 ./dev-python/pweave/pweave-0.30.3.ebuild
@@ -14005,6 +14039,7 @@
 2005250209 ./dev-python/sentry-sdk/sentry-sdk-0.14.4.ebuild
 2002140609 ./dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
 2003252109 ./dev-python/pydocstyle/pydocstyle-5.0.2.ebuild
+2007170739 ./dev-python/pydocstyle/pydocstyle-5.0.2-r1.ebuild
 2005270009 ./dev-python/spyder-line-profiler/spyder-line-profiler-0.2.1.ebuild
 2005270009 ./dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.1.ebuild
 2005270009 ./dev-python/spyder-notebook/spyder-notebook-0.2.3.ebuild
@@ -14092,6 +14127,7 @@
 2007151339 ./dev-python/findimports/findimports-1.5.2.ebuild
 2007151139 ./dev-python/pony/pony-0.7.13.ebuild
 2007150909 ./dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+2007170439 ./dev-python/pyre2/pyre2-1.0.7.ebuild
 2005201639 ./dev-qt/assistant/assistant-5.14.2.ebuild
 2005261809 ./dev-qt/assistant/assistant-5.15.0.ebuild
 2005261809 ./dev-qt/designer/designer-5.15.0.ebuild
@@ -14210,30 +14246,22 @@
 2005261809 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.15.0.ebuild
 2005302239 ./dev-qt/qtxmlpatterns/qtxmlpatterns-5.14.2.ebuild
 2007131939 ./dev-qt/qtquicktimeline/qtquicktimeline-5.15.0.ebuild
-2001051415 ./dev-ros/actionlib/actionlib-1.11.13.ebuild
-2001051415 ./dev-ros/actionlib/actionlib-1.11.14.ebuild
-2001051415 ./dev-ros/actionlib/actionlib-1.11.15.ebuild
-2001051415 ./dev-ros/actionlib/actionlib-9999.ebuild
+2007162039 ./dev-ros/actionlib/actionlib-1.13.1.ebuild
+2007162039 ./dev-ros/actionlib/actionlib-9999.ebuild
 2007082039 ./dev-ros/actionlib_msgs/actionlib_msgs-1.13.0.ebuild
 2007082039 ./dev-ros/actionlib_msgs/actionlib_msgs-9999.ebuild
 2007082039 ./dev-ros/actionlib_tutorials/actionlib_tutorials-0.1.12.ebuild
 2007082039 ./dev-ros/actionlib_tutorials/actionlib_tutorials-9999.ebuild
 2007101909 ./dev-ros/amcl/amcl-1.17.0.ebuild
 2007101909 ./dev-ros/amcl/amcl-9999.ebuild
-2001051415 ./dev-ros/angles/angles-1.9.11.ebuild
-2001051415 ./dev-ros/angles/angles-9999.ebuild
-1702282250 ./dev-ros/audio_capture/audio_capture-0.3.1.ebuild
-1805081538 ./dev-ros/audio_capture/audio_capture-0.3.2.ebuild
-1807161409 ./dev-ros/audio_capture/audio_capture-0.3.3.ebuild
-1702282250 ./dev-ros/audio_capture/audio_capture-9999.ebuild
-2001051415 ./dev-ros/audio_common_msgs/audio_common_msgs-0.3.1.ebuild
-2001051415 ./dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild
-2001051415 ./dev-ros/audio_common_msgs/audio_common_msgs-0.3.3.ebuild
-2001051415 ./dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
-1702282250 ./dev-ros/audio_play/audio_play-0.3.1.ebuild
-1805081538 ./dev-ros/audio_play/audio_play-0.3.2.ebuild
-1807161409 ./dev-ros/audio_play/audio_play-0.3.3.ebuild
-1702282250 ./dev-ros/audio_play/audio_play-9999.ebuild
+2007162039 ./dev-ros/angles/angles-1.9.13.ebuild
+2007162039 ./dev-ros/angles/angles-9999.ebuild
+2007162039 ./dev-ros/audio_capture/audio_capture-0.3.6.ebuild
+2007162039 ./dev-ros/audio_capture/audio_capture-9999.ebuild
+2007162039 ./dev-ros/audio_common_msgs/audio_common_msgs-0.3.6.ebuild
+2007162039 ./dev-ros/audio_common_msgs/audio_common_msgs-9999.ebuild
+2007162039 ./dev-ros/audio_play/audio_play-0.3.6.ebuild
+2007162039 ./dev-ros/audio_play/audio_play-9999.ebuild
 2007101909 ./dev-ros/base_local_planner/base_local_planner-1.17.0.ebuild
 2007101909 ./dev-ros/base_local_planner/base_local_planner-9999.ebuild
 2007091509 ./dev-ros/bond/bond-1.8.5.ebuild
@@ -14252,31 +14280,22 @@
 2007091539 ./dev-ros/calibration_setup_helper/calibration_setup_helper-9999.ebuild
 2007091509 ./dev-ros/camera_calibration/camera_calibration-1.15.2.ebuild
 2007091509 ./dev-ros/camera_calibration/camera_calibration-9999.ebuild
-2001051415 ./dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.11.13-r1.ebuild
-2001051415 ./dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-1.11.10.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-1.11.12.ebuild
-1711072223 ./dev-ros/camera_info_manager/camera_info_manager-1.11.13.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-1.11.7.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-1.11.8.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-1.11.9.ebuild
-1702282250 ./dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
+2007161609 ./dev-ros/camera_calibration_parsers/camera_calibration_parsers-1.12.0.ebuild
+2007161609 ./dev-ros/camera_calibration_parsers/camera_calibration_parsers-9999.ebuild
+2007161609 ./dev-ros/camera_info_manager/camera_info_manager-1.12.0.ebuild
+2007161609 ./dev-ros/camera_info_manager/camera_info_manager-9999.ebuild
 2007101909 ./dev-ros/carrot_planner/carrot_planner-1.17.0.ebuild
 2007101909 ./dev-ros/carrot_planner/carrot_planner-9999.ebuild
-1805281508 ./dev-ros/class_loader/class_loader-0.4.1-r1.ebuild
-1805281508 ./dev-ros/class_loader/class_loader-9999.ebuild
+2007162039 ./dev-ros/class_loader/class_loader-0.5.0.ebuild
+2007162039 ./dev-ros/class_loader/class_loader-9999.ebuild
 2007101909 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.17.0.ebuild
 2007101909 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
-1908282009 ./dev-ros/cmake_modules/cmake_modules-0.4.2.ebuild
-2005181839 ./dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
-2005181839 ./dev-ros/cmake_modules/cmake_modules-9999.ebuild
-1804071738 ./dev-ros/collada_parser/collada_parser-1.12.10-r3.ebuild
-1805151008 ./dev-ros/collada_parser/collada_parser-1.12.12.ebuild
-1805151008 ./dev-ros/collada_parser/collada_parser-9999.ebuild
-1801071009 ./dev-ros/collada_urdf/collada_urdf-1.12.10-r1.ebuild
-1805151008 ./dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
-1805151008 ./dev-ros/collada_urdf/collada_urdf-9999.ebuild
+2007162039 ./dev-ros/cmake_modules/cmake_modules-0.5.0.ebuild
+2007162039 ./dev-ros/cmake_modules/cmake_modules-9999.ebuild
+2007162039 ./dev-ros/collada_parser/collada_parser-1.12.13.ebuild
+2007162039 ./dev-ros/collada_parser/collada_parser-9999.ebuild
+2007162039 ./dev-ros/collada_urdf/collada_urdf-1.12.13.ebuild
+2007162039 ./dev-ros/collada_urdf/collada_urdf-9999.ebuild
 2007082039 ./dev-ros/combined_robot_hw/combined_robot_hw-0.19.1.ebuild
 2007082039 ./dev-ros/combined_robot_hw/combined_robot_hw-9999.ebuild
 2007082039 ./dev-ros/combined_robot_hw_tests/combined_robot_hw_tests-0.19.1.ebuild
@@ -14285,12 +14304,10 @@
 2007091409 ./dev-ros/compressed_depth_image_transport/compressed_depth_image_transport-9999.ebuild
 2007091409 ./dev-ros/compressed_image_transport/compressed_image_transport-1.14.0.ebuild
 2007091409 ./dev-ros/compressed_image_transport/compressed_image_transport-9999.ebuild
-2001051415 ./dev-ros/control_msgs/control_msgs-1.4.0.ebuild
-2001051415 ./dev-ros/control_msgs/control_msgs-9999.ebuild
-1702282250 ./dev-ros/control_toolbox/control_toolbox-1.14.0.ebuild
-1702282250 ./dev-ros/control_toolbox/control_toolbox-1.15.0.ebuild
-1712050109 ./dev-ros/control_toolbox/control_toolbox-1.16.0.ebuild
-1702282250 ./dev-ros/control_toolbox/control_toolbox-9999.ebuild
+2007162039 ./dev-ros/control_msgs/control_msgs-1.5.2.ebuild
+2007162039 ./dev-ros/control_msgs/control_msgs-9999.ebuild
+2007162039 ./dev-ros/control_toolbox/control_toolbox-1.18.2.ebuild
+2007162039 ./dev-ros/control_toolbox/control_toolbox-9999.ebuild
 2007082039 ./dev-ros/controller_interface/controller_interface-0.19.1.ebuild
 2007082039 ./dev-ros/controller_interface/controller_interface-9999.ebuild
 2007082039 ./dev-ros/controller_manager/controller_manager-0.19.1.ebuild
@@ -14299,20 +14316,18 @@
 2007082039 ./dev-ros/controller_manager_msgs/controller_manager_msgs-9999.ebuild
 2007082039 ./dev-ros/controller_manager_tests/controller_manager_tests-0.19.1.ebuild
 2007082039 ./dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
-1702282250 ./dev-ros/convex_decomposition/convex_decomposition-0.1.10.ebuild
-1702282250 ./dev-ros/convex_decomposition/convex_decomposition-0.1.11.ebuild
-1812211909 ./dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
-1702282250 ./dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
+2007162039 ./dev-ros/convex_decomposition/convex_decomposition-0.1.12.ebuild
+2007162039 ./dev-ros/convex_decomposition/convex_decomposition-9999.ebuild
 2007101909 ./dev-ros/costmap_2d/costmap_2d-1.17.0.ebuild
 2007101909 ./dev-ros/costmap_2d/costmap_2d-9999.ebuild
 2007102009 ./dev-ros/cpp_common/cpp_common-0.7.2.ebuild
 2007102009 ./dev-ros/cpp_common/cpp_common-9999.ebuild
-1908282009 ./dev-ros/cv_bridge/cv_bridge-9999.ebuild
-1912102039 ./dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
+2007161609 ./dev-ros/cv_bridge/cv_bridge-1.15.0.ebuild
+2007161609 ./dev-ros/cv_bridge/cv_bridge-9999.ebuild
 2007091509 ./dev-ros/depth_image_proc/depth_image_proc-1.15.2.ebuild
 2007091509 ./dev-ros/depth_image_proc/depth_image_proc-9999.ebuild
-1805281508 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.7-r2.ebuild
-1805281508 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
+2007162039 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-1.0.8.ebuild
+2007162039 ./dev-ros/depthimage_to_laserscan/depthimage_to_laserscan-9999.ebuild
 2007091509 ./dev-ros/diagnostic_aggregator/diagnostic_aggregator-1.9.4.ebuild
 2007091509 ./dev-ros/diagnostic_aggregator/diagnostic_aggregator-9999.ebuild
 2007091509 ./dev-ros/diagnostic_analysis/diagnostic_analysis-1.9.4.ebuild
@@ -14323,55 +14338,30 @@
 2007082039 ./dev-ros/diagnostic_msgs/diagnostic_msgs-9999.ebuild
 2007091509 ./dev-ros/diagnostic_updater/diagnostic_updater-1.9.4.ebuild
 2007091509 ./dev-ros/diagnostic_updater/diagnostic_updater-9999.ebuild
-2001051415 ./dev-ros/driver_base/driver_base-1.6.8.ebuild
-2001051415 ./dev-ros/driver_base/driver_base-9999.ebuild
+2007162039 ./dev-ros/driver_base/driver_base-1.6.8.ebuild
+2007162039 ./dev-ros/driver_base/driver_base-9999.ebuild
 2007101909 ./dev-ros/dwa_local_planner/dwa_local_planner-1.17.0.ebuild
 2007101909 ./dev-ros/dwa_local_planner/dwa_local_planner-9999.ebuild
-2001051415 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.48.ebuild
-2001051415 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.5.49.ebuild
-2001051415 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.6.0.ebuild
-2001051415 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
+2007162039 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-1.7.0.ebuild
+2007162039 ./dev-ros/dynamic_reconfigure/dynamic_reconfigure-9999.ebuild
 2007091409 ./dev-ros/eigen_conversions/eigen_conversions-1.13.2.ebuild
 2007091409 ./dev-ros/eigen_conversions/eigen_conversions-9999.ebuild
-1702282250 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.4.ebuild
-1702282250 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.5.ebuild
-1702282250 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.6.ebuild
-1703041636 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.7.ebuild
-1703140235 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
-1702282250 ./dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
+2007162039 ./dev-ros/eigen_stl_containers/eigen_stl_containers-0.1.8.ebuild
+2007162039 ./dev-ros/eigen_stl_containers/eigen_stl_containers-9999.ebuild
 2005181839 ./dev-ros/fake_localization/fake_localization-9999.ebuild
 2007101909 ./dev-ros/fake_localization/fake_localization-1.17.0.ebuild
-1712282239 ./dev-ros/filters/filters-1.8.1-r1.ebuild
-1712282239 ./dev-ros/filters/filters-9999.ebuild
-1801161709 ./dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
-1802150908 ./dev-ros/gazebo_dev/gazebo_dev-2.7.4.ebuild
-1807161409 ./dev-ros/gazebo_dev/gazebo_dev-2.8.4.ebuild
-1908282009 ./dev-ros/gazebo_dev/gazebo_dev-2.8.5.ebuild
-1801161709 ./dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
-2005181839 ./dev-ros/gazebo_dev/gazebo_dev-2.8.7.ebuild
-2001051415 ./dev-ros/gazebo_msgs/gazebo_msgs-2.6.2.ebuild
-2001051415 ./dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild
-2001051415 ./dev-ros/gazebo_msgs/gazebo_msgs-2.7.4.ebuild
-2001051415 ./dev-ros/gazebo_msgs/gazebo_msgs-2.8.4.ebuild
-2001051415 ./dev-ros/gazebo_msgs/gazebo_msgs-2.8.5.ebuild
-2001051415 ./dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
-2005181839 ./dev-ros/gazebo_msgs/gazebo_msgs-2.8.7.ebuild
-2005181839 ./dev-ros/gazebo_plugins/gazebo_plugins-2.8.7.ebuild
-2005181839 ./dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
-1705101109 ./dev-ros/gazebo_ros/gazebo_ros-2.6.2.ebuild
-1801281608 ./dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
-1802150908 ./dev-ros/gazebo_ros/gazebo_ros-2.7.4.ebuild
-1807161409 ./dev-ros/gazebo_ros/gazebo_ros-2.8.4.ebuild
-1908282009 ./dev-ros/gazebo_ros/gazebo_ros-2.8.5.ebuild
-1801161709 ./dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
-2005181839 ./dev-ros/gazebo_ros/gazebo_ros-2.8.7.ebuild
-1712282239 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.2-r1.ebuild
-1801281608 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
-1802150908 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.4.ebuild
-1807161409 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.4.ebuild
-1908282009 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.5.ebuild
-1801161709 ./dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
-2005181839 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.8.7.ebuild
+2007162039 ./dev-ros/filters/filters-1.9.0.ebuild
+2007162039 ./dev-ros/filters/filters-9999.ebuild
+2007162039 ./dev-ros/gazebo_dev/gazebo_dev-2.9.1.ebuild
+2007162039 ./dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
+2007162039 ./dev-ros/gazebo_msgs/gazebo_msgs-2.9.1.ebuild
+2007162039 ./dev-ros/gazebo_msgs/gazebo_msgs-9999.ebuild
+2007162039 ./dev-ros/gazebo_plugins/gazebo_plugins-2.9.1.ebuild
+2007162039 ./dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+2007162039 ./dev-ros/gazebo_ros/gazebo_ros-2.9.1.ebuild
+2007162039 ./dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
+2007162039 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.9.1.ebuild
+2007162039 ./dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
 2005181938 ./dev-ros/gencpp/gencpp-0.6.5.ebuild
 2005181938 ./dev-ros/gencpp/gencpp-9999.ebuild
 2005181938 ./dev-ros/geneus/geneus-3.0.0.ebuild
@@ -14380,112 +14370,87 @@
 2005181938 ./dev-ros/genlisp/genlisp-9999.ebuild
 2005181839 ./dev-ros/genmsg/genmsg-0.5.16.ebuild
 2005181839 ./dev-ros/genmsg/genmsg-9999.ebuild
-2001051415 ./dev-ros/gennodejs/gennodejs-2.0.1.ebuild
-2001051415 ./dev-ros/gennodejs/gennodejs-9999.ebuild
+2007162039 ./dev-ros/gennodejs/gennodejs-2.0.1.ebuild
+2007162039 ./dev-ros/gennodejs/gennodejs-9999.ebuild
 2005181938 ./dev-ros/genpy/genpy-0.6.11.ebuild
 2005181938 ./dev-ros/genpy/genpy-9999.ebuild
 1709121459 ./dev-ros/geodesy/geodesy-0.5.2.ebuild
 1803301639 ./dev-ros/geodesy/geodesy-0.5.3.ebuild
-1709121459 ./dev-ros/geodesy/geodesy-9999.ebuild
+2007162039 ./dev-ros/geodesy/geodesy-0.5.5.ebuild
+2007162039 ./dev-ros/geodesy/geodesy-9999.ebuild
 2001051415 ./dev-ros/geographic_msgs/geographic_msgs-0.5.0.ebuild
 2001051415 ./dev-ros/geographic_msgs/geographic_msgs-0.5.2.ebuild
 2001051415 ./dev-ros/geographic_msgs/geographic_msgs-0.5.3.ebuild
-2001051415 ./dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
-1902151539 ./dev-ros/geometric_shapes/geometric_shapes-0.6.1.ebuild
-1804112138 ./dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+2007162039 ./dev-ros/geographic_msgs/geographic_msgs-0.5.5.ebuild
+2007162039 ./dev-ros/geographic_msgs/geographic_msgs-9999.ebuild
+2007162039 ./dev-ros/geometric_shapes/geometric_shapes-0.7.0.ebuild
+2007162039 ./dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
 2007082039 ./dev-ros/geometry_msgs/geometry_msgs-1.13.0.ebuild
 2007082039 ./dev-ros/geometry_msgs/geometry_msgs-9999.ebuild
 2007101909 ./dev-ros/global_planner/global_planner-1.17.0.ebuild
 2007101909 ./dev-ros/global_planner/global_planner-9999.ebuild
-1802121708 ./dev-ros/gmapping/gmapping-1.3.10.ebuild
-1908282039 ./dev-ros/gmapping/gmapping-1.4.0.ebuild
-1908282039 ./dev-ros/gmapping/gmapping-9999.ebuild
+2007162039 ./dev-ros/gmapping/gmapping-1.4.1.ebuild
+2007162039 ./dev-ros/gmapping/gmapping-9999.ebuild
 2007082039 ./dev-ros/hardware_interface/hardware_interface-0.19.1.ebuild
 2007082039 ./dev-ros/hardware_interface/hardware_interface-9999.ebuild
-1704171255 ./dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.3.5.ebuild
-1704171255 ./dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
-1912131539 ./dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.0.ebuild
-1804281839 ./dev-ros/hector_geotiff/hector_geotiff-0.3.5-r2.ebuild
-1804281839 ./dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
-1912131539 ./dev-ros/hector_geotiff/hector_geotiff-0.4.0.ebuild
-1712282239 ./dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.3.5-r1.ebuild
-1712282239 ./dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
-1912131539 ./dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.0.ebuild
-1709131458 ./dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.5.ebuild
-1709131458 ./dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
-1912131539 ./dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.0.ebuild
-1709131458 ./dev-ros/hector_imu_tools/hector_imu_tools-0.3.5.ebuild
-1709131458 ./dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
-1912131539 ./dev-ros/hector_imu_tools/hector_imu_tools-0.4.0.ebuild
-1709131458 ./dev-ros/hector_map_server/hector_map_server-0.3.5.ebuild
-1709131458 ./dev-ros/hector_map_server/hector_map_server-9999.ebuild
-1912131539 ./dev-ros/hector_map_server/hector_map_server-0.4.0.ebuild
-2004141609 ./dev-ros/hector_map_tools/hector_map_tools-0.4.0-r1.ebuild
-2004141609 ./dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
-2001051415 ./dev-ros/hector_mapping/hector_mapping-0.3.5.ebuild
-2001051415 ./dev-ros/hector_mapping/hector_mapping-0.4.0.ebuild
-2001051415 ./dev-ros/hector_mapping/hector_mapping-9999.ebuild
-1702282250 ./dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.3.ebuild
-1702282250 ./dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.4.ebuild
-1702282250 ./dev-ros/hector_marker_drawing/hector_marker_drawing-0.3.5.ebuild
-1702282250 ./dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
-1912131539 ./dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.0.ebuild
-2001051415 ./dev-ros/hector_nav_msgs/hector_nav_msgs-0.3.5.ebuild
-2001051415 ./dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.0.ebuild
-2001051415 ./dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
-1812011809 ./dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
-1712282239 ./dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
-1702282250 ./dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
-1702282250 ./dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
-1702282250 ./dev-ros/hector_slam_launch/hector_slam_launch-0.3.3.ebuild
-1702282250 ./dev-ros/hector_slam_launch/hector_slam_launch-0.3.4.ebuild
-1702282250 ./dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild
-1702282250 ./dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
-1912131539 ./dev-ros/hector_slam_launch/hector_slam_launch-0.4.0.ebuild
-1709131458 ./dev-ros/hector_trajectory_server/hector_trajectory_server-0.3.5.ebuild
-1709131458 ./dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
-1912131539 ./dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.0.ebuild
+2007161939 ./dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-0.4.1.ebuild
+2007161939 ./dev-ros/hector_compressed_map_transport/hector_compressed_map_transport-9999.ebuild
+2007161939 ./dev-ros/hector_geotiff/hector_geotiff-0.4.1.ebuild
+2007161939 ./dev-ros/hector_geotiff/hector_geotiff-9999.ebuild
+2007161939 ./dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-0.4.1.ebuild
+2007161939 ./dev-ros/hector_geotiff_plugins/hector_geotiff_plugins-9999.ebuild
+2007161939 ./dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.4.1.ebuild
+2007161939 ./dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-9999.ebuild
+2007161939 ./dev-ros/hector_imu_tools/hector_imu_tools-0.4.1.ebuild
+2007161939 ./dev-ros/hector_imu_tools/hector_imu_tools-9999.ebuild
+2007161939 ./dev-ros/hector_map_server/hector_map_server-0.4.1.ebuild
+2007161939 ./dev-ros/hector_map_server/hector_map_server-9999.ebuild
+2007161939 ./dev-ros/hector_map_tools/hector_map_tools-0.4.1.ebuild
+2007161939 ./dev-ros/hector_map_tools/hector_map_tools-9999.ebuild
+2007161939 ./dev-ros/hector_mapping/hector_mapping-0.4.1.ebuild
+2007161939 ./dev-ros/hector_mapping/hector_mapping-9999.ebuild
+2007161939 ./dev-ros/hector_marker_drawing/hector_marker_drawing-0.4.1.ebuild
+2007161939 ./dev-ros/hector_marker_drawing/hector_marker_drawing-9999.ebuild
+2007161939 ./dev-ros/hector_nav_msgs/hector_nav_msgs-0.4.1.ebuild
+2007161939 ./dev-ros/hector_nav_msgs/hector_nav_msgs-9999.ebuild
+2007161939 ./dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0-r1.ebuild
+2007161939 ./dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
+2007161939 ./dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-0.3.0-r1.ebuild
+2007161939 ./dev-ros/hector_pose_estimation_core/hector_pose_estimation_core-9999.ebuild
+2007161939 ./dev-ros/hector_slam_launch/hector_slam_launch-0.4.1.ebuild
+2007161939 ./dev-ros/hector_slam_launch/hector_slam_launch-9999.ebuild
+2007161939 ./dev-ros/hector_trajectory_server/hector_trajectory_server-0.4.1.ebuild
+2007161939 ./dev-ros/hector_trajectory_server/hector_trajectory_server-9999.ebuild
 2007091539 ./dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
 2007091539 ./dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
-1702282250 ./dev-ros/image_geometry/image_geometry-1.12.3.ebuild
-1702282250 ./dev-ros/image_geometry/image_geometry-1.12.4.ebuild
-1711072223 ./dev-ros/image_geometry/image_geometry-1.12.5.ebuild
-1711150957 ./dev-ros/image_geometry/image_geometry-1.12.7.ebuild
-1805151008 ./dev-ros/image_geometry/image_geometry-1.12.8.ebuild
-1805221439 ./dev-ros/image_geometry/image_geometry-1.13.0.ebuild
-1702282250 ./dev-ros/image_geometry/image_geometry-9999.ebuild
+2007161609 ./dev-ros/image_geometry/image_geometry-1.15.0.ebuild
+2007161609 ./dev-ros/image_geometry/image_geometry-9999.ebuild
 2007091509 ./dev-ros/image_proc/image_proc-1.15.2.ebuild
 2007091509 ./dev-ros/image_proc/image_proc-9999.ebuild
 2007091509 ./dev-ros/image_publisher/image_publisher-1.15.2.ebuild
 2007091509 ./dev-ros/image_publisher/image_publisher-9999.ebuild
 2007091509 ./dev-ros/image_rotate/image_rotate-1.15.2.ebuild
 2007091509 ./dev-ros/image_rotate/image_rotate-9999.ebuild
-1808052009 ./dev-ros/image_transport/image_transport-1.11.13-r2.ebuild
-1808052009 ./dev-ros/image_transport/image_transport-9999.ebuild
+2007161609 ./dev-ros/image_transport/image_transport-1.12.0.ebuild
+2007161609 ./dev-ros/image_transport/image_transport-9999.ebuild
 2007091509 ./dev-ros/image_view/image_view-1.15.2.ebuild
 2007091509 ./dev-ros/image_view/image_view-9999.ebuild
 2007091539 ./dev-ros/imu_complementary_filter/imu_complementary_filter-1.2.2.ebuild
 2007091539 ./dev-ros/imu_complementary_filter/imu_complementary_filter-9999.ebuild
 2007091539 ./dev-ros/imu_filter_madgwick/imu_filter_madgwick-1.2.2.ebuild
 2007091539 ./dev-ros/imu_filter_madgwick/imu_filter_madgwick-9999.ebuild
-1702282250 ./dev-ros/imu_processors/imu_processors-0.2.1.ebuild
-1702282250 ./dev-ros/imu_processors/imu_processors-0.2.2.ebuild
-1902081439 ./dev-ros/imu_processors/imu_processors-0.2.3.ebuild
-1702282250 ./dev-ros/imu_processors/imu_processors-9999.ebuild
-1808042209 ./dev-ros/imu_transformer/imu_transformer-0.2.2-r1.ebuild
-1902081439 ./dev-ros/imu_transformer/imu_transformer-0.2.3.ebuild
-1712282239 ./dev-ros/imu_transformer/imu_transformer-9999.ebuild
+2007161939 ./dev-ros/imu_processors/imu_processors-0.3.0.ebuild
+2007161939 ./dev-ros/imu_processors/imu_processors-9999.ebuild
+2007161939 ./dev-ros/imu_transformer/imu_transformer-0.3.0.ebuild
+2007161939 ./dev-ros/imu_transformer/imu_transformer-9999.ebuild
 2007091539 ./dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.11.0.ebuild
 2007091539 ./dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-9999.ebuild
-1709102143 ./dev-ros/interactive_markers/interactive_markers-1.11.3.ebuild
-1805151008 ./dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
-1709102143 ./dev-ros/interactive_markers/interactive_markers-9999.ebuild
+2007161609 ./dev-ros/interactive_markers/interactive_markers-1.12.0.ebuild
+2007161609 ./dev-ros/interactive_markers/interactive_markers-9999.ebuild
 2007091539 ./dev-ros/interval_intersection/interval_intersection-0.10.14.ebuild
 2007091539 ./dev-ros/interval_intersection/interval_intersection-9999.ebuild
-1702282250 ./dev-ros/ivcon/ivcon-0.1.5.ebuild
-1702282250 ./dev-ros/ivcon/ivcon-0.1.6.ebuild
-1901081209 ./dev-ros/ivcon/ivcon-0.1.7.ebuild
-1702282250 ./dev-ros/ivcon/ivcon-9999.ebuild
+2007161939 ./dev-ros/ivcon/ivcon-0.1.7.ebuild
+2007161939 ./dev-ros/ivcon/ivcon-9999.ebuild
 2007082039 ./dev-ros/joint_limits_interface/joint_limits_interface-0.19.1.ebuild
 2007082039 ./dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
 2007082039 ./dev-ros/joint_state_publisher/joint_state_publisher-1.15.0.ebuild
@@ -14494,162 +14459,111 @@
 2007091539 ./dev-ros/joint_states_settler/joint_states_settler-9999.ebuild
 2007091409 ./dev-ros/kdl_conversions/kdl_conversions-1.13.2.ebuild
 2007091409 ./dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
-1706271301 ./dev-ros/kdl_parser/kdl_parser-1.12.10.ebuild
-1804071738 ./dev-ros/kdl_parser/kdl_parser-1.13.0.ebuild
-1807271409 ./dev-ros/kdl_parser/kdl_parser-1.13.1.ebuild
-1804071738 ./dev-ros/kdl_parser/kdl_parser-9999.ebuild
-1706271301 ./dev-ros/kdl_parser_py/kdl_parser_py-1.12.10.ebuild
-1804071738 ./dev-ros/kdl_parser_py/kdl_parser_py-1.13.0.ebuild
-1807271409 ./dev-ros/kdl_parser_py/kdl_parser_py-1.13.1.ebuild
-1804071738 ./dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
-1901081209 ./dev-ros/laser_assembler/laser_assembler-1.7.6.ebuild
-1908282039 ./dev-ros/laser_assembler/laser_assembler-1.7.7.ebuild
-1712282239 ./dev-ros/laser_assembler/laser_assembler-9999.ebuild
+2007161939 ./dev-ros/kdl_parser/kdl_parser-1.14.0.ebuild
+2007161939 ./dev-ros/kdl_parser/kdl_parser-9999.ebuild
+2007161939 ./dev-ros/kdl_parser_py/kdl_parser_py-1.14.0.ebuild
+2007161939 ./dev-ros/kdl_parser_py/kdl_parser_py-9999.ebuild
+2007161939 ./dev-ros/laser_assembler/laser_assembler-1.7.8.ebuild
+2007161939 ./dev-ros/laser_assembler/laser_assembler-9999.ebuild
 2007091539 ./dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
 2007091539 ./dev-ros/laser_cb_detector/laser_cb_detector-9999.ebuild
-1804281839 ./dev-ros/laser_filters/laser_filters-1.8.6.ebuild
-1908282039 ./dev-ros/laser_filters/laser_filters-1.8.7.ebuild
-1712282239 ./dev-ros/laser_filters/laser_filters-9999.ebuild
-1702282250 ./dev-ros/laser_geometry/laser_geometry-1.6.4.ebuild
-1702282250 ./dev-ros/laser_geometry/laser_geometry-9999.ebuild
-1808171639 ./dev-ros/laser_proc/laser_proc-0.1.5.ebuild
-1712282239 ./dev-ros/laser_proc/laser_proc-9999.ebuild
-1908282009 ./dev-ros/libmavconn/libmavconn-0.19.0-r1.ebuild
-1712282239 ./dev-ros/libmavconn/libmavconn-9999.ebuild
+2007161939 ./dev-ros/laser_filters/laser_filters-1.8.11.ebuild
+2007161939 ./dev-ros/laser_filters/laser_filters-9999.ebuild
+2007161939 ./dev-ros/laser_geometry/laser_geometry-1.6.5.ebuild
+2007161939 ./dev-ros/laser_geometry/laser_geometry-9999.ebuild
+2007161939 ./dev-ros/laser_proc/laser_proc-0.1.6.ebuild
+2007161939 ./dev-ros/laser_proc/laser_proc-9999.ebuild
+2007161939 ./dev-ros/libmavconn/libmavconn-1.2.0.ebuild
+2007161939 ./dev-ros/libmavconn/libmavconn-9999.ebuild
 2007091539 ./dev-ros/librviz_tutorial/librviz_tutorial-0.11.0.ebuild
 2007091539 ./dev-ros/librviz_tutorial/librviz_tutorial-9999.ebuild
-2001051415 ./dev-ros/map_msgs/map_msgs-1.13.0.ebuild
-2001051415 ./dev-ros/map_msgs/map_msgs-9999.ebuild
+2007161939 ./dev-ros/map_msgs/map_msgs-1.14.0.ebuild
+2007161939 ./dev-ros/map_msgs/map_msgs-9999.ebuild
 2007101909 ./dev-ros/map_server/map_server-1.17.0.ebuild
 2007101909 ./dev-ros/map_server/map_server-9999.ebuild
-1702282250 ./dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.2.7-r1.ebuild
-1705061917 ./dev-ros/mavlink-gbp-release/mavlink-gbp-release-2017.5.5.ebuild
-1912121411 ./dev-ros/mavlink-gbp-release/mavlink-gbp-release-2019.11.11.ebuild
-2001051415 ./dev-ros/mavros/mavros-0.19.0-r1.ebuild
-2001051415 ./dev-ros/mavros/mavros-9999.ebuild
-2001051415 ./dev-ros/mavros_extras/mavros_extras-0.19.0-r1.ebuild
-2001051415 ./dev-ros/mavros_extras/mavros_extras-9999.ebuild
-2001051415 ./dev-ros/mavros_msgs/mavros_msgs-0.18.7.ebuild
-2001051415 ./dev-ros/mavros_msgs/mavros_msgs-0.19.0.ebuild
-2001051415 ./dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
-1705041212 ./dev-ros/media_export/media_export-0.2.0.ebuild
-1705041212 ./dev-ros/media_export/media_export-9999.ebuild
+2007161939 ./dev-ros/mavlink-gbp-release/mavlink-gbp-release-2020.7.7.ebuild
+2007161939 ./dev-ros/mavros/mavros-1.2.0.ebuild
+2007161939 ./dev-ros/mavros/mavros-9999.ebuild
+2007161939 ./dev-ros/mavros_extras/mavros_extras-1.2.0.ebuild
+2007161939 ./dev-ros/mavros_extras/mavros_extras-9999.ebuild
+2007161939 ./dev-ros/mavros_msgs/mavros_msgs-1.2.0.ebuild
+2007161939 ./dev-ros/mavros_msgs/mavros_msgs-9999.ebuild
+2007161939 ./dev-ros/media_export/media_export-0.3.0.ebuild
+2007161939 ./dev-ros/media_export/media_export-9999.ebuild
 2007082039 ./dev-ros/message_filters/message_filters-1.15.7.ebuild
 2007082039 ./dev-ros/message_filters/message_filters-9999.ebuild
-1702282250 ./dev-ros/message_generation/message_generation-0.3.0.ebuild
-1702282250 ./dev-ros/message_generation/message_generation-0.4.0.ebuild
-1702282250 ./dev-ros/message_generation/message_generation-9999.ebuild
-1702282250 ./dev-ros/message_runtime/message_runtime-0.4.12.ebuild
-1702282250 ./dev-ros/message_runtime/message_runtime-9999.ebuild
-1709131458 ./dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
-1709131458 ./dev-ros/message_to_tf/message_to_tf-9999.ebuild
+2007161939 ./dev-ros/message_generation/message_generation-0.4.1.ebuild
+2007161939 ./dev-ros/message_generation/message_generation-9999.ebuild
+2007161939 ./dev-ros/message_runtime/message_runtime-0.4.13.ebuild
+2007161939 ./dev-ros/message_runtime/message_runtime-9999.ebuild
+2007161939 ./dev-ros/message_to_tf/message_to_tf-0.3.0.ebuild
+2007161939 ./dev-ros/message_to_tf/message_to_tf-9999.ebuild
 2007102009 ./dev-ros/mk/mk-1.15.5.ebuild
 2007102009 ./dev-ros/mk/mk-9999.ebuild
 2007091539 ./dev-ros/monocam_settler/monocam_settler-0.10.14.ebuild
 2007091539 ./dev-ros/monocam_settler/monocam_settler-9999.ebuild
 2007101909 ./dev-ros/move_base/move_base-1.17.0.ebuild
 2007101909 ./dev-ros/move_base/move_base-9999.ebuild
-2001051415 ./dev-ros/move_base_msgs/move_base_msgs-1.13.0.ebuild
-2001051415 ./dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
+2007161939 ./dev-ros/move_base_msgs/move_base_msgs-1.14.0.ebuild
+2007161939 ./dev-ros/move_base_msgs/move_base_msgs-9999.ebuild
 2007101909 ./dev-ros/move_slow_and_clear/move_slow_and_clear-1.17.0.ebuild
 2007101909 ./dev-ros/move_slow_and_clear/move_slow_and_clear-9999.ebuild
-2001051415 ./dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
-2001051415 ./dev-ros/moveit_msgs/moveit_msgs-0.9.1.ebuild
-2001051415 ./dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
+2007161939 ./dev-ros/moveit_msgs/moveit_msgs-0.10.1.ebuild
+2007161939 ./dev-ros/moveit_msgs/moveit_msgs-9999.ebuild
 2007101909 ./dev-ros/nav_core/nav_core-1.17.0.ebuild
 2007101909 ./dev-ros/nav_core/nav_core-9999.ebuild
 2007082039 ./dev-ros/nav_msgs/nav_msgs-1.13.0.ebuild
 2007082039 ./dev-ros/nav_msgs/nav_msgs-9999.ebuild
 2007101909 ./dev-ros/navfn/navfn-1.17.0.ebuild
 2007101909 ./dev-ros/navfn/navfn-9999.ebuild
-2001051415 ./dev-ros/nmea_msgs/nmea_msgs-1.0.0.ebuild
-2001051415 ./dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
+2007161609 ./dev-ros/nmea_msgs/nmea_msgs-1.1.0.ebuild
+2007161609 ./dev-ros/nmea_msgs/nmea_msgs-9999.ebuild
 2007091509 ./dev-ros/nodelet/nodelet-1.10.0.ebuild
 2007091509 ./dev-ros/nodelet/nodelet-9999.ebuild
 2007091509 ./dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.10.0.ebuild
 2007091509 ./dev-ros/nodelet_topic_tools/nodelet_topic_tools-9999.ebuild
 2007082039 ./dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-0.1.12.ebuild
 2007082039 ./dev-ros/nodelet_tutorial_math/nodelet_tutorial_math-9999.ebuild
-2001051415 ./dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
-2001051415 ./dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
-2001051415 ./dev-ros/octomap_msgs/octomap_msgs-0.3.3.ebuild
-2001051415 ./dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
-1702282250 ./dev-ros/octomap_ros/octomap_ros-0.4.0-r1.ebuild
-1702282250 ./dev-ros/octomap_ros/octomap_ros-9999.ebuild
-1712282239 ./dev-ros/opencv_apps/opencv_apps-9999.ebuild
-1912102039 ./dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
-1702282250 ./dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
-1702282250 ./dev-ros/opencv_tests/opencv_tests-1.12.2.ebuild
-1702282250 ./dev-ros/opencv_tests/opencv_tests-1.12.3.ebuild
-1702282250 ./dev-ros/opencv_tests/opencv_tests-1.12.4.ebuild
-1711072223 ./dev-ros/opencv_tests/opencv_tests-1.12.5.ebuild
-1711150957 ./dev-ros/opencv_tests/opencv_tests-1.12.7.ebuild
-1805151008 ./dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild
-1805221439 ./dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
-1702282250 ./dev-ros/opencv_tests/opencv_tests-9999.ebuild
-1712282239 ./dev-ros/openni2_camera/openni2_camera-0.3.0-r1.ebuild
-1807201839 ./dev-ros/openni2_camera/openni2_camera-0.4.0.ebuild
-1901081209 ./dev-ros/openni2_camera/openni2_camera-0.4.2.ebuild
-1712282239 ./dev-ros/openni2_camera/openni2_camera-9999.ebuild
-1807201839 ./dev-ros/openni2_launch/openni2_launch-0.4.0.ebuild
-1901081209 ./dev-ros/openni2_launch/openni2_launch-0.4.2.ebuild
-1901081209 ./dev-ros/openni2_launch/openni2_launch-9999.ebuild
-1702282250 ./dev-ros/openslam_gmapping/openslam_gmapping-0.1.1.ebuild
-1702282250 ./dev-ros/openslam_gmapping/openslam_gmapping-0.1.2.ebuild
-1702282250 ./dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
-1805081538 ./dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
-2005181440 ./dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
-2001051415 ./dev-ros/pcl_msgs/pcl_msgs-0.2.0.ebuild
-2001051415 ./dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
-2005181440 ./dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
-2005181440 ./dev-ros/pcl_ros/pcl_ros-9999.ebuild
-2001051415 ./dev-ros/pluginlib/pluginlib-1.12.0-r1.ebuild
-2001051415 ./dev-ros/pluginlib/pluginlib-1.12.1.ebuild
-2001051415 ./dev-ros/pluginlib/pluginlib-9999.ebuild
+2007161609 ./dev-ros/object_recognition_msgs/object_recognition_msgs-0.4.1.ebuild
+2007161609 ./dev-ros/object_recognition_msgs/object_recognition_msgs-9999.ebuild
+2007161939 ./dev-ros/octomap_msgs/octomap_msgs-0.3.5.ebuild
+2007161939 ./dev-ros/octomap_msgs/octomap_msgs-9999.ebuild
+2007161609 ./dev-ros/octomap_ros/octomap_ros-0.4.1.ebuild
+2007161609 ./dev-ros/octomap_ros/octomap_ros-9999.ebuild
+2007161939 ./dev-ros/opencv_apps/opencv_apps-2.0.1.ebuild
+2007161939 ./dev-ros/opencv_apps/opencv_apps-9999.ebuild
+2007161609 ./dev-ros/opencv_tests/opencv_tests-1.15.0.ebuild
+2007161609 ./dev-ros/opencv_tests/opencv_tests-9999.ebuild
+2007161609 ./dev-ros/openni2_camera/openni2_camera-1.4.2.ebuild
+2007161609 ./dev-ros/openni2_camera/openni2_camera-9999.ebuild
+2007161609 ./dev-ros/openni2_launch/openni2_launch-1.4.2.ebuild
+2007161609 ./dev-ros/openni2_launch/openni2_launch-9999.ebuild
+2007161609 ./dev-ros/openslam_gmapping/openslam_gmapping-0.2.1.ebuild
+2007161609 ./dev-ros/openslam_gmapping/openslam_gmapping-9999.ebuild
+2007161609 ./dev-ros/pcl_conversions/pcl_conversions-1.7.1.ebuild
+2007161609 ./dev-ros/pcl_conversions/pcl_conversions-9999.ebuild
+2007161939 ./dev-ros/pcl_msgs/pcl_msgs-0.3.0.ebuild
+2007161939 ./dev-ros/pcl_msgs/pcl_msgs-9999.ebuild
+2007161609 ./dev-ros/pcl_ros/pcl_ros-1.7.1.ebuild
+2007161609 ./dev-ros/pcl_ros/pcl_ros-9999.ebuild
+2007161609 ./dev-ros/pluginlib/pluginlib-1.13.0.ebuild
+2007161609 ./dev-ros/pluginlib/pluginlib-9999.ebuild
 2007082039 ./dev-ros/pluginlib_tutorials/pluginlib_tutorials-0.1.12.ebuild
 2007082039 ./dev-ros/pluginlib_tutorials/pluginlib_tutorials-9999.ebuild
-1712282239 ./dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.0-r1.ebuild
-1712282239 ./dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
-2001051415 ./dev-ros/polled_camera/polled_camera-1.11.12.ebuild
-2001051415 ./dev-ros/polled_camera/polled_camera-1.11.13.ebuild
-2001051415 ./dev-ros/polled_camera/polled_camera-9999.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.10.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.11.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.13.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.14.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.11.9.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.0.ebuild
-1802150908 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.1.ebuild
-1804221608 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.2.ebuild
-1810041609 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.3.ebuild
-1905241939 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
-1702282250 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
-1707072110 ./dev-ros/pr2_description/pr2_description-1.12.0.ebuild
-1802150908 ./dev-ros/pr2_description/pr2_description-1.12.1.ebuild
-1804221608 ./dev-ros/pr2_description/pr2_description-1.12.2.ebuild
-1810041609 ./dev-ros/pr2_description/pr2_description-1.12.3.ebuild
-1905241939 ./dev-ros/pr2_description/pr2_description-1.12.4.ebuild
-1810041609 ./dev-ros/pr2_description/pr2_description-9999.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-1.11.10.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-1.11.11.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-1.11.13.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-1.11.14.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-1.11.9.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-1.12.0.ebuild
-1802150908 ./dev-ros/pr2_machine/pr2_machine-1.12.1.ebuild
-1804221608 ./dev-ros/pr2_machine/pr2_machine-1.12.2.ebuild
-1810041609 ./dev-ros/pr2_machine/pr2_machine-1.12.3.ebuild
-1905241939 ./dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
-1702282250 ./dev-ros/pr2_machine/pr2_machine-9999.ebuild
-2001051415 ./dev-ros/pr2_msgs/pr2_msgs-1.12.0.ebuild
-2001051415 ./dev-ros/pr2_msgs/pr2_msgs-1.12.1.ebuild
-2001051415 ./dev-ros/pr2_msgs/pr2_msgs-1.12.2.ebuild
-2001051415 ./dev-ros/pr2_msgs/pr2_msgs-1.12.3.ebuild
-2001051415 ./dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
-2001051415 ./dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
-2001051415 ./dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
-2001051415 ./dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
-2001051415 ./dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
+2007161609 ./dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.4.1.ebuild
+2007161609 ./dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
+2007161609 ./dev-ros/polled_camera/polled_camera-1.12.0.ebuild
+2007161609 ./dev-ros/polled_camera/polled_camera-9999.ebuild
+2007161609 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-1.12.4.ebuild
+2007161609 ./dev-ros/pr2_dashboard_aggregator/pr2_dashboard_aggregator-9999.ebuild
+2007161609 ./dev-ros/pr2_description/pr2_description-1.12.4.ebuild
+2007161609 ./dev-ros/pr2_description/pr2_description-9999.ebuild
+2007161609 ./dev-ros/pr2_machine/pr2_machine-1.12.4.ebuild
+2007161609 ./dev-ros/pr2_machine/pr2_machine-9999.ebuild
+2007161609 ./dev-ros/pr2_msgs/pr2_msgs-1.12.4.ebuild
+2007161609 ./dev-ros/pr2_msgs/pr2_msgs-9999.ebuild
+2007161609 ./dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
+2007161609 ./dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
 2007152009 ./dev-ros/qt_dotgraph/qt_dotgraph-0.4.1.ebuild
 2007152009 ./dev-ros/qt_dotgraph/qt_dotgraph-9999.ebuild
 2007152009 ./dev-ros/qt_gui/qt_gui-0.4.1.ebuild
@@ -14850,9 +14764,8 @@
 2007101639 ./dev-ros/rqt_topic/rqt_topic-9999.ebuild
 2007101639 ./dev-ros/rqt_web/rqt_web-0.4.9.ebuild
 2007101639 ./dev-ros/rqt_web/rqt_web-9999.ebuild
-2004020339 ./dev-ros/rviz/rviz-1.13.6-r1.ebuild
-2004020339 ./dev-ros/rviz/rviz-9999.ebuild
-2005181839 ./dev-ros/rviz/rviz-1.14.0.ebuild
+2007161609 ./dev-ros/rviz/rviz-1.14.1.ebuild
+2007161609 ./dev-ros/rviz/rviz-9999.ebuild
 2007091539 ./dev-ros/rviz_imu_plugin/rviz_imu_plugin-1.2.2.ebuild
 2007091539 ./dev-ros/rviz_imu_plugin/rviz_imu_plugin-9999.ebuild
 2007091539 ./dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.11.0.ebuild
@@ -15030,6 +14943,8 @@
 2007082039 ./dev-ros/joint_state_publisher_gui/joint_state_publisher_gui-9999.ebuild
 2007151839 ./dev-ros/rosbridge_msgs/rosbridge_msgs-0.11.9.ebuild
 2007151839 ./dev-ros/rosbridge_msgs/rosbridge_msgs-9999.ebuild
+2007162039 ./dev-ros/actionlib_tools/actionlib_tools-1.13.1.ebuild
+2007162039 ./dev-ros/actionlib_tools/actionlib_tools-9999.ebuild
 1904112109 ./dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
 2004251609 ./dev-ruby/abstract/abstract-1.0.0-r3.ebuild
 1908300909 ./dev-ruby/acme-client/acme-client-2.0.4.ebuild
@@ -15507,7 +15422,7 @@
 1807310809 ./dev-ruby/jwt/jwt-1.5.6.ebuild
 1902021109 ./dev-ruby/jwt/jwt-2.1.0.ebuild
 1905241039 ./dev-ruby/jwt/jwt-2.2.0.ebuild
-2002020939 ./dev-ruby/jwt/jwt-2.2.1.ebuild
+2007170409 ./dev-ruby/jwt/jwt-2.2.1.ebuild
 2002230909 ./dev-ruby/kirbybase/kirbybase-2.6.1-r2.ebuild
 1902011509 ./dev-ruby/kissfft/kissfft-0.0.2.ebuild
 2004122139 ./dev-ruby/kpeg/kpeg-1.1.0-r1.ebuild
@@ -15686,7 +15601,7 @@
 2007112039 ./dev-ruby/oauth2/oauth2-1.4.4.ebuild
 2003111039 ./dev-ruby/octokit/octokit-4.17.0.ebuild
 2003291109 ./dev-ruby/octokit/octokit-4.18.0.ebuild
-2006261609 ./dev-ruby/octokit/octokit-4.18.0-r1.ebuild
+2007170409 ./dev-ruby/octokit/octokit-4.18.0-r1.ebuild
 1903301009 ./dev-ruby/omniauth/omniauth-1.9.0.ebuild
 2003031039 ./dev-ruby/omniauth/omniauth-1.9.1.ebuild
 2004122139 ./dev-ruby/open4/open4-1.3.4.ebuild
@@ -16760,6 +16675,7 @@
 1702282250 ./dev-util/complexity/complexity-1.10.ebuild
 2003251709 ./dev-util/conan/conan-1.23.0.ebuild
 2004231109 ./dev-util/conan/conan-1.24.1.ebuild
+2007161809 ./dev-util/conan/conan-1.26.1.ebuild
 2002230040 ./dev-util/conf2struct/conf2struct-9999.ebuild
 2007132009 ./dev-util/conf2struct/conf2struct-1.0.ebuild
 1910161209 ./dev-util/confix-wrapper/confix-wrapper-1.ebuild
@@ -16947,7 +16863,7 @@
 1912272339 ./dev-util/icmake/icmake-9.02.09.ebuild
 2001180709 ./dev-util/icmake/icmake-9.03.01.ebuild
 2006080209 ./dev-util/idea-community/idea-community-2020.1.2.201.7846.76.ebuild
-2007082009 ./dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
+2007170409 ./dev-util/idea-community/idea-community-2020.1.3.201.8538.31.ebuild
 1801071039 ./dev-util/ignition-cmake/ignition-cmake-0.2.0.ebuild
 1801281608 ./dev-util/ignition-cmake/ignition-cmake-0.4.0.ebuild
 2005151939 ./dev-util/ignition-cmake/ignition-cmake-2.2.0.ebuild
@@ -17102,7 +17018,7 @@
 2006130209 ./dev-util/perf/perf-5.7-r1.ebuild
 2007052309 ./dev-util/pkgcheck/pkgcheck-0.7.7.ebuild
 2007052309 ./dev-util/pkgcheck/pkgcheck-9999.ebuild
-2007160739 ./dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
+2007161609 ./dev-util/pkgcheck/pkgcheck-0.7.6-r1.ebuild
 2007131839 ./dev-util/pkgconf/pkgconf-1.6.3.ebuild
 2007131839 ./dev-util/pkgconf/pkgconf-1.7.2.ebuild
 2007131839 ./dev-util/pkgconf/pkgconf-1.7.3.ebuild
@@ -18443,6 +18359,7 @@
 2006021108 ./gnome-base/gnome-shell/gnome-shell-3.34.5.ebuild
 2007130039 ./gnome-base/gnome-shell/gnome-shell-3.36.4.ebuild
 2007151039 ./gnome-base/gnome-shell/gnome-shell-3.36.4-r1.ebuild
+2007162039 ./gnome-base/gnome-shell/gnome-shell-3.36.4-r2.ebuild
 2006132027 ./gnome-base/gnome-vfs/gnome-vfs-2.24.4-r5.ebuild
 2004202139 ./gnome-base/gnome/gnome-3.34.4.ebuild
 2006162009 ./gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.34.0.ebuild
@@ -18642,10 +18559,11 @@
 1809280109 ./gnustep-libs/sqlclient/sqlclient-1.8.1-r1.ebuild
 1908120409 ./gui-apps/grim/grim-1.2.0.ebuild
 1908120409 ./gui-apps/grim/grim-9999.ebuild
+2007161809 ./gui-apps/grim/grim-1.3.0.ebuild
 2002210439 ./gui-apps/mako/mako-1.4.1.ebuild
 2002210439 ./gui-apps/mako/mako-9999.ebuild
 1908120409 ./gui-apps/slurp/slurp-1.2.0.ebuild
-1908120409 ./gui-apps/slurp/slurp-9999.ebuild
+2007161809 ./gui-apps/slurp/slurp-9999.ebuild
 2001240739 ./gui-apps/swaybg/swaybg-1.0.ebuild
 2001240739 ./gui-apps/swaybg/swaybg-9999.ebuild
 2001240739 ./gui-apps/swayidle/swayidle-9999.ebuild
@@ -18678,7 +18596,8 @@
 2001271309 ./gui-libs/tepl/tepl-4.2.1.ebuild
 2004191909 ./gui-libs/wlroots/wlroots-0.10.1.ebuild
 2004240439 ./gui-libs/wlroots/wlroots-0.10.0.ebuild
-2005160609 ./gui-libs/wlroots/wlroots-9999.ebuild
+2007161809 ./gui-libs/wlroots/wlroots-0.11.0.ebuild
+2007161809 ./gui-libs/wlroots/wlroots-9999.ebuild
 2006012338 ./gui-libs/libwpe/libwpe-1.4.0.1.ebuild
 2006012338 ./gui-libs/wpebackend-fdo/wpebackend-fdo-1.4.0.ebuild
 2007091609 ./gui-libs/gtk-layer-shell/gtk-layer-shell-0.1.0-r1.ebuild
@@ -18686,9 +18605,9 @@
 2006212208 ./gui-libs/wf-config/wf-config-0.4.1.ebuild
 2007030209 ./gui-libs/greetd/greetd-0.6.1.ebuild
 2007072309 ./gui-libs/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr-9999.ebuild
-2006280339 ./gui-wm/sway/sway-1.5_rc1.ebuild
-2006280009 ./gui-wm/sway/sway-9999.ebuild
 2006302339 ./gui-wm/sway/sway-1.4-r2.ebuild
+2007161809 ./gui-wm/sway/sway-1.5.ebuild
+2007161809 ./gui-wm/sway/sway-9999.ebuild
 2006070339 ./gui-wm/wayfire/wayfire-9999.ebuild
 2006212208 ./gui-wm/wayfire/wayfire-0.4.0-r2.ebuild
 2006060509 ./gui-wm/hikari/hikari-1.2.0.ebuild
@@ -20160,9 +20079,9 @@
 2002222009 ./media-gfx/gimp/gimp-2.9.8-r1.ebuild
 2004100109 ./media-gfx/gimp/gimp-2.8.22-r2.ebuild
 2005241539 ./media-gfx/gimp/gimp-2.10.14-r1.ebuild
-2005251539 ./media-gfx/gimp/gimp-2.10.18-r1.ebuild
 2006251139 ./media-gfx/gimp/gimp-9999.ebuild
 2007051139 ./media-gfx/gimp/gimp-2.10.20.ebuild
+2007170339 ./media-gfx/gimp/gimp-2.10.18-r1.ebuild
 2004051309 ./media-gfx/gmic/gmic-2.9.0.ebuild
 2006300609 ./media-gfx/gmic/gmic-2.9.1.ebuild
 2002092009 ./media-gfx/gnofract4d/gnofract4d-4.0.1_p1-r1.ebuild
@@ -20218,11 +20137,11 @@
 1702282250 ./media-gfx/iscan-plugin-gt-x820/iscan-plugin-gt-x820-2.2.0.1.ebuild
 1702282250 ./media-gfx/iscan-plugin-perfection-v370/iscan-plugin-perfection-v370-1.0.0.2.ebuild
 2003251909 ./media-gfx/iscan/iscan-2.30.4.2.ebuild
-2005171439 ./media-gfx/iscan/iscan-3.62.0.ebuild
+2007161809 ./media-gfx/iscan/iscan-3.62.0.ebuild
 1708311440 ./media-gfx/jhead/jhead-3.00.ebuild
 2002230040 ./media-gfx/jhead/jhead-3.00-r2.ebuild
 2004032241 ./media-gfx/jhead/jhead-2.97.ebuild
-2007041739 ./media-gfx/jhead/jhead-3.04.ebuild
+2007170639 ./media-gfx/jhead/jhead-3.04.ebuild
 1902162309 ./media-gfx/jigl/jigl-2.0.1-r1.ebuild
 1805290208 ./media-gfx/jp2a/jp2a-1.0.6-r1.ebuild
 1911131109 ./media-gfx/jpeg2ps/jpeg2ps-1.9-r2.ebuild
@@ -20258,7 +20177,7 @@
 1902221509 ./media-gfx/mkgallery/mkgallery-1.1-r1.ebuild
 2006222338 ./media-gfx/monica/monica-3.7.ebuild
 2002231739 ./media-gfx/mscgen/mscgen-0.20.ebuild
-2006241739 ./media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
+2007170339 ./media-gfx/mypaint-brushes/mypaint-brushes-1.3.0-r1.ebuild
 2006172009 ./media-gfx/mypaint/mypaint-1.2.1-r5.ebuild
 1912311809 ./media-gfx/nomacs/nomacs-3.12.ebuild
 2006161709 ./media-gfx/nomacs/nomacs-3.14.2.ebuild
@@ -20397,7 +20316,7 @@
 2002171909 ./media-gfx/word_cloud/word_cloud-1.6.0.ebuild
 2003300139 ./media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200224.ebuild
 2004262339 ./media-gfx/waifu2x-ncnn-vulkan/waifu2x-ncnn-vulkan-20200414.ebuild
-2005310139 ./media-gfx/flameshot/flameshot-0.6.0.ebuild
+2007161609 ./media-gfx/flameshot/flameshot-0.6.0.ebuild
 2006250939 ./media-gfx/netpaint/netpaint-1.1.2.ebuild
 1912312209 ./media-libs/Field3D/Field3D-1.7.2.ebuild
 2003111539 ./media-libs/SoXt/SoXt-1.3.0-r1.ebuild
@@ -20434,7 +20353,7 @@
 2007051139 ./media-libs/babl/babl-0.1.78.ebuild
 1911301809 ./media-libs/bcg729/bcg729-999999.ebuild
 2004032241 ./media-libs/bcg729/bcg729-1.0.4.ebuild
-2005061009 ./media-libs/bcg729/bcg729-1.0.4-r1.ebuild
+2007162109 ./media-libs/bcg729/bcg729-1.0.4-r1.ebuild
 2003261841 ./media-libs/bio2jack/bio2jack-0.9-r2.ebuild
 1802221208 ./media-libs/blib/blib-1.1.7-r2.ebuild
 1910111911 ./media-libs/cal3d/cal3d-0.11.0-r1.ebuild
@@ -20711,7 +20630,7 @@
 2003261841 ./media-libs/libldac/libldac-2.0.2-r1.ebuild
 1806030209 ./media-libs/liblingoteach/liblingoteach-0.2.3.ebuild
 1906271039 ./media-libs/liblo/liblo-0.30.ebuild
-2003021209 ./media-libs/liblo/liblo-0.31.ebuild
+2007161609 ./media-libs/liblo/liblo-0.31.ebuild
 2002151310 ./media-libs/liblqr/liblqr-0.4.2-r1.ebuild
 1811080309 ./media-libs/liblrdf/liblrdf-0.6.1.ebuild
 1901172039 ./media-libs/liblscp/liblscp-0.6.0.ebuild
@@ -22273,8 +22192,8 @@
 2006132027 ./media-video/ffmpeg/ffmpeg-4.2.3.ebuild
 2007021739 ./media-video/ffmpeg/ffmpeg-9999.ebuild
 2007041609 ./media-video/ffmpeg/ffmpeg-4.3.ebuild
-2007091539 ./media-video/ffmpeg/ffmpeg-4.2.4.ebuild
 2007121139 ./media-video/ffmpeg/ffmpeg-4.3-r1.ebuild
+2007170639 ./media-video/ffmpeg/ffmpeg-4.2.4.ebuild
 2004261509 ./media-video/ffmpeg2theora/ffmpeg2theora-0.30.ebuild
 2004261339 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.0-r1.ebuild
 1808181139 ./media-video/flvstreamer/flvstreamer-2.1c.ebuild
@@ -22736,12 +22655,8 @@
 2004251339 ./net-analyzer/net-snmp/net-snmp-99999999.ebuild
 2003261841 ./net-analyzer/netcat/netcat-110.20180111.ebuild
 2004211009 ./net-analyzer/netcat/netcat-110-r9.ebuild
-2004201839 ./net-analyzer/netdata/netdata-1.21.1-r1.ebuild
-2005201739 ./net-analyzer/netdata/netdata-1.22.0-r1.ebuild
-2006041909 ./net-analyzer/netdata/netdata-1.22.1-r1.ebuild
 2006041909 ./net-analyzer/netdata/netdata-9999.ebuild
-2006251639 ./net-analyzer/netdata/netdata-1.23.0.ebuild
-2007020109 ./net-analyzer/netdata/netdata-1.23.1.ebuild
+2007161609 ./net-analyzer/netdata/netdata-1.23.2.ebuild
 1702282250 ./net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
 2001311739 ./net-analyzer/netdiscover/netdiscover-0.3_beta6-r4.ebuild
 2002112051 ./net-analyzer/nethogs/nethogs-0.8.5-r1.ebuild
@@ -23062,7 +22977,7 @@
 2006120709 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.42.ebuild
 2006120709 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.43.ebuild
 2006120709 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
-2007142009 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
+2007170339 ./net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
 1912110241 ./net-dns/dnsdist/dnsdist-1.3.3-r1.ebuild
 2001151339 ./net-dns/dnsdist/dnsdist-1.4.0.ebuild
 2001182109 ./net-dns/dnshijacker/dnshijacker-1.3-r2.ebuild
@@ -23235,8 +23150,8 @@
 2006242039 ./net-fs/samba/samba-4.11.8.ebuild
 2006251139 ./net-fs/samba/samba-4.11.9-r1.ebuild
 2006251139 ./net-fs/samba/samba-4.12.3-r1.ebuild
-2007022309 ./net-fs/samba/samba-4.12.4.ebuild
-2007121709 ./net-fs/samba/samba-4.11.11.ebuild
+2007170639 ./net-fs/samba/samba-4.11.11.ebuild
+2007161609 ./net-fs/samba/samba-4.12.4.ebuild
 2003280339 ./net-fs/smbnetfs/smbnetfs-0.6.2.ebuild
 1808262039 ./net-fs/smbtad/smbtad-1.2.6.ebuild
 2004282139 ./net-fs/sshfs/sshfs-3.7.0.ebuild
@@ -23547,8 +23462,9 @@
 2006021739 ./net-libs/libcork/libcork-0.15.0-r1.ebuild
 1906250139 ./net-libs/libcorkipset/libcorkipset-1.1.1.20150311_p8.ebuild
 2002151310 ./net-libs/libcrafter/libcrafter-0.3.ebuild
-2002151310 ./net-libs/libcrafter/libcrafter-9999.ebuild
 2007151009 ./net-libs/libcrafter/libcrafter-0.3_p20171019.ebuild
+2007161639 ./net-libs/libcrafter/libcrafter-1.0.ebuild
+2007161639 ./net-libs/libcrafter/libcrafter-9999.ebuild
 1912110241 ./net-libs/libdmapsharing/libdmapsharing-2.9.39.ebuild
 1912041809 ./net-libs/libdom/libdom-0.4.0.ebuild
 1912110241 ./net-libs/libdom/libdom-0.3.3-r1.ebuild
@@ -23657,7 +23573,7 @@
 2006132027 ./net-libs/libpcap/libpcap-9999.ebuild
 2007141709 ./net-libs/libpcap/libpcap-1.9.1-r3.ebuild
 2002151310 ./net-libs/libpcapnav/libpcapnav-0.8.ebuild
-1911191909 ./net-libs/libpri/libpri-1.6.0.ebuild
+2007162109 ./net-libs/libpri/libpri-1.6.0.ebuild
 1904151309 ./net-libs/libprotoident/libprotoident-2.0.13.ebuild
 1904151309 ./net-libs/libprotoident/libprotoident-9999.ebuild
 1911201539 ./net-libs/libprotoident/libprotoident-2.0.14_p1.ebuild
@@ -23734,8 +23650,8 @@
 2004032241 ./net-libs/loudmouth/loudmouth-1.5.3-r3.ebuild
 2006070009 ./net-libs/mbedtls/mbedtls-2.16.6.ebuild
 2006070009 ./net-libs/mbedtls/mbedtls-2.22.0-r1.ebuild
-2007091109 ./net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
-2007091109 ./net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
+2007170509 ./net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
+2007170509 ./net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
 2004032241 ./net-libs/meanwhile/meanwhile-1.0.2-r1.ebuild
 2003211239 ./net-libs/miniupnpc/miniupnpc-2.1.20191224.ebuild
 1908200909 ./net-libs/nDPI/nDPI-2.8.ebuild
@@ -23783,19 +23699,19 @@
 1910111911 ./net-libs/openpgm/openpgm-5.1.118-r1.ebuild
 1910111911 ./net-libs/openpgm/openpgm-5.2.122.ebuild
 2004032241 ./net-libs/ortp/ortp-0.23.0-r1.ebuild
-1702282250 ./net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
+2007162109 ./net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
 2006081709 ./net-libs/pacparser/pacparser-1.3.7-r1.ebuild
 2002112051 ./net-libs/phodav/phodav-2.2.ebuild
 2004261409 ./net-libs/pjproject/pjproject-2.7.1-r1.ebuild
 2004261409 ./net-libs/pjproject/pjproject-2.7.2-r2.ebuild
-2005061009 ./net-libs/pjproject/pjproject-2.9-r2.ebuild
+2007162109 ./net-libs/pjproject/pjproject-2.9-r2.ebuild
 2002230040 ./net-libs/quiche/quiche-0.1.0-r1.ebuild
 2002230040 ./net-libs/quiche/quiche-0.1.0_alpha4_p20190912.ebuild
 2002230040 ./net-libs/quiche/quiche-0.2.0.ebuild
 2003131839 ./net-libs/quiche/quiche-0.3.0.ebuild
 2005152039 ./net-libs/quiche/quiche-0.4.0.ebuild
 2007150009 ./net-libs/quiche/quiche-0.5.0.ebuild
-2007150009 ./net-libs/quiche/quiche-9999.ebuild
+2007170309 ./net-libs/quiche/quiche-9999.ebuild
 2003110009 ./net-libs/qxmpp/qxmpp-9999.ebuild
 2006040939 ./net-libs/qxmpp/qxmpp-1.2.0.ebuild
 2004032241 ./net-libs/rabbitmq-c/rabbitmq-c-0.10.0.ebuild
@@ -23864,7 +23780,7 @@
 2004191909 ./net-libs/libnma/libnma-1.8.24.ebuild
 2006072339 ./net-libs/libnma/libnma-1.8.28.ebuild
 2006280009 ./net-libs/libnma/libnma-1.8.30.ebuild
-2007121139 ./net-libs/libslirp/libslirp-4.3.1.ebuild
+2007170339 ./net-libs/libslirp/libslirp-4.3.1.ebuild
 2006191939 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.3.ebuild
 2006251009 ./net-libs/xrootd-ceph/xrootd-ceph-4.12.0.ebuild
 2007081809 ./net-libs/xrootd-ceph/xrootd-ceph-5.0.0.ebuild
@@ -24027,19 +23943,19 @@
 1801071509 ./net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.21-r1.ebuild
 1810062209 ./net-misc/asterisk-core-sounds/asterisk-core-sounds-1.4.22.ebuild
 1911281939 ./net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1.ebuild
-2005061009 ./net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
+2007162109 ./net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
 1910022239 ./net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.4.11-r1.ebuild
-2005061009 ./net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
+2007162109 ./net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
 1806141939 ./net-misc/asterisk-g729/asterisk-g729-11.0.3.1.9.ebuild
 2001232039 ./net-misc/asterisk-g729/asterisk-g729-13.0.3.1.9.ebuild
 2004131109 ./net-misc/asterisk-g729/asterisk-g729-16.0.3.1.9.ebuild
 1908061209 ./net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03.ebuild
-2005061009 ./net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
+2007162109 ./net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
 1909101739 ./net-misc/asterisk/asterisk-11.25.3.ebuild
-2007011009 ./net-misc/asterisk/asterisk-13.33.0.ebuild
 2007011009 ./net-misc/asterisk/asterisk-13.34.0.ebuild
-2007011009 ./net-misc/asterisk/asterisk-16.10.0.ebuild
 2007011009 ./net-misc/asterisk/asterisk-16.11.1.ebuild
+2007162109 ./net-misc/asterisk/asterisk-13.33.0.ebuild
+2007162109 ./net-misc/asterisk/asterisk-16.10.0.ebuild
 1702282250 ./net-misc/astmanproxy/astmanproxy-1.28.2.ebuild
 1910022239 ./net-misc/autossh/autossh-1.4g.ebuild
 1911110039 ./net-misc/autoupnp/autoupnp-0.4.7.ebuild
@@ -24105,10 +24021,10 @@
 2006171939 ./net-misc/curl/curl-7.68.0.ebuild
 2006171939 ./net-misc/curl/curl-7.69.1.ebuild
 2006171939 ./net-misc/curl/curl-7.70.0-r1.ebuild
-2007062109 ./net-misc/curl/curl-7.71.1.ebuild
-2007091139 ./net-misc/curl/curl-7.71.0.ebuild
-2004131809 ./net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
-2007152109 ./net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+2007170639 ./net-misc/curl/curl-7.71.0.ebuild
+2007170639 ./net-misc/curl/curl-7.71.1.ebuild
+2007162109 ./net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
+2007162109 ./net-misc/dahdi/dahdi-3.1.0-r1.ebuild
 1907151840 ./net-misc/datapipe/datapipe-1.0-r2.ebuild
 1910051539 ./net-misc/dcetest/dcetest-2.0.ebuild
 1702282250 ./net-misc/dhcdrop/dhcdrop-0.5.ebuild
@@ -24422,7 +24338,7 @@
 2004261539 ./net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
 1907231409 ./net-misc/putty/putty-9999.ebuild
 2001130639 ./net-misc/putty/putty-0.73.ebuild
-2006281009 ./net-misc/putty/putty-0.74.ebuild
+2007170339 ./net-misc/putty/putty-0.74.ebuild
 2001051415 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.0.1.ebuild
 2001051415 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.1.ebuild
 2001051415 ./net-misc/pyhoca-cli/pyhoca-cli-0.6.1.2.ebuild
@@ -25160,9 +25076,10 @@
 1910162109 ./net-wireless/unifi/unifi-5.6.42-r1.ebuild
 2006172209 ./net-wireless/unifi/unifi-5.13.32.ebuild
 2006222209 ./net-wireless/unifi/unifi-5.13.29.ebuild
-2006232109 ./net-wireless/unifi/unifi-5.14.15.ebuild
 2007031539 ./net-wireless/unifi/unifi-5.14.17.ebuild
 2007092139 ./net-wireless/unifi/unifi-6.0.3.ebuild
+2007161709 ./net-wireless/unifi/unifi-5.14.18.ebuild
+2007161709 ./net-wireless/unifi/unifi-6.0.4.ebuild
 2006221709 ./net-wireless/urh/urh-2.8.8.ebuild
 2006221709 ./net-wireless/urh/urh-9999.ebuild
 1702282250 ./net-wireless/wavemon/wavemon-0.7.6.ebuild
@@ -25231,6 +25148,7 @@
 1905111839 ./ros-meta/audio_common/audio_common-0.3.2.ebuild
 1905111839 ./ros-meta/audio_common/audio_common-0.3.3.ebuild
 1905111839 ./ros-meta/audio_common/audio_common-9999.ebuild
+2007162039 ./ros-meta/audio_common/audio_common-0.3.6.ebuild
 2007101639 ./ros-meta/bond_core/bond_core-1.8.5.ebuild
 2007101639 ./ros-meta/bond_core/bond_core-9999.ebuild
 1702282250 ./ros-meta/calibration/calibration-0.10.13.ebuild
@@ -25274,11 +25192,13 @@
 1908282009 ./ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.5.ebuild
 1801161709 ./ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-9999.ebuild
 2005181839 ./ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.8.7.ebuild
+2007162039 ./ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.9.1.ebuild
 1702282250 ./ros-meta/geographic_info/geographic_info-0.4.0.ebuild
 1704081220 ./ros-meta/geographic_info/geographic_info-0.5.0.ebuild
 1704181417 ./ros-meta/geographic_info/geographic_info-0.5.2.ebuild
 1803301639 ./ros-meta/geographic_info/geographic_info-0.5.3.ebuild
-1704181417 ./ros-meta/geographic_info/geographic_info-9999.ebuild
+2007162039 ./ros-meta/geographic_info/geographic_info-0.5.5.ebuild
+2007162039 ./ros-meta/geographic_info/geographic_info-9999.ebuild
 1702282250 ./ros-meta/geometry/geometry-1.11.7.ebuild
 1702282250 ./ros-meta/geometry/geometry-1.11.8.ebuild
 1707161517 ./ros-meta/geometry/geometry-1.11.9.ebuild
@@ -25302,9 +25222,11 @@
 1702282250 ./ros-meta/hector_slam/hector_slam-0.3.5.ebuild
 1702282250 ./ros-meta/hector_slam/hector_slam-9999.ebuild
 1912131539 ./ros-meta/hector_slam/hector_slam-0.4.0.ebuild
+2007161939 ./ros-meta/hector_slam/hector_slam-0.4.1.ebuild
 1702282250 ./ros-meta/image_common/image_common-1.11.12.ebuild
 1711072223 ./ros-meta/image_common/image_common-1.11.13.ebuild
 1702282250 ./ros-meta/image_common/image_common-9999.ebuild
+2007161609 ./ros-meta/image_common/image_common-1.12.0.ebuild
 1702282250 ./ros-meta/image_pipeline/image_pipeline-1.12.19.ebuild
 1705021321 ./ros-meta/image_pipeline/image_pipeline-1.12.20.ebuild
 1711072223 ./ros-meta/image_pipeline/image_pipeline-1.12.21.ebuild
@@ -25318,10 +25240,8 @@
 1702282250 ./ros-meta/image_transport_plugins/image_transport_plugins-1.9.5.ebuild
 1702282250 ./ros-meta/image_transport_plugins/image_transport_plugins-9999.ebuild
 2007091409 ./ros-meta/image_transport_plugins/image_transport_plugins-1.14.0.ebuild
-1702282250 ./ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
-1702282250 ./ros-meta/imu_pipeline/imu_pipeline-0.2.2.ebuild
-1902081439 ./ros-meta/imu_pipeline/imu_pipeline-0.2.3.ebuild
-1702282250 ./ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
+2007161939 ./ros-meta/imu_pipeline/imu_pipeline-0.3.0.ebuild
+2007161939 ./ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
 2007101909 ./ros-meta/imu_tools/imu_tools-1.2.2.ebuild
 2007101909 ./ros-meta/imu_tools/imu_tools-9999.ebuild
 1804281839 ./ros-meta/laser_pipeline/laser_pipeline-1.6.3.ebuild
@@ -25329,6 +25249,7 @@
 1702282250 ./ros-meta/mavros/mavros-0.18.7.ebuild
 1705061917 ./ros-meta/mavros/mavros-0.19.0.ebuild
 1705061917 ./ros-meta/mavros/mavros-9999.ebuild
+2007161939 ./ros-meta/mavros/mavros-1.2.0.ebuild
 1708231030 ./ros-meta/navigation/navigation-1.15.1.ebuild
 1803251709 ./ros-meta/navigation/navigation-1.15.2.ebuild
 1807271409 ./ros-meta/navigation/navigation-1.16.0.ebuild
@@ -25350,17 +25271,8 @@
 1805081538 ./ros-meta/perception_pcl/perception_pcl-9999.ebuild
 1912121411 ./ros-meta/perception_pcl/perception_pcl-1.7.0.ebuild
 2005181440 ./ros-meta/perception_pcl/perception_pcl-1.7.1.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-1.11.10.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-1.11.11.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-1.11.13.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-1.11.14.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-1.11.9.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-1.12.0.ebuild
-1802150909 ./ros-meta/pr2_common/pr2_common-1.12.1.ebuild
-1804221608 ./ros-meta/pr2_common/pr2_common-1.12.2.ebuild
-1810041609 ./ros-meta/pr2_common/pr2_common-1.12.3.ebuild
-1905241939 ./ros-meta/pr2_common/pr2_common-1.12.4.ebuild
-1702282250 ./ros-meta/pr2_common/pr2_common-9999.ebuild
+2007161609 ./ros-meta/pr2_common/pr2_common-1.12.4.ebuild
+2007161609 ./ros-meta/pr2_common/pr2_common-9999.ebuild
 1808071909 ./ros-meta/qt_gui_core/qt_gui_core-0.3.10.ebuild
 1808311709 ./ros-meta/qt_gui_core/qt_gui_core-0.3.11.ebuild
 1708061007 ./ros-meta/qt_gui_core/qt_gui_core-0.3.6.ebuild
@@ -25453,6 +25365,7 @@
 1805151009 ./ros-meta/vision_opencv/vision_opencv-1.12.8.ebuild
 1805221439 ./ros-meta/vision_opencv/vision_opencv-1.13.0.ebuild
 1702282250 ./ros-meta/vision_opencv/vision_opencv-9999.ebuild
+2007161609 ./ros-meta/vision_opencv/vision_opencv-1.15.0.ebuild
 1702282250 ./ros-meta/vision_visp/vision_visp-0.10.0.ebuild
 1908291909 ./ros-meta/vision_visp/vision_visp-0.11.1.ebuild
 1702282250 ./ros-meta/vision_visp/vision_visp-0.9.3.ebuild
@@ -25519,6 +25432,7 @@
 1707070031 ./sci-astronomy/sofa_c/sofa_c-20170420.ebuild
 2001131239 ./sci-astronomy/stellarium/stellarium-0.19.3.ebuild
 2006290009 ./sci-astronomy/stellarium/stellarium-0.20.1.ebuild
+2007161809 ./sci-astronomy/stellarium/stellarium-0.20.2.ebuild
 2002230040 ./sci-astronomy/stiff/stiff-2.4.0.ebuild
 1702282250 ./sci-astronomy/stuff/stuff-1.26.0.ebuild
 2002230040 ./sci-astronomy/swarp/swarp-2.38.0.ebuild
@@ -25560,7 +25474,7 @@
 1709300732 ./sci-biology/clustal-omega/clustal-omega-1.2.4.ebuild
 1703090116 ./sci-biology/clustalw-mpi/clustalw-mpi-0.13-r2.ebuild
 2003160939 ./sci-biology/clustalw/clustalw-1.83-r4.ebuild
-2007121539 ./sci-biology/clustalw/clustalw-2.1-r1.ebuild
+2007170339 ./sci-biology/clustalw/clustalw-2.1-r1.ebuild
 2005212309 ./sci-biology/clustalx/clustalx-2.1-r3.ebuild
 1902052139 ./sci-biology/consed/consed-29.ebuild
 1702282250 ./sci-biology/cutg/cutg-160-r1.ebuild
@@ -26059,6 +25973,7 @@
 1903170109 ./sci-geosciences/xtide/xtide-2.15.1.ebuild
 2006040939 ./sci-geosciences/dcw-gmt/dcw-gmt-1.1.4.ebuild
 2002171539 ./sci-geosciences/gshhg-gmt/gshhg-gmt-2.3.7.ebuild
+2007161939 ./sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
 2001290039 ./sci-libs/Rtree/Rtree-0.8.3_p20180802.ebuild
 2001301539 ./sci-libs/Shapely/Shapely-1.6.4_p2-r1.ebuild
 2007151139 ./sci-libs/Shapely/Shapely-1.7.0.ebuild
@@ -26394,7 +26309,7 @@
 1702282250 ./sci-libs/profphd-utils/profphd-utils-1.0.10.ebuild
 2001301939 ./sci-libs/proj/proj-6.3.0.ebuild
 2003292109 ./sci-libs/proj/proj-6.2.1.ebuild
-2006211939 ./sci-libs/proj/proj-7.0.1.ebuild
+2007170609 ./sci-libs/proj/proj-7.0.1.ebuild
 1702282250 ./sci-libs/punc/punc-1.5.ebuild
 2002111539 ./sci-libs/pyshp/pyshp-1.2.0.ebuild
 2002111539 ./sci-libs/pyshp/pyshp-9999.ebuild
@@ -27671,8 +27586,8 @@
 2005240209 ./sys-apps/debianutils/debianutils-4.9.3.ebuild
 2005301209 ./sys-apps/debianutils/debianutils-4.11.ebuild
 2004211009 ./sys-apps/diffutils/diffutils-3.6-r1.ebuild
-2007091209 ./sys-apps/diffutils/diffutils-3.7.ebuild
 2007120209 ./sys-apps/diffutils/diffutils-3.7-r1.ebuild
+2007161839 ./sys-apps/diffutils/diffutils-3.7.ebuild
 2004032241 ./sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
 2004032241 ./sys-apps/dmidecode/dmidecode-3.1.ebuild
 2006131539 ./sys-apps/dmidecode/dmidecode-3.2.ebuild
@@ -27681,6 +27596,7 @@
 1810080039 ./sys-apps/dstat/dstat-0.7.3.ebuild
 2005072109 ./sys-apps/dstat/dstat-0.7.4-r1.ebuild
 2005072109 ./sys-apps/dstat/dstat-0.7.4.ebuild
+2007161809 ./sys-apps/dstat/dstat-0.7.4-r2.ebuild
 2007071009 ./sys-apps/dtc/dtc-1.5.0-r2.ebuild
 2007062209 ./sys-apps/dtc/dtc-1.5.0.ebuild
 2007071039 ./sys-apps/dtc/dtc-1.6.0.ebuild
@@ -27977,7 +27893,7 @@
 2002140110 ./sys-apps/pick/pick-3.0.1.ebuild
 2007052309 ./sys-apps/pkgcore/pkgcore-0.10.13.ebuild
 2007052309 ./sys-apps/pkgcore/pkgcore-9999.ebuild
-2007160739 ./sys-apps/pkgcore/pkgcore-0.10.12.ebuild
+2007161609 ./sys-apps/pkgcore/pkgcore-0.10.12.ebuild
 1702282250 ./sys-apps/pmount-gui/pmount-gui-0_pre20130806.ebuild
 2004032241 ./sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
 2007021639 ./sys-apps/policycoreutils/policycoreutils-2.9.ebuild
@@ -28320,7 +28236,7 @@
 1702282250 ./sys-block/hpssacli/hpssacli-2.40.13.0-r1.ebuild
 1712221209 ./sys-block/hpssacli/hpssacli-3.10.3.0.ebuild
 1904252009 ./sys-block/io-scheduler-udev-rules/io-scheduler-udev-rules-1.ebuild
-2007160739 ./sys-block/libzbc/libzbc-5.5.1.ebuild
+2007170239 ./sys-block/libzbc/libzbc-5.5.1.ebuild
 1912111540 ./sys-block/lsiutil/lsiutil-1.62-r1.ebuild
 1912111540 ./sys-block/lsiutil/lsiutil-1.62-r2.ebuild
 2005191309 ./sys-block/mbuffer/mbuffer-20200505.ebuild
@@ -28686,8 +28602,7 @@
 2004241739 ./sys-cluster/singularity/singularity-3.5.3-r1.ebuild
 2005072109 ./sys-cluster/singularity/singularity-2.6.1.ebuild
 2006071409 ./sys-cluster/slurm/slurm-20.02.3.1.ebuild
-1911131809 ./sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
-2004161139 ./sys-cluster/spark-bin/spark-bin-2.4.5.ebuild
+2007161809 ./sys-cluster/spark-bin/spark-bin-2.4.6.ebuild
 2005082323 ./sys-cluster/swift/swift-2020.1.9999.ebuild
 2005232309 ./sys-cluster/swift/swift-2.25.0.ebuild
 1911111839 ./sys-cluster/teleport/teleport-4.0.10.ebuild
@@ -28772,7 +28687,7 @@
 2004071339 ./sys-devel/binutils-config/binutils-config-5.2.ebuild
 2005230009 ./sys-devel/binutils-config/binutils-config-9999.ebuild
 2006211609 ./sys-devel/binutils-config/binutils-config-5.3.2.ebuild
-2007022009 ./sys-devel/binutils-config/binutils-config-5.3.1.ebuild
+2007170609 ./sys-devel/binutils-config/binutils-config-5.3.1.ebuild
 2002140110 ./sys-devel/binutils-hppa64/binutils-hppa64-2.32-r1.ebuild
 2003100309 ./sys-devel/binutils-hppa64/binutils-hppa64-2.34.ebuild
 2004011439 ./sys-devel/binutils-hppa64/binutils-hppa64-2.33.1.ebuild
@@ -28796,30 +28711,30 @@
 2006232139 ./sys-devel/clang-common/clang-common-10.0.1_rc1.ebuild
 2006232139 ./sys-devel/clang-common/clang-common-11.0.0.9999.ebuild
 2006292209 ./sys-devel/clang-common/clang-common-10.0.1_rc2.ebuild
-2007041609 ./sys-devel/clang-common/clang-common-10.0.0.ebuild
 2007072309 ./sys-devel/clang-common/clang-common-10.0.1_rc3.ebuild
 2007081139 ./sys-devel/clang-common/clang-common-10.0.1_rc4.ebuild
 2007152209 ./sys-devel/clang-common/clang-common-12.0.0.9999.ebuild
+2007162139 ./sys-devel/clang-common/clang-common-10.0.0.ebuild
 2001182039 ./sys-devel/clang-runtime/clang-runtime-11.0.0.9999.ebuild
 2003092139 ./sys-devel/clang-runtime/clang-runtime-9.0.1.ebuild
 2005062039 ./sys-devel/clang-runtime/clang-runtime-8.0.1.ebuild
 2005201439 ./sys-devel/clang-runtime/clang-runtime-10.0.1.9999.ebuild
 2005201439 ./sys-devel/clang-runtime/clang-runtime-10.0.1_rc1.ebuild
 2006292209 ./sys-devel/clang-runtime/clang-runtime-10.0.1_rc2.ebuild
-2007041609 ./sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
 2007072309 ./sys-devel/clang-runtime/clang-runtime-10.0.1_rc3.ebuild
 2007081139 ./sys-devel/clang-runtime/clang-runtime-10.0.1_rc4.ebuild
 2007152209 ./sys-devel/clang-runtime/clang-runtime-12.0.0.9999.ebuild
+2007162139 ./sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
 1912092239 ./sys-devel/clang/clang-8.0.1.ebuild
 2005072109 ./sys-devel/clang/clang-9.0.1.ebuild
 2006291809 ./sys-devel/clang/clang-10.0.1.9999.ebuild
 2006291809 ./sys-devel/clang/clang-10.0.1_rc1.ebuild
 2006292209 ./sys-devel/clang/clang-10.0.1_rc2.ebuild
 2006291809 ./sys-devel/clang/clang-11.0.0.9999.ebuild
-2007041609 ./sys-devel/clang/clang-10.0.0.ebuild
 2007072309 ./sys-devel/clang/clang-10.0.1_rc3.ebuild
 2007081139 ./sys-devel/clang/clang-10.0.1_rc4.ebuild
 2007152209 ./sys-devel/clang/clang-12.0.0.9999.ebuild
+2007162139 ./sys-devel/clang/clang-10.0.0.ebuild
 1910071309 ./sys-devel/cons/cons-2.3.0.ebuild
 2003261841 ./sys-devel/crossdev/crossdev-99999999.ebuild
 2005242039 ./sys-devel/crossdev/crossdev-20200131.ebuild
@@ -28850,9 +28765,9 @@
 2007041139 ./sys-devel/gcc/gcc-11.0.0_pre9999.ebuild
 2007091809 ./sys-devel/gcc/gcc-6.5.0-r2.ebuild
 2007091639 ./sys-devel/gcc/gcc-7.5.0-r1.ebuild
-2007091539 ./sys-devel/gcc/gcc-8.4.0-r1.ebuild
-2007091539 ./sys-devel/gcc/gcc-9.3.0-r1.ebuild
 2007151039 ./sys-devel/gcc/gcc-6.5.0-r3.ebuild
+2007170209 ./sys-devel/gcc/gcc-8.4.0-r1.ebuild
+2007161639 ./sys-devel/gcc/gcc-9.3.0-r1.ebuild
 1912111540 ./sys-devel/gdb-apple/gdb-apple-1752.ebuild
 2004172239 ./sys-devel/gdb/gdb-9999.ebuild
 2005200039 ./sys-devel/gdb/gdb-9.1.ebuild
@@ -28898,20 +28813,20 @@
 2006232139 ./sys-devel/lld/lld-10.0.1_rc1.ebuild
 2006232139 ./sys-devel/lld/lld-11.0.0.9999.ebuild
 2006292209 ./sys-devel/lld/lld-10.0.1_rc2.ebuild
-2007041609 ./sys-devel/lld/lld-10.0.0.ebuild
 2007072309 ./sys-devel/lld/lld-10.0.1_rc3.ebuild
 2007081139 ./sys-devel/lld/lld-10.0.1_rc4.ebuild
 2007152209 ./sys-devel/lld/lld-12.0.0.9999.ebuild
+2007162139 ./sys-devel/lld/lld-10.0.0.ebuild
 1910111911 ./sys-devel/llvm-common/llvm-common-8.0.1.ebuild
 2003092139 ./sys-devel/llvm-common/llvm-common-9.0.1.ebuild
 2006232139 ./sys-devel/llvm-common/llvm-common-10.0.1.9999.ebuild
 2006232139 ./sys-devel/llvm-common/llvm-common-10.0.1_rc1.ebuild
 2006232139 ./sys-devel/llvm-common/llvm-common-11.0.0.9999.ebuild
 2006292209 ./sys-devel/llvm-common/llvm-common-10.0.1_rc2.ebuild
-2007041609 ./sys-devel/llvm-common/llvm-common-10.0.0.ebuild
 2007072309 ./sys-devel/llvm-common/llvm-common-10.0.1_rc3.ebuild
 2007081139 ./sys-devel/llvm-common/llvm-common-10.0.1_rc4.ebuild
 2007152209 ./sys-devel/llvm-common/llvm-common-12.0.0.9999.ebuild
+2007162139 ./sys-devel/llvm-common/llvm-common-10.0.0.ebuild
 2002230040 ./sys-devel/llvm-roc/llvm-roc-2.10.0.ebuild
 2002230040 ./sys-devel/llvm-roc/llvm-roc-2.6.0-r1.ebuild
 2002230040 ./sys-devel/llvm-roc/llvm-roc-2.7.0.ebuild
@@ -28928,16 +28843,16 @@
 2006291809 ./sys-devel/llvm/llvm-10.0.1.9999.ebuild
 2006291809 ./sys-devel/llvm/llvm-10.0.1_rc1.ebuild
 2006292209 ./sys-devel/llvm/llvm-10.0.1_rc2.ebuild
-2007041609 ./sys-devel/llvm/llvm-10.0.0.ebuild
 2007072309 ./sys-devel/llvm/llvm-10.0.1_rc3.ebuild
 2007081139 ./sys-devel/llvm/llvm-10.0.1_rc4.ebuild
 2007082009 ./sys-devel/llvm/llvm-11.0.0.9999.ebuild
 2007152209 ./sys-devel/llvm/llvm-12.0.0.9999.ebuild
+2007162139 ./sys-devel/llvm/llvm-10.0.0.ebuild
 2001182039 ./sys-devel/llvmgold/llvmgold-11.ebuild
 2006040739 ./sys-devel/llvmgold/llvmgold-8.ebuild
 2006040739 ./sys-devel/llvmgold/llvmgold-9.ebuild
-2007041609 ./sys-devel/llvmgold/llvmgold-10.ebuild
 2007152209 ./sys-devel/llvmgold/llvmgold-12.ebuild
+2007162139 ./sys-devel/llvmgold/llvmgold-10.ebuild
 2004211009 ./sys-devel/m4/m4-1.4.17.ebuild
 2004211009 ./sys-devel/m4/m4-1.4.18-r1.ebuild
 2003261841 ./sys-devel/make/make-4.3.ebuild
@@ -29363,6 +29278,9 @@
 2007091809 ./sys-kernel/gentoo-sources/gentoo-sources-4.9.230.ebuild
 2007091809 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.51.ebuild
 2007091809 ./sys-kernel/gentoo-sources/gentoo-sources-5.7.8.ebuild
+2007161609 ./sys-kernel/gentoo-sources/gentoo-sources-4.19.133.ebuild
+2007161639 ./sys-kernel/gentoo-sources/gentoo-sources-5.4.52.ebuild
+2007161639 ./sys-kernel/gentoo-sources/gentoo-sources-5.7.9.ebuild
 2006150209 ./sys-kernel/git-sources/git-sources-5.8_rc1.ebuild
 2006221009 ./sys-kernel/git-sources/git-sources-5.8_rc2.ebuild
 2006290209 ./sys-kernel/git-sources/git-sources-5.8_rc3.ebuild
@@ -29419,11 +29337,11 @@
 2006201439 ./sys-kernel/rt-sources/rt-sources-5.4.44_p27.ebuild
 2006201439 ./sys-kernel/rt-sources/rt-sources-5.6.17_p10.ebuild
 2007091539 ./sys-kernel/vanilla-sources/vanilla-sources-4.14.188.ebuild
-2007091539 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.132.ebuild
 2007091539 ./sys-kernel/vanilla-sources/vanilla-sources-4.4.230.ebuild
 2007091539 ./sys-kernel/vanilla-sources/vanilla-sources-4.9.230.ebuild
-2007091539 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.51.ebuild
-2007091539 ./sys-kernel/vanilla-sources/vanilla-sources-5.7.8.ebuild
+2007161509 ./sys-kernel/vanilla-sources/vanilla-sources-4.19.133.ebuild
+2007161509 ./sys-kernel/vanilla-sources/vanilla-sources-5.4.52.ebuild
+2007161509 ./sys-kernel/vanilla-sources/vanilla-sources-5.7.9.ebuild
 1907151840 ./sys-kernel/xbox-sources/xbox-sources-2.6.16.26.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-3789.70.16-r5.ebuild
 1912251739 ./sys-kernel/xnu-headers/xnu-headers-4570.71.2-r5.ebuild
@@ -29448,6 +29366,8 @@
 2007021209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.7.7.ebuild
 2007110939 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.51.ebuild
 2007110939 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.7.8.ebuild
+2007162209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild
+2007162209 ./sys-kernel/vanilla-kernel/vanilla-kernel-5.7.9.ebuild
 2006081639 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.40.ebuild
 2006120939 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.46.ebuild
 2006120939 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.6.18.ebuild
@@ -29462,6 +29382,8 @@
 2007021209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.7.ebuild
 2007110939 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.51.ebuild
 2007110939 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.8.ebuild
+2007162209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
+2007162209 ./sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.9.ebuild
 2006081639 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.40.ebuild
 2006120939 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.46.ebuild
 2006120939 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.6.18.ebuild
@@ -29476,6 +29398,8 @@
 2007021209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.7.7.ebuild
 2007110939 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.51.ebuild
 2007110939 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.7.8.ebuild
+2007162209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
+2007162209 ./sys-kernel/gentoo-kernel/gentoo-kernel-5.7.9.ebuild
 2002240139 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.0.0.ebuild
 2007131839 ./sys-kernel/bliss-initramfs/bliss-initramfs-8.1.0.ebuild
 2007140309 ./sys-kernel/bliss-initramfs/bliss-initramfs-9.0.0.ebuild
@@ -29491,20 +29415,20 @@
 2006232139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc1.ebuild
 2006232139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-11.0.0.9999.ebuild
 2006292209 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc2.ebuild
-2007041609 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
 2007072309 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc3.ebuild
 2007081139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.1_rc4.ebuild
 2007152209 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-12.0.0.9999.ebuild
+2007162139 ./sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
 2001291209 ./sys-libs/compiler-rt/compiler-rt-8.0.1.ebuild
 2003092139 ./sys-libs/compiler-rt/compiler-rt-9.0.1.ebuild
 2006232139 ./sys-libs/compiler-rt/compiler-rt-10.0.1.9999.ebuild
 2006232139 ./sys-libs/compiler-rt/compiler-rt-10.0.1_rc1.ebuild
 2006232139 ./sys-libs/compiler-rt/compiler-rt-11.0.0.9999.ebuild
 2006292209 ./sys-libs/compiler-rt/compiler-rt-10.0.1_rc2.ebuild
-2007041609 ./sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
 2007072309 ./sys-libs/compiler-rt/compiler-rt-10.0.1_rc3.ebuild
 2007081139 ./sys-libs/compiler-rt/compiler-rt-10.0.1_rc4.ebuild
 2007152209 ./sys-libs/compiler-rt/compiler-rt-12.0.0.9999.ebuild
+2007162139 ./sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.6-r2.ebuild
 2005072109 ./sys-libs/cracklib/cracklib-2.9.7.ebuild
 1912111540 ./sys-libs/csu/csu-79.ebuild
@@ -29558,7 +29482,7 @@
 2005201339 ./sys-libs/ldb/ldb-2.1.3.ebuild
 2006092339 ./sys-libs/ldb/ldb-2.0.10.ebuild
 2007022309 ./sys-libs/ldb/ldb-2.1.4.ebuild
-2007121709 ./sys-libs/ldb/ldb-2.0.12.ebuild
+2007170639 ./sys-libs/ldb/ldb-2.0.12.ebuild
 2001061409 ./sys-libs/libaal/libaal-1.0.7-r1.ebuild
 2005071639 ./sys-libs/libapparmor/libapparmor-2.13.4.ebuild
 2006132027 ./sys-libs/libavc1394/libavc1394-0.5.4-r2.ebuild
@@ -29611,10 +29535,10 @@
 2006232139 ./sys-libs/libomp/libomp-10.0.1_rc1.ebuild
 2006232139 ./sys-libs/libomp/libomp-11.0.0.9999.ebuild
 2006292209 ./sys-libs/libomp/libomp-10.0.1_rc2.ebuild
-2007041609 ./sys-libs/libomp/libomp-10.0.0.ebuild
 2007072309 ./sys-libs/libomp/libomp-10.0.1_rc3.ebuild
 2007081139 ./sys-libs/libomp/libomp-10.0.1_rc4.ebuild
 2007152209 ./sys-libs/libomp/libomp-12.0.0.9999.ebuild
+2007162139 ./sys-libs/libomp/libomp-10.0.0.ebuild
 2003121709 ./sys-libs/libosinfo/libosinfo-1.6.0.ebuild
 2004032241 ./sys-libs/libraw1394/libraw1394-2.1.2-r1.ebuild
 1812011609 ./sys-libs/librtas/librtas-2.0.2.ebuild
@@ -30201,8 +30125,9 @@
 2006220409 ./www-apps/drupal/drupal-8.9.1.ebuild
 2006220409 ./www-apps/drupal/drupal-9.0.1.ebuild
 1907310809 ./www-apps/dspam-web/dspam-web-3.10.1.ebuild
-2005131109 ./www-apps/gitea/gitea-9999.ebuild
-2006020739 ./www-apps/gitea/gitea-1.11.6.ebuild
+2007161809 ./www-apps/gitea/gitea-1.11.8.ebuild
+2007161809 ./www-apps/gitea/gitea-1.12.1.ebuild
+2007161809 ./www-apps/gitea/gitea-9999.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.1.1-r2.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.1.1.ebuild
 1911101840 ./www-apps/gitit/gitit-0.12.2.1.ebuild
@@ -30322,8 +30247,8 @@
 2006111039 ./www-apps/wordpress/wordpress-5.4.2.ebuild
 1912121239 ./www-apps/zeppelin-bin/zeppelin-bin-0.8.2.ebuild
 2006251009 ./www-client/chromium/chromium-83.0.4103.116.ebuild
-2007102309 ./www-client/chromium/chromium-85.0.4183.15.ebuild
 2007142039 ./www-client/chromium/chromium-84.0.4147.89.ebuild
+2007162109 ./www-client/chromium/chromium-85.0.4183.26.ebuild
 2002112051 ./www-client/dillo/dillo-3.0.5.ebuild
 2002231739 ./www-client/dillo/dillo-3.0.5-r3.ebuild
 2002231739 ./www-client/dillo/dillo-3.1_p20181005.ebuild
@@ -30341,7 +30266,7 @@
 2007061439 ./www-client/firefox/firefox-68.10.0.ebuild
 2007142209 ./www-client/firefox/firefox-78.0.2.ebuild
 2007132239 ./www-client/google-chrome-beta/google-chrome-beta-84.0.4147.89.ebuild
-2007132239 ./www-client/google-chrome-unstable/google-chrome-unstable-85.0.4183.15.ebuild
+2007162109 ./www-client/google-chrome-unstable/google-chrome-unstable-85.0.4183.26.ebuild
 2007142139 ./www-client/google-chrome/google-chrome-84.0.4147.89.ebuild
 2002231739 ./www-client/httrack/httrack-3.49.2-r2.ebuild
 1808061609 ./www-client/jd/jd-2.8.5_p120826.ebuild
@@ -30358,6 +30283,7 @@
 2007151709 ./www-client/netsurf/netsurf-3.10-r2.ebuild
 2007021639 ./www-client/opera-beta/opera-beta-70.0.3728.8.ebuild
 2007091739 ./www-client/opera-beta/opera-beta-70.0.3728.21.ebuild
+2007161639 ./www-client/opera-beta/opera-beta-70.0.3728.46.ebuild
 2006291509 ./www-client/opera-developer/opera-developer-71.0.3735.0.ebuild
 2007061439 ./www-client/opera-developer/opera-developer-71.0.3742.0.ebuild
 2007132009 ./www-client/opera-developer/opera-developer-71.0.3749.0.ebuild
@@ -30424,8 +30350,8 @@
 2007141139 ./www-plugins/adobe-flash/adobe-flash-32.0.0.403.ebuild
 2003090209 ./www-plugins/browserpass/browserpass-3.0.6-r2.ebuild
 2007132239 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.89_beta.ebuild
-2007132239 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4183.15_alpha.ebuild
 2007142139 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-84.0.4147.89.ebuild
+2007162109 ./www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4183.26_alpha.ebuild
 2004261109 ./www-plugins/freshplayerplugin/freshplayerplugin-0.3.9-r1.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.0.0.ebuild
 1909232039 ./www-plugins/google-talkplugin/google-talkplugin-5.41.3.0.ebuild
@@ -30602,7 +30528,7 @@
 2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-430.64-r5.ebuild
 2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-435.21-r5.ebuild
 2007020109 ./x11-drivers/nvidia-drivers/nvidia-drivers-440.100-r1.ebuild
-2007092039 ./x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
+2007162009 ./x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
 2004032241 ./x11-drivers/xf86-input-elographics/xf86-input-elographics-1.4.2.ebuild
 2004032241 ./x11-drivers/xf86-input-evdev/xf86-input-evdev-2.10.6.ebuild
 2004032241 ./x11-drivers/xf86-input-joystick/xf86-input-joystick-1.6.3.ebuild
@@ -31021,7 +30947,7 @@
 2005210239 ./x11-misc/qps/qps-2.0.0.ebuild
 2006150209 ./x11-misc/qps/qps-2.1.0-r1.ebuild
 1912311709 ./x11-misc/qt5ct/qt5ct-0.41.ebuild
-2006151639 ./x11-misc/qt5ct/qt5ct-1.0.ebuild
+2007161639 ./x11-misc/qt5ct/qt5ct-1.0.ebuild
 1808180539 ./x11-misc/qterm/qterm-0.7.1.ebuild
 1808180539 ./x11-misc/qterm/qterm-0.7.3.ebuild
 2006150109 ./x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -31260,7 +31186,7 @@
 1703221030 ./x11-misc/xxkb/xxkb-1.11.1.ebuild
 2003182039 ./x11-misc/xystray/xystray-1.0.ebuild
 2002112051 ./x11-misc/yabar/yabar-0.4.0_p20190316-r1.ebuild
-2007051709 ./x11-misc/zim/zim-0.73.1.ebuild
+2007161739 ./x11-misc/zim/zim-0.73.1.ebuild
 2001092309 ./x11-misc/picom/picom-9999.ebuild
 2003061539 ./x11-misc/picom/picom-7.5-r1.ebuild
 2006061409 ./x11-misc/picom/picom-8.ebuild
@@ -31872,6 +31798,7 @@
 2003261841 ./xfce-base/libxfce4util/libxfce4util-4.15.0.ebuild
 2004032241 ./xfce-base/libxfce4util/libxfce4util-4.14.0.ebuild
 2006221909 ./xfce-base/libxfce4util/libxfce4util-4.15.1.ebuild
+2007170809 ./xfce-base/libxfce4util/libxfce4util-4.15.2.ebuild
 2003152212 ./xfce-base/thunar/thunar-1.8.12.ebuild
 2005081846 ./xfce-base/thunar/thunar-1.8.14.ebuild
 2005242309 ./xfce-base/thunar/thunar-1.8.15.ebuild
@@ -31892,6 +31819,7 @@
 2006292139 ./xfce-base/xfce4-settings/xfce4-settings-4.14.3.ebuild
 2004032241 ./xfce-base/xfconf/xfconf-4.14.1.ebuild
 2005161939 ./xfce-base/xfconf/xfconf-4.14.3.ebuild
+2007161509 ./xfce-base/xfconf/xfconf-4.15.0.ebuild
 2003152212 ./xfce-base/xfdesktop/xfdesktop-4.14.2.ebuild
 2006191239 ./xfce-base/xfdesktop/xfdesktop-4.15.0.ebuild
 2002112051 ./xfce-base/xfwm4/xfwm4-4.14.0-r1.ebuild
@@ -31940,7 +31868,7 @@
 2006270039 ./xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.2.ebuild
 2006292139 ./xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.4.3.ebuild
 1910122039 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.8.ebuild
-2005081846 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
+2007161609 ./xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
 2003261841 ./xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.9.7.ebuild
 1911031709 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.0-r1.ebuild
 1912261609 ./xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.3.92-r1.ebuild
@@ -31954,7 +31882,7 @@
 1907231739 ./xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.7.0.ebuild
 2001112339 ./xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r7.ebuild
 2002112051 ./xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-2.0.0.ebuild
-2006120139 ./xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+2007161739 ./xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
 1910202039 ./xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.1.ebuild
 2004192139 ./xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.10.1.ebuild
 2006270039 ./xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.4.3.ebuild
@@ -32505,7 +32433,6 @@
 2005271939 metadata/md5-cache/app-admin/checksec-2.2.1
 2006072009 metadata/md5-cache/app-admin/checksec-2.2.2
 2006080039 metadata/md5-cache/app-admin/restart-services-0.15.2
-2006091639 metadata/md5-cache/app-admin/exo-1.11.0
 2006091639 metadata/md5-cache/app-admin/hcloud-1.16.1
 2006130039 metadata/md5-cache/app-admin/filebeat-7.7.0
 2006121739 metadata/md5-cache/app-admin/graylog-3.3.1
@@ -32800,18 +32727,20 @@
 2007121809 metadata/md5-cache/app-admin/checksec-2.2.3
 2007140139 metadata/md5-cache/app-admin/salt-2019.2.5-r1
 2007151039 metadata/md5-cache/app-admin/puppet-agent-6.16.0-r2
-2007161009 metadata/md5-cache/app-admin/Manifest.gz
 2007161009 metadata/md5-cache/app-admin/puppet-5.5.21
 2007152309 metadata/md5-cache/app-admin/puppet-6.17.0
 2007152309 metadata/md5-cache/app-admin/puppet-agent-6.17.0
 2007152309 metadata/md5-cache/app-admin/puppetdb-6.11.2
 2007152309 metadata/md5-cache/app-admin/puppetserver-6.12.1
+2007161909 metadata/md5-cache/app-admin/Manifest.gz
+2007161609 metadata/md5-cache/app-admin/exo-1.14.0
+2007161909 metadata/md5-cache/app-admin/sudo-1.9.2_rc2
 2006141358 metadata/md5-cache/app-antivirus/clamav-0.102.3
-2006211709 metadata/md5-cache/app-antivirus/clamav-0.102.3-r1
-2007041046 metadata/md5-cache/app-antivirus/Manifest.gz
 2007041046 metadata/md5-cache/app-antivirus/clamtk-6.03
 2007041046 metadata/md5-cache/app-antivirus/clamtk-6.03-r1
 2007041046 metadata/md5-cache/app-antivirus/fangfrisch-1.2.0-r1
+2007170439 metadata/md5-cache/app-antivirus/Manifest.gz
+2007170439 metadata/md5-cache/app-antivirus/clamav-0.102.4
 1909082140 metadata/md5-cache/app-arch/atool-0.39.0-r1
 1802120308 metadata/md5-cache/app-arch/stenc-1.0.7
 1812182009 metadata/md5-cache/app-arch/stuffit-5.2.0.611
@@ -33371,9 +33300,7 @@
 2007041046 metadata/md5-cache/app-crypt/acmebot-2.3.0-r1
 2007041046 metadata/md5-cache/app-crypt/acmebot-9999
 2007041046 metadata/md5-cache/app-crypt/certbot-1.5.0
-2007041046 metadata/md5-cache/app-crypt/certbot-apache-1.5.0
 2007041046 metadata/md5-cache/app-crypt/certbot-dns-nsone-0.39.0-r1
-2007041046 metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
 2007041046 metadata/md5-cache/app-crypt/eid-mw-9999
 2007041046 metadata/md5-cache/app-crypt/gcr-3.34.0-r1
 2007041046 metadata/md5-cache/app-crypt/glep63-check-9
@@ -33431,13 +33358,15 @@
 2007091108 metadata/md5-cache/app-crypt/ccid-1.4.33
 2007090109 metadata/md5-cache/app-crypt/certbot-1.6.0
 2007090109 metadata/md5-cache/app-crypt/certbot-9999
-2007090109 metadata/md5-cache/app-crypt/certbot-apache-1.6.0
-2007090109 metadata/md5-cache/app-crypt/certbot-apache-9999
-2007090109 metadata/md5-cache/app-crypt/certbot-nginx-1.6.0
-2007090109 metadata/md5-cache/app-crypt/certbot-nginx-9999
 2007122009 metadata/md5-cache/app-crypt/signing-party-2.11
-2007142009 metadata/md5-cache/app-crypt/Manifest.gz
 2007142009 metadata/md5-cache/app-crypt/mit-krb5-1.18.2-r1
+2007170709 metadata/md5-cache/app-crypt/Manifest.gz
+2007170709 metadata/md5-cache/app-crypt/certbot-apache-1.5.0
+2007170709 metadata/md5-cache/app-crypt/certbot-apache-1.6.0
+2007170709 metadata/md5-cache/app-crypt/certbot-apache-9999
+2007170709 metadata/md5-cache/app-crypt/certbot-nginx-1.5.0
+2007170709 metadata/md5-cache/app-crypt/certbot-nginx-1.6.0
+2007170709 metadata/md5-cache/app-crypt/certbot-nginx-9999
 1910181539 metadata/md5-cache/app-dicts/bookview-3.2.1
 1702282308 metadata/md5-cache/app-dicts/eblook-1.6.1
 1808151104 metadata/md5-cache/app-dicts/freedict-deu-eng-1.0
@@ -33895,7 +33824,6 @@
 2006070938 metadata/md5-cache/app-editors/vis-0.5
 2006090809 metadata/md5-cache/app-editors/kakoune-2020.01.16-r1
 2006090809 metadata/md5-cache/app-editors/kakoune-2020.01.16_p20200601
-2006120139 metadata/md5-cache/app-editors/mousepad-0.4.2
 2006141358 metadata/md5-cache/app-editors/aee-2.2.21
 2006141358 metadata/md5-cache/app-editors/amyedit-1.0-r2
 2006141358 metadata/md5-cache/app-editors/beaver-0.4.1-r1
@@ -34017,9 +33945,10 @@
 2007051009 metadata/md5-cache/app-editors/vis-9999
 2007090309 metadata/md5-cache/app-editors/notepadqq-2.0.0_beta
 2007090309 metadata/md5-cache/app-editors/notepadqq-9999
-2007151139 metadata/md5-cache/app-editors/Manifest.gz
 2007151139 metadata/md5-cache/app-editors/retext-7.1.0
 2007151139 metadata/md5-cache/app-editors/retext-9999
+2007161739 metadata/md5-cache/app-editors/Manifest.gz
+2007161739 metadata/md5-cache/app-editors/mousepad-0.4.2
 2002221412 metadata/md5-cache/app-emacs/actionscript-mode-7.2.2_p20180527
 2002221412 metadata/md5-cache/app-emacs/adaptive-wrap-0.7
 2002221412 metadata/md5-cache/app-emacs/analog-1.9.99
@@ -34529,7 +34458,6 @@
 2007041046 metadata/md5-cache/app-emulation/playonlinux-4.2.12
 2007041046 metadata/md5-cache/app-emulation/playonlinux-4.3.4-r1
 2007041046 metadata/md5-cache/app-emulation/protontricks-1.4.1
-2007041046 metadata/md5-cache/app-emulation/qemu-5.0.0
 2007041046 metadata/md5-cache/app-emulation/qemu-guest-agent-3.1.0
 2007041046 metadata/md5-cache/app-emulation/qemu-guest-agent-4.0.0
 2007041046 metadata/md5-cache/app-emulation/qemu-guest-agent-4.2.0-r1
@@ -34582,24 +34510,25 @@
 2007041046 metadata/md5-cache/app-emulation/xen-tools-4.14.0_rc3
 2007062109 metadata/md5-cache/app-emulation/vagrant-2.2.7-r1
 2007062109 metadata/md5-cache/app-emulation/vagrant-2.2.9-r1
-2007100209 metadata/md5-cache/app-emulation/qemu-5.0.0-r1
 2007090739 metadata/md5-cache/app-emulation/slirp4netns-1.1.3
 2007091709 metadata/md5-cache/app-emulation/xen-4.12.3-r2
 2007091709 metadata/md5-cache/app-emulation/xen-4.13.1-r2
 2007091709 metadata/md5-cache/app-emulation/xen-tools-4.12.3-r2
 2007091709 metadata/md5-cache/app-emulation/xen-tools-4.13.1-r2
 2007111509 metadata/md5-cache/app-emulation/protontricks-1.4.1-r1
-2007111739 metadata/md5-cache/app-emulation/qemu-5.0.0-r2
-2007111739 metadata/md5-cache/app-emulation/qemu-9999
 2007110439 metadata/md5-cache/app-emulation/qemu-riscv64-bin-5.0.0
 2007131039 metadata/md5-cache/app-emulation/lxd-4.0.2-r1
 2007132109 metadata/md5-cache/app-emulation/slirp4netns-1.1.4
 2007140309 metadata/md5-cache/app-emulation/vkd3d-1.1-r1
 2007140339 metadata/md5-cache/app-emulation/winetricks-20200412
 2007140339 metadata/md5-cache/app-emulation/winetricks-99999999
-2007160409 metadata/md5-cache/app-emulation/Manifest.gz
 2007160409 metadata/md5-cache/app-emulation/conmon-2.0.19
 2007160409 metadata/md5-cache/app-emulation/libpod-2.0.2
+2007161609 metadata/md5-cache/app-emulation/Manifest.gz
+2007161609 metadata/md5-cache/app-emulation/qemu-5.0.0
+2007161609 metadata/md5-cache/app-emulation/qemu-5.0.0-r1
+2007161609 metadata/md5-cache/app-emulation/qemu-5.0.0-r2
+2007161609 metadata/md5-cache/app-emulation/qemu-9999
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1-r1
 1908281739 metadata/md5-cache/app-eselect/eselect-infinality-1.1
 1911131109 metadata/md5-cache/app-eselect/eselect-lcdfilter-2
@@ -34696,8 +34625,9 @@
 2007041046 metadata/md5-cache/app-forensics/openscap-1.2.14
 2007041046 metadata/md5-cache/app-forensics/openscap-9999
 2007041046 metadata/md5-cache/app-forensics/quickfuzz-9999
-2007111839 metadata/md5-cache/app-forensics/Manifest.gz
 2007111839 metadata/md5-cache/app-forensics/lynis-3.0.0
+2007161809 metadata/md5-cache/app-forensics/Manifest.gz
+2007161809 metadata/md5-cache/app-forensics/aide-0.16.2_p20200614
 1910230639 metadata/md5-cache/app-i18n/cstools-3.42-r1
 1707181708 metadata/md5-cache/app-i18n/freewnn-1.1.1_alpha23
 1708161738 metadata/md5-cache/app-i18n/ibus-fbterm-1.0.1
@@ -35039,8 +34969,9 @@
 2007102009 metadata/md5-cache/app-metrics/process-exporter-0.7.1
 2007102109 metadata/md5-cache/app-metrics/redis_exporter-1.2.1
 2007150209 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7
-2007151939 metadata/md5-cache/app-metrics/Manifest.gz
 2007151939 metadata/md5-cache/app-metrics/openvpn_exporter-0.3.0
+2007170409 metadata/md5-cache/app-metrics/Manifest.gz
+2007170409 metadata/md5-cache/app-metrics/nginx-vts-exporter-0.10.7-r1
 1806092239 metadata/md5-cache/app-misc/acdctl-1.1-r1
 1805212239 metadata/md5-cache/app-misc/aldo-0.7.7
 1910161339 metadata/md5-cache/app-misc/astrolog-ephemeris-5.40
@@ -35197,7 +35128,6 @@
 2006141358 metadata/md5-cache/app-misc/fdutils-5.5.20060227-r1
 2006141358 metadata/md5-cache/app-misc/fhem-6.0
 2006141358 metadata/md5-cache/app-misc/figlet-2.2.5
-2006141358 metadata/md5-cache/app-misc/figlet-2.2.5-r1
 2006141358 metadata/md5-cache/app-misc/fslurp-2.1.4
 2006141358 metadata/md5-cache/app-misc/fsniper-1.3.1-r2
 2006141358 metadata/md5-cache/app-misc/g15composer-3.2
@@ -35483,8 +35413,10 @@
 2007150009 metadata/md5-cache/app-misc/gramps-5.1.2-r2
 2007151209 metadata/md5-cache/app-misc/gnote-3.36.2
 2007151539 metadata/md5-cache/app-misc/zygrib-8.0.1-r1
-2007152109 metadata/md5-cache/app-misc/Manifest.gz
 2007152109 metadata/md5-cache/app-misc/freewvs-0.1.1
+2007161639 metadata/md5-cache/app-misc/Manifest.gz
+2007161639 metadata/md5-cache/app-misc/figlet-2.2.5-r1
+2007161639 metadata/md5-cache/app-misc/figlet-9999
 1702282309 metadata/md5-cache/app-mobilephone/anyremote-6.5
 1710020739 metadata/md5-cache/app-mobilephone/dfu-util-0.9
 1908291509 metadata/md5-cache/app-mobilephone/gnocky-0.0.7
@@ -35610,11 +35542,15 @@
 2006141358 metadata/md5-cache/app-pda/usbmuxd-1.1.0
 2006141358 metadata/md5-cache/app-pda/usbmuxd-1.1.1_pre20200121
 2006290109 metadata/md5-cache/app-pda/gnupod-0.99.8-r2
-2007041046 metadata/md5-cache/app-pda/Manifest.gz
 2007041046 metadata/md5-cache/app-pda/libimobiledevice-1.2.0-r1
 2007041046 metadata/md5-cache/app-pda/libimobiledevice-1.2.1_pre20200220
 2007041046 metadata/md5-cache/app-pda/libplist-2.1.0
 2007041046 metadata/md5-cache/app-pda/pilot-link-0.12.5-r2
+2007161609 metadata/md5-cache/app-pda/Manifest.gz
+2007161609 metadata/md5-cache/app-pda/libimobiledevice-1.3.0
+2007161609 metadata/md5-cache/app-pda/libplist-2.2.0
+2007161609 metadata/md5-cache/app-pda/libusbmuxd-2.0.2
+2007161609 metadata/md5-cache/app-pda/usbmuxd-1.1.1
 1905181309 metadata/md5-cache/app-portage/epkg-0.4-r1
 1902072239 metadata/md5-cache/app-portage/golop-0.0.1
 1909091809 metadata/md5-cache/app-portage/golop-0.0.1-r1
@@ -35744,8 +35680,8 @@
 2007060339 metadata/md5-cache/app-portage/elogv-0.7.8-r2
 2007060339 metadata/md5-cache/app-portage/elogv-0.7.8-r3
 2007132039 metadata/md5-cache/app-portage/cpuid2cpuflags-11
-2007160739 metadata/md5-cache/app-portage/Manifest.gz
-2007160739 metadata/md5-cache/app-portage/nattka-0.2.9
+2007161609 metadata/md5-cache/app-portage/Manifest.gz
+2007161609 metadata/md5-cache/app-portage/nattka-0.2.9
 1712261510 metadata/md5-cache/app-shells/dsh-0.25.10-r1
 1903190509 metadata/md5-cache/app-shells/posh-0.13.2
 1910170740 metadata/md5-cache/app-shells/psh-1.8.1-r3
@@ -37316,10 +37252,10 @@
 2007081539 metadata/md5-cache/dev-db/mycli-1.21.1-r1
 2007072139 metadata/md5-cache/dev-db/mycli-9999
 2007131909 metadata/md5-cache/dev-db/influxdb-1.8.0
-2007160039 metadata/md5-cache/dev-db/Manifest.gz
 2007160039 metadata/md5-cache/dev-db/influxdb-1.8.0-r1
 2007152139 metadata/md5-cache/dev-db/sqlite-3.31.1
-2007152139 metadata/md5-cache/dev-db/sqlite-3.32.3
+2007170609 metadata/md5-cache/dev-db/Manifest.gz
+2007170609 metadata/md5-cache/dev-db/sqlite-3.32.3
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-0.6.1a
 2005162339 metadata/md5-cache/dev-dotnet/ndesk-dbus-glib-0.4.1
 2006141358 metadata/md5-cache/dev-dotnet/dbus-sharp-0.7.0-r2
@@ -39525,7 +39461,6 @@
 2006141358 metadata/md5-cache/dev-java/ini4j-0.5.1
 2006141358 metadata/md5-cache/dev-java/ini4j-0.5.2
 2006141358 metadata/md5-cache/dev-java/invokebinder-1.6
-2006141358 metadata/md5-cache/dev-java/iso-relax-20050331-r4
 2006141358 metadata/md5-cache/dev-java/istack-commons-buildtools-2.22-r1
 2006141358 metadata/md5-cache/dev-java/istack-commons-runtime-2.22
 2006141358 metadata/md5-cache/dev-java/istack-commons-soimp-2.22
@@ -39600,7 +39535,6 @@
 2006141358 metadata/md5-cache/dev-java/jdbm-0.12-r3
 2006141358 metadata/md5-cache/dev-java/jdepend-2.9-r5
 2006141358 metadata/md5-cache/dev-java/jdom-1.1.3
-2006141358 metadata/md5-cache/dev-java/jdom-2.0.6-r4
 2006141358 metadata/md5-cache/dev-java/jdynamite-1.2-r1
 2006141358 metadata/md5-cache/dev-java/jebl-2013.02.18
 2006141358 metadata/md5-cache/dev-java/jempbox-1.7.1-r1
@@ -39991,8 +39925,13 @@
 2007150109 metadata/md5-cache/dev-java/openjdk-8.262_p10
 2007150139 metadata/md5-cache/dev-java/openjfx-11.0.8_p2
 2007152039 metadata/md5-cache/dev-java/openjdk-bin-11.0.8_p10
-2007152109 metadata/md5-cache/dev-java/Manifest.gz
 2007152109 metadata/md5-cache/dev-java/openjdk-jre-bin-11.0.8_p10-r1
+2007170209 metadata/md5-cache/dev-java/Manifest.gz
+2007170209 metadata/md5-cache/dev-java/iso-relax-20050331-r4
+2007170039 metadata/md5-cache/dev-java/java-config-9999
+2007170209 metadata/md5-cache/dev-java/jdom-2.0.6-r4
+2007162209 metadata/md5-cache/dev-java/openjdk-bin-8.262_p10
+2007162209 metadata/md5-cache/dev-java/openjdk-jre-bin-8.262_p10
 1702282312 metadata/md5-cache/dev-lang/ats-0.2.9
 1702282312 metadata/md5-cache/dev-lang/cll1h-0.6-r1
 1910152339 metadata/md5-cache/dev-lang/duktape-2.4.0
@@ -40284,20 +40223,15 @@
 2007062009 metadata/md5-cache/dev-lang/gnat-gpl-2019-r2
 2007091739 metadata/md5-cache/dev-lang/moarvm-2020.06
 2007091739 metadata/md5-cache/dev-lang/nqp-2020.06
-2007091209 metadata/md5-cache/dev-lang/python-3.8.3-r1
 2007091739 metadata/md5-cache/dev-lang/rakudo-2020.06
 2007111909 metadata/md5-cache/dev-lang/erlang-23.0.2
 2007121739 metadata/md5-cache/dev-lang/swi-prolog-8.2.1
 2007121739 metadata/md5-cache/dev-lang/swi-prolog-8.3.3
-2007142139 metadata/md5-cache/dev-lang/python-3.6.11-r1
-2007142139 metadata/md5-cache/dev-lang/python-3.7.8-r1
 2007142139 metadata/md5-cache/dev-lang/python-3.8.4
 2007142139 metadata/md5-cache/dev-lang/python-3.9.0_beta4
 2007151109 metadata/md5-cache/dev-lang/perl-5.32.0
 2007151209 metadata/md5-cache/dev-lang/php-7.2.32
 2007151209 metadata/md5-cache/dev-lang/php-7.3.20
-2007151209 metadata/md5-cache/dev-lang/php-7.4.8
-2007160139 metadata/md5-cache/dev-lang/Manifest.gz
 2007152209 metadata/md5-cache/dev-lang/crystal-0.35.1
 2007152209 metadata/md5-cache/dev-lang/julia-1.4.0-r1
 2007152209 metadata/md5-cache/dev-lang/julia-1.4.0-r2
@@ -40309,6 +40243,15 @@
 2007152209 metadata/md5-cache/dev-lang/zig-0.4.0-r1
 2007152209 metadata/md5-cache/dev-lang/zig-0.5.0
 2007152209 metadata/md5-cache/dev-lang/zig-9999
+2007170539 metadata/md5-cache/dev-lang/Manifest.gz
+2007170509 metadata/md5-cache/dev-lang/go-1.13.13
+2007170539 metadata/md5-cache/dev-lang/go-1.13.14
+2007170509 metadata/md5-cache/dev-lang/go-1.14.5
+2007170539 metadata/md5-cache/dev-lang/go-1.14.6
+2007170339 metadata/md5-cache/dev-lang/php-7.4.8-r1
+2007170139 metadata/md5-cache/dev-lang/python-3.6.11-r1
+2007170139 metadata/md5-cache/dev-lang/python-3.7.8-r1
+2007170139 metadata/md5-cache/dev-lang/python-3.8.3-r1
 1708300939 metadata/md5-cache/dev-libs/bcm2835-1.52
 1808290309 metadata/md5-cache/dev-libs/bcm2835-1.57
 1705071608 metadata/md5-cache/dev-libs/concurrencykit-0.6.0
@@ -40486,7 +40429,6 @@
 2006141358 metadata/md5-cache/dev-libs/http-fetcher-1.1.0-r1
 2006141358 metadata/md5-cache/dev-libs/hyperleveldb-1.2.2-r1
 2006141358 metadata/md5-cache/dev-libs/igraph-0.7.1-r2
-2006141358 metadata/md5-cache/dev-libs/iksemel-1.4-r1
 2006141358 metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r1
 2006141358 metadata/md5-cache/dev-libs/ilbc-rfc3951-0-r2
 2006141358 metadata/md5-cache/dev-libs/iniparser-4.1
@@ -40809,8 +40751,6 @@
 2006212009 metadata/md5-cache/dev-libs/libparserutils-0.2.4-r1
 2006221009 metadata/md5-cache/dev-libs/log4cxx-0.10.0-r1
 2006211809 metadata/md5-cache/dev-libs/spdlog-1.6.1
-2006211709 metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
-2006222139 metadata/md5-cache/dev-libs/tre-0.8.0-r2
 2006222209 metadata/md5-cache/dev-libs/uriparser-0.9.4
 2006241909 metadata/md5-cache/dev-libs/libtpms-0.7.2
 2006241639 metadata/md5-cache/dev-libs/rocm-device-libs-3.5.1
@@ -41005,7 +40945,6 @@
 2007051809 metadata/md5-cache/dev-libs/libevent-2.1.12
 2007051809 metadata/md5-cache/dev-libs/libevent-2.1.9999
 2007051809 metadata/md5-cache/dev-libs/libevent-9999
-2007041046 metadata/md5-cache/dev-libs/libffi-3.3-r1
 2007041046 metadata/md5-cache/dev-libs/libffi-compat-3.2.1-r3
 2007041046 metadata/md5-cache/dev-libs/libfmt-6.1.2
 2007041046 metadata/md5-cache/dev-libs/libfmt-6.2.0-r1
@@ -41266,7 +41205,6 @@
 2007072039 metadata/md5-cache/dev-libs/elfutils-0.180
 2007090409 metadata/md5-cache/dev-libs/freexl-1.0.5
 2007081039 metadata/md5-cache/dev-libs/jansson-2.13.1
-2007080109 metadata/md5-cache/dev-libs/libffi-3.3-r2
 2007072209 metadata/md5-cache/dev-libs/libfmt-7.0.1
 2007071239 metadata/md5-cache/dev-libs/libgcrypt-1.8.6
 2007100039 metadata/md5-cache/dev-libs/libressl-3.1.3
@@ -41302,7 +41240,6 @@
 2007151839 metadata/md5-cache/dev-libs/Ice-3.6.5
 2007151839 metadata/md5-cache/dev-libs/Ice-3.6.5-r1
 2007152009 metadata/md5-cache/dev-libs/clipper-6.4.2
-2007161109 metadata/md5-cache/dev-libs/Manifest.gz
 2007152109 metadata/md5-cache/dev-libs/botan-2.15.0
 2007161109 metadata/md5-cache/dev-libs/gjs-1.64.4
 2007152209 metadata/md5-cache/dev-libs/keystone-0.9.1
@@ -41314,6 +41251,13 @@
 2007152209 metadata/md5-cache/dev-libs/opencl-clang-10.0.0.1
 2007152209 metadata/md5-cache/dev-libs/opencl-clang-8.0.1.1
 2007152209 metadata/md5-cache/dev-libs/opencl-clang-9.0.1
+2007170439 metadata/md5-cache/dev-libs/Manifest.gz
+2007162109 metadata/md5-cache/dev-libs/iksemel-1.4-r1
+2007170009 metadata/md5-cache/dev-libs/libffi-3.3-r1
+2007170009 metadata/md5-cache/dev-libs/libffi-3.3-r2
+2007170039 metadata/md5-cache/dev-libs/spdlog-1.7.0
+2007170439 metadata/md5-cache/dev-libs/tomsfastmath-0.13.1
+2007170409 metadata/md5-cache/dev-libs/tre-0.8.0-r2
 1910111840 metadata/md5-cache/dev-lisp/hyperspec-7.0-r1
 2006141358 metadata/md5-cache/dev-lisp/abcl-1.5.0
 2006141358 metadata/md5-cache/dev-lisp/alexandria-20171029
@@ -41357,9 +41301,11 @@
 2006141358 metadata/md5-cache/dev-lisp/uiop-3.3.1
 2006141358 metadata/md5-cache/dev-lisp/uiop-3.3.2
 2007041046 metadata/md5-cache/dev-lisp/trivial-gray-streams-99999999
-2007152209 metadata/md5-cache/dev-lisp/Manifest.gz
 2007152209 metadata/md5-cache/dev-lisp/c2ffi-10.0.0.20200527
 2007152209 metadata/md5-cache/dev-lisp/c2ffi-10.0.0.9999
+2007161809 metadata/md5-cache/dev-lisp/Manifest.gz
+2007161809 metadata/md5-cache/dev-lisp/roswell-20.04.14.105
+2007161809 metadata/md5-cache/dev-lisp/roswell-20.05.14.106
 1907291809 metadata/md5-cache/dev-lua/ldoc-1.4.6
 1911101439 metadata/md5-cache/dev-lua/luadoc-3.0.1
 1902152109 metadata/md5-cache/dev-lua/luajson-1.3.3
@@ -42841,7 +42787,6 @@
 2004300939 metadata/md5-cache/dev-perl/WWW-Curl-4.170.0-r1
 2004301509 metadata/md5-cache/dev-perl/asa-1.40.0
 2005021639 metadata/md5-cache/dev-perl/Gentoo-PerlMod-Version-0.8.1
-2005021939 metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
 2005032039 metadata/md5-cache/dev-perl/App-FatPacker-0.10.8
 2005031809 metadata/md5-cache/dev-perl/Config-MVP-Slicer-0.303.0
 2005031809 metadata/md5-cache/dev-perl/Dist-Milla-1.0.20
@@ -43749,7 +43694,11 @@
 2007151509 metadata/md5-cache/dev-perl/Data-Hexify-1.0.0-r2
 2007151509 metadata/md5-cache/dev-perl/Data-Hierarchy-0.340.0-r2
 2007151539 metadata/md5-cache/dev-perl/Data-ICal-0.240.0
-2007151539 metadata/md5-cache/dev-perl/Manifest.gz
+2007161539 metadata/md5-cache/dev-perl/Data-ObjectDriver-0.190.0
+2007170809 metadata/md5-cache/dev-perl/Data-Page-2.30.0
+2007170839 metadata/md5-cache/dev-perl/Data-Perl-0.2.11
+2007170839 metadata/md5-cache/dev-perl/Manifest.gz
+2007161609 metadata/md5-cache/dev-perl/Parse-Yapp-1.210.0
 1811020409 metadata/md5-cache/dev-php/File_Iterator-1.3.4
 1908161609 metadata/md5-cache/dev-php/PEAR-Config-2.0.0_pre20140323-r1
 1811020409 metadata/md5-cache/dev-php/PEAR-DB_DataObject-1.11.5-r1
@@ -44313,7 +44262,6 @@
 2007041046 metadata/md5-cache/dev-python/click-plugins-1.0.3
 2007041046 metadata/md5-cache/dev-python/click-plugins-1.1.1
 2007041046 metadata/md5-cache/dev-python/click-threading-0.4.4
-2007041046 metadata/md5-cache/dev-python/cliff-3.3.0
 2007041046 metadata/md5-cache/dev-python/clint-0.5.1-r1
 2007041046 metadata/md5-cache/dev-python/cloudlib-0.5.0
 2007051709 metadata/md5-cache/dev-python/cloudpickle-1.4.1
@@ -44421,7 +44369,6 @@
 2007041046 metadata/md5-cache/dev-python/drf-yasg-1.17.1
 2007041046 metadata/md5-cache/dev-python/duecredit-0.7.0
 2007041046 metadata/md5-cache/dev-python/dugong-3.7.3
-2007041046 metadata/md5-cache/dev-python/dulwich-0.19.15
 2007041046 metadata/md5-cache/dev-python/dulwich-0.19.6
 2007041046 metadata/md5-cache/dev-python/easy-thumbnails-2.7
 2007041046 metadata/md5-cache/dev-python/ebuildtester-0.1.16
@@ -44630,14 +44577,11 @@
 2007041046 metadata/md5-cache/dev-python/jdcal-1.4.1
 2007041046 metadata/md5-cache/dev-python/jedi-0.14.1
 2007041046 metadata/md5-cache/dev-python/jedi-0.15.2
-2007041046 metadata/md5-cache/dev-python/jedi-0.17.1
-2007041046 metadata/md5-cache/dev-python/jeepney-0.4.3
 2007041046 metadata/md5-cache/dev-python/jellyfish-0.8.2
 2007041046 metadata/md5-cache/dev-python/jikanpy-3.4.2
 2007041046 metadata/md5-cache/dev-python/jinja2-time-0.2.0
 2007041046 metadata/md5-cache/dev-python/jinja2_pluralize-0.3.0
 2007041046 metadata/md5-cache/dev-python/jira-1.0.14-r3
-2007041046 metadata/md5-cache/dev-python/jmespath-0.10.0
 2007041046 metadata/md5-cache/dev-python/jmespath-0.9.3-r1
 2007041046 metadata/md5-cache/dev-python/joblib-0.14.1
 2007041046 metadata/md5-cache/dev-python/joblib-0.15.1
@@ -44649,7 +44593,6 @@
 2007041046 metadata/md5-cache/dev-python/jsonext-0.4.2
 2007041046 metadata/md5-cache/dev-python/jsonmerge-1.6.0
 2007041046 metadata/md5-cache/dev-python/jsonpatch-1.25
-2007041046 metadata/md5-cache/dev-python/jsonpatch-1.26
 2007041046 metadata/md5-cache/dev-python/jsonpickle-1.4.1-r1
 2007041046 metadata/md5-cache/dev-python/jsonpointer-2.0-r1
 2007041046 metadata/md5-cache/dev-python/jsonref-0.1
@@ -44666,7 +44609,6 @@
 2007041046 metadata/md5-cache/dev-python/kazoo-2.6.1
 2007041046 metadata/md5-cache/dev-python/kconfiglib-14.1.0
 2007041046 metadata/md5-cache/dev-python/keystoneauth-4.0.0
-2007041046 metadata/md5-cache/dev-python/keystoneauth-4.0.1
 2007041046 metadata/md5-cache/dev-python/keystonemiddleware-7.0.1
 2007041046 metadata/md5-cache/dev-python/kiwisolver-1.0.1
 2007052109 metadata/md5-cache/dev-python/kiwisolver-1.2.0
@@ -44686,7 +44628,6 @@
 2007041046 metadata/md5-cache/dev-python/liblarch-3.0.1
 2007041046 metadata/md5-cache/dev-python/libnacl-1.6.1
 2007041046 metadata/md5-cache/dev-python/libpillowfight-0.3.0
-2007041046 metadata/md5-cache/dev-python/libsass-0.20.0
 2007041046 metadata/md5-cache/dev-python/libtmux-0.8.2-r1
 2007041046 metadata/md5-cache/dev-python/libtmux-0.8.2-r2
 2007041046 metadata/md5-cache/dev-python/libvirt-python-6.0.0
@@ -44840,9 +44781,7 @@
 2007041046 metadata/md5-cache/dev-python/onkyo-eiscp-1.2.7
 2007041046 metadata/md5-cache/dev-python/openpyxl-3.0.0
 2007041046 metadata/md5-cache/dev-python/openpyxl-9999
-2007041046 metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
 2007041046 metadata/md5-cache/dev-python/openstacksdk-0.36.0
-2007041046 metadata/md5-cache/dev-python/openstacksdk-0.46.0
 2007041046 metadata/md5-cache/dev-python/opt-einsum-3.0.1
 2007041046 metadata/md5-cache/dev-python/ordered-set-4.0.1
 2007041046 metadata/md5-cache/dev-python/os-brick-2.8.2
@@ -44852,7 +44791,6 @@
 2007041046 metadata/md5-cache/dev-python/os-diskconfig-python-novaclient-ext-9999
 2007041046 metadata/md5-cache/dev-python/os-ken-0.3.1
 2007041046 metadata/md5-cache/dev-python/os-resource-classes-0.5.0
-2007041046 metadata/md5-cache/dev-python/os-service-types-1.7.0
 2007041046 metadata/md5-cache/dev-python/os-testr-1.0.0
 2007041046 metadata/md5-cache/dev-python/os-traits-2.3.0
 2007041046 metadata/md5-cache/dev-python/os-vif-1.15.2
@@ -45230,7 +45168,6 @@
 2007041046 metadata/md5-cache/dev-python/python-etcd-0.4.5-r1
 2007041046 metadata/md5-cache/dev-python/python-ethtool-0.14
 2007041046 metadata/md5-cache/dev-python/python-evdev-1.3.0
-2007041046 metadata/md5-cache/dev-python/python-fastimport-0.9.8
 2007041046 metadata/md5-cache/dev-python/python-fchksum-1.7.1-r1
 2007041046 metadata/md5-cache/dev-python/python-gammu-2.11
 2007041046 metadata/md5-cache/dev-python/python-gflags-3.1.2-r1
@@ -45325,13 +45262,11 @@
 2007041046 metadata/md5-cache/dev-python/pyzbar-0.1.8
 2007041046 metadata/md5-cache/dev-python/pyzmq-19.0.0
 2007041046 metadata/md5-cache/dev-python/pyzmq-19.0.1_p20200608
-2007041046 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
 2007041046 metadata/md5-cache/dev-python/qrcode-6.1
 2007041046 metadata/md5-cache/dev-python/qscintilla-python-2.11.4
 2007041046 metadata/md5-cache/dev-python/qscintilla-python-2.11.5
 2007041046 metadata/md5-cache/dev-python/qtawesome-0.7.2
 2007041046 metadata/md5-cache/dev-python/qtconsole-4.3.1
-2007041046 metadata/md5-cache/dev-python/qtsass-0.3.0
 2007041046 metadata/md5-cache/dev-python/quex-0.65.4
 2007041046 metadata/md5-cache/dev-python/radon-4.1.0
 2007041046 metadata/md5-cache/dev-python/raet-0.6.8-r1
@@ -45348,7 +45283,6 @@
 2007041046 metadata/md5-cache/dev-python/reflink-0.2.1-r1
 2007041046 metadata/md5-cache/dev-python/regex-2020.2.20
 2007041046 metadata/md5-cache/dev-python/rencode-1.0.5-r1
-2007041046 metadata/md5-cache/dev-python/reno-2.11.3
 2007041046 metadata/md5-cache/dev-python/reno-2.7.0
 2007041046 metadata/md5-cache/dev-python/reportlab-3.5.42
 2007041046 metadata/md5-cache/dev-python/repoze-sphinx-autointerface-0.8
@@ -45363,7 +45297,6 @@
 2007041046 metadata/md5-cache/dev-python/requests-unixsocket-0.2.0
 2007041046 metadata/md5-cache/dev-python/requests_download-0.1.2
 2007041046 metadata/md5-cache/dev-python/requests_pkcs12-1.7
-2007041046 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
 2007041046 metadata/md5-cache/dev-python/responses-0.10.15
 2007041046 metadata/md5-cache/dev-python/resumable-urlretrieve-0.1.5
 2007041046 metadata/md5-cache/dev-python/retrying-1.3.3
@@ -45406,7 +45339,6 @@
 2007041046 metadata/md5-cache/dev-python/scandir-1.10.0-r1
 2007041046 metadata/md5-cache/dev-python/scripttest-1.3.0
 2007041046 metadata/md5-cache/dev-python/seaborn-0.10.0
-2007041046 metadata/md5-cache/dev-python/selenium-3.141.0-r1
 2007041046 metadata/md5-cache/dev-python/semantic_version-2.8.4
 2007041046 metadata/md5-cache/dev-python/semantic_version-2.8.5
 2007041046 metadata/md5-cache/dev-python/semver-2.10.2
@@ -45484,7 +45416,6 @@
 2007041046 metadata/md5-cache/dev-python/sphinxcontrib-htmlhelp-1.0.3
 2007041046 metadata/md5-cache/dev-python/sphinxcontrib-httpexample-0.10.3
 2007041046 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r1
-2007041046 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
 2007041046 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1
 2007041046 metadata/md5-cache/dev-python/sphinxcontrib-jsmath-1.0.1-r1
 2007041046 metadata/md5-cache/dev-python/sphinxcontrib-napoleon-0.6.1
@@ -45525,7 +45456,6 @@
 2007041046 metadata/md5-cache/dev-python/strict-rfc3339-0.7-r1
 2007041046 metadata/md5-cache/dev-python/stripe-2.46.0
 2007041046 metadata/md5-cache/dev-python/subprocess32-3.5.4
-2007041046 metadata/md5-cache/dev-python/subunit-1.2.0-r1
 2007041046 metadata/md5-cache/dev-python/subvertpy-0.10.1
 2007041046 metadata/md5-cache/dev-python/suds-0.6-r1
 2007041046 metadata/md5-cache/dev-python/svg-path-3.0
@@ -45595,7 +45525,6 @@
 2007041046 metadata/md5-cache/dev-python/typing-3.7.4.1
 2007041046 metadata/md5-cache/dev-python/typing-extensions-3.7.4.1
 2007041046 metadata/md5-cache/dev-python/ubelt-0.8.8
-2007041046 metadata/md5-cache/dev-python/ujson-1.35-r1
 2007041046 metadata/md5-cache/dev-python/uncertainties-3.1.4
 2007041046 metadata/md5-cache/dev-python/unicodecsv-0.14.1-r1
 2007041046 metadata/md5-cache/dev-python/unidecode-0.04.21
@@ -45643,8 +45572,6 @@
 2007041046 metadata/md5-cache/dev-python/websockets-8.1
 2007041046 metadata/md5-cache/dev-python/websockify-0.9.0
 2007041046 metadata/md5-cache/dev-python/webtest-2.0.33
-2007041046 metadata/md5-cache/dev-python/werkzeug-0.16.0
-2007041046 metadata/md5-cache/dev-python/werkzeug-0.16.1
 2007041046 metadata/md5-cache/dev-python/wheel-0.34.2
 2007041046 metadata/md5-cache/dev-python/whelk-2.7.1
 2007041046 metadata/md5-cache/dev-python/whichcraft-0.6.1
@@ -45750,7 +45677,6 @@
 2007081939 metadata/md5-cache/dev-python/configshell-fb-1.1.27
 2007081639 metadata/md5-cache/dev-python/contextlib2-0.6.0_p1
 2007081939 metadata/md5-cache/dev-python/croniter-0.3.30
-2007091209 metadata/md5-cache/dev-python/cryptography-2.9
 2007100939 metadata/md5-cache/dev-python/cython-0.29.21
 2007081709 metadata/md5-cache/dev-python/daemonize-2.5.0
 2007091339 metadata/md5-cache/dev-python/denonavr-0.9.4
@@ -45760,7 +45686,6 @@
 2007081939 metadata/md5-cache/dev-python/distro-1.5.0
 2007082309 metadata/md5-cache/dev-python/dj-database-url-0.5.0
 2007082339 metadata/md5-cache/dev-python/django-3.0.7
-2007082339 metadata/md5-cache/dev-python/dogpile-cache-0.9.1
 2007091139 metadata/md5-cache/dev-python/doit-0.32.0-r1
 2007091139 metadata/md5-cache/dev-python/doit-0.32.0-r2
 2007091139 metadata/md5-cache/dev-python/doit-py-0.5.0
@@ -45778,15 +45703,12 @@
 2007091209 metadata/md5-cache/dev-python/gast-0.3.3
 2007091309 metadata/md5-cache/dev-python/genshi-0.7.3-r1
 2007091309 metadata/md5-cache/dev-python/gevent-20.6.2
-2007091209 metadata/md5-cache/dev-python/geventhttpclient-1.4.2
-2007091309 metadata/md5-cache/dev-python/geventhttpclient-1.4.4
 2007081609 metadata/md5-cache/dev-python/gitdb-4.0.5
 2007091339 metadata/md5-cache/dev-python/google-auth-1.14.3-r1
 2007091339 metadata/md5-cache/dev-python/google-auth-httplib2-0.0.3
 2007091209 metadata/md5-cache/dev-python/google-pasta-0.2.0
 2007091409 metadata/md5-cache/dev-python/humanize-2.4.0
 2007091409 metadata/md5-cache/dev-python/idna-2.9
-2007091409 metadata/md5-cache/dev-python/importlib_metadata-1.6.1
 2007072309 metadata/md5-cache/dev-python/ipykernel-5.3.0
 2007100939 metadata/md5-cache/dev-python/ipykernel-5.3.2
 2007072309 metadata/md5-cache/dev-python/ipyparallel-6.3.0
@@ -45802,7 +45724,6 @@
 2007072309 metadata/md5-cache/dev-python/jupyter_client-6.1.5
 2007072309 metadata/md5-cache/dev-python/jupyter_core-4.6.3
 2007091209 metadata/md5-cache/dev-python/kazoo-2.7.0
-2007091409 metadata/md5-cache/dev-python/keyring-21.2.1
 2007091409 metadata/md5-cache/dev-python/llfuse-1.3.6
 2007091209 metadata/md5-cache/dev-python/lz4-3.0.2
 2007091539 metadata/md5-cache/dev-python/mako-1.1.3
@@ -45855,18 +45776,14 @@
 2007072309 metadata/md5-cache/dev-python/qtconsole-4.7.5
 2007100939 metadata/md5-cache/dev-python/readthedocs-sphinx-ext-2.1.0
 2007091209 metadata/md5-cache/dev-python/rencode-1.0.6
-2007091209 metadata/md5-cache/dev-python/six-1.15.0
 2007081609 metadata/md5-cache/dev-python/smmap-3.0.4
 2007071839 metadata/md5-cache/dev-python/testfixtures-6.14.1
 2007091139 metadata/md5-cache/dev-python/traitlets-4.3.3
 2007091209 metadata/md5-cache/dev-python/uritemplate-3.0.1-r1
-2007091209 metadata/md5-cache/dev-python/waitress-1.4.4
 2007091209 metadata/md5-cache/dev-python/wand-0.6.2
 2007091209 metadata/md5-cache/dev-python/watchdog-0.10.2
 2007091209 metadata/md5-cache/dev-python/wcwidth-0.2.2-r1
-2007091209 metadata/md5-cache/dev-python/webob-1.8.6
 2007072309 metadata/md5-cache/dev-python/widgetsnbextension-3.5.1
-2007091209 metadata/md5-cache/dev-python/wstools-0.4.8
 2007091209 metadata/md5-cache/dev-python/xlsxwriter-1.2.8
 2007120609 metadata/md5-cache/dev-python/argcomplete-1.11.1-r1
 2007120609 metadata/md5-cache/dev-python/beautifulsoup-4.8.2
@@ -45893,7 +45810,6 @@
 2007120139 metadata/md5-cache/dev-python/pluggy-0.13.1
 2007120139 metadata/md5-cache/dev-python/pycryptodome-3.9.7
 2007112309 metadata/md5-cache/dev-python/pyenchant-3.1.0
-2007120609 metadata/md5-cache/dev-python/pyfakefs-3.7.2
 2007120609 metadata/md5-cache/dev-python/pyfakefs-4.0.2
 2007110609 metadata/md5-cache/dev-python/pygraphviz-1.5
 2007120209 metadata/md5-cache/dev-python/pyproject2setuppy-7
@@ -45920,7 +45836,6 @@
 2007111139 metadata/md5-cache/dev-python/retry-decorator-1.1.1
 2007111139 metadata/md5-cache/dev-python/rst-linker-2.0.0
 2007111509 metadata/md5-cache/dev-python/scikit-build-0.11.1
-2007111209 metadata/md5-cache/dev-python/secretstorage-3.1.2
 2007111109 metadata/md5-cache/dev-python/setuptools-49.1.1
 2007111209 metadata/md5-cache/dev-python/setuptools_scm-4.1.2
 2007111209 metadata/md5-cache/dev-python/setuptools_scm_git_archive-1.1
@@ -45950,7 +45865,6 @@
 2007111839 metadata/md5-cache/dev-python/wrapt-1.12.1
 2007111109 metadata/md5-cache/dev-python/xmlschema-1.1.3
 2007120109 metadata/md5-cache/dev-python/xmlschema-1.2.2
-2007111839 metadata/md5-cache/dev-python/yarl-1.4.2
 2007122139 metadata/md5-cache/dev-python/GitPython-3.1.5
 2007121009 metadata/md5-cache/dev-python/PySDL2-0.9.7
 2007122139 metadata/md5-cache/dev-python/hypothesis-5.19.1
@@ -45977,7 +45891,6 @@
 2007140239 metadata/md5-cache/dev-python/jaraco-collections-3.0.0
 2007140239 metadata/md5-cache/dev-python/jaraco-functools-3.0.1
 2007140239 metadata/md5-cache/dev-python/jaraco-text-3.2.0
-2007132139 metadata/md5-cache/dev-python/multidict-4.7.6
 2007140239 metadata/md5-cache/dev-python/namespace-repoze-1
 2007140239 metadata/md5-cache/dev-python/objgraph-3.4.1
 2007132009 metadata/md5-cache/dev-python/pathlib-1.0.1-r1
@@ -46011,24 +45924,18 @@
 2007141909 metadata/md5-cache/dev-python/passlib-1.7.2
 2007141639 metadata/md5-cache/dev-python/paste-3.4.1
 2007141509 metadata/md5-cache/dev-python/paste-3.4.2
-2007142009 metadata/md5-cache/dev-python/pycairo-1.19.1
 2007141939 metadata/md5-cache/dev-python/pyftpdlib-1.5.6
 2007142009 metadata/md5-cache/dev-python/pyjwt-1.7.1-r1
 2007141909 metadata/md5-cache/dev-python/pypiserver-1.3.2
 2007141639 metadata/md5-cache/dev-python/pyquery-1.4.1-r1
-2007142009 metadata/md5-cache/dev-python/pyrsistent-0.16.0
 2007141939 metadata/md5-cache/dev-python/pytest-expect-1.1.0-r1
 2007142009 metadata/md5-cache/dev-python/pytest-freezegun-0.4.1
 2007141909 metadata/md5-cache/dev-python/pytest-localserver-0.5.0
 2007142009 metadata/md5-cache/dev-python/pytest-xdist-1.32.0
 2007141909 metadata/md5-cache/dev-python/readme_renderer-26.0
-2007142009 metadata/md5-cache/dev-python/regex-2020.4.4
 2007141909 metadata/md5-cache/dev-python/requests-toolbelt-0.9.1
 2007141909 metadata/md5-cache/dev-python/scrypt-0.8.13-r2
-2007142009 metadata/md5-cache/dev-python/scrypt-0.8.15
 2007141409 metadata/md5-cache/dev-python/sphinx-3.0.4
-2007141539 metadata/md5-cache/dev-python/sqlalchemy-1.3.17
-2007142009 metadata/md5-cache/dev-python/subunit-1.4.0
 2007141909 metadata/md5-cache/dev-python/towncrier-19.2.0
 2007150809 metadata/md5-cache/dev-python/tox-3.17.0
 2007141739 metadata/md5-cache/dev-python/tqdm-4.45.0
@@ -46038,9 +45945,7 @@
 2007142009 metadata/md5-cache/dev-python/urllib3-1.25.9
 2007141909 metadata/md5-cache/dev-python/virtualenv-16.7.10
 2007141909 metadata/md5-cache/dev-python/webtest-2.0.35
-2007142009 metadata/md5-cache/dev-python/werkzeug-1.0.1
 2007141639 metadata/md5-cache/dev-python/wsgiproxy2-0.4.6-r1
-2007142009 metadata/md5-cache/dev-python/xmlschema-1.2.0
 2007151139 metadata/md5-cache/dev-python/argon2-cffi-20.1.0
 2007151139 metadata/md5-cache/dev-python/cachetools-3.1.1
 2007151139 metadata/md5-cache/dev-python/cachetools-4.1.1
@@ -46063,12 +45968,9 @@
 2007151139 metadata/md5-cache/dev-python/python-markdown-math-0.7
 2007151139 metadata/md5-cache/dev-python/pytidylib-0.3.2
 2007151439 metadata/md5-cache/dev-python/stevedore-3.0.0
-2007151439 metadata/md5-cache/dev-python/stevedore-3.1.0
 2007151839 metadata/md5-cache/dev-python/thunarx-python-0.5.1-r1
 2007150909 metadata/md5-cache/dev-python/zxcvbn-4.4.28
-2007160739 metadata/md5-cache/dev-python/Manifest.gz
 2007152339 metadata/md5-cache/dev-python/blinker-1.4-r1
-2007160709 metadata/md5-cache/dev-python/boto-2.49.0-r3
 2007152209 metadata/md5-cache/dev-python/clang-python-10.0.0
 2007152209 metadata/md5-cache/dev-python/clang-python-10.0.1.9999
 2007152209 metadata/md5-cache/dev-python/clang-python-10.0.1_rc1
@@ -46082,9 +45984,7 @@
 2007152339 metadata/md5-cache/dev-python/flask-1.1.2
 2007152339 metadata/md5-cache/dev-python/httpbin-0.7.0
 2007160739 metadata/md5-cache/dev-python/httplib2-0.18.1
-2007160509 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
 2007152339 metadata/md5-cache/dev-python/itsdangerous-1.1.0
-2007152209 metadata/md5-cache/dev-python/lit-10.0.0
 2007152209 metadata/md5-cache/dev-python/lit-10.0.1.9999
 2007152209 metadata/md5-cache/dev-python/lit-10.0.1_rc1
 2007152209 metadata/md5-cache/dev-python/lit-10.0.1_rc2
@@ -46098,14 +45998,78 @@
 2007152209 metadata/md5-cache/dev-python/llvmlite-0.32.1
 2007152209 metadata/md5-cache/dev-python/llvmlite-0.33.0
 2007152209 metadata/md5-cache/dev-python/llvmlite-0.33.0-r1
-2007160739 metadata/md5-cache/dev-python/pathspec-0.8.0
 2007152339 metadata/md5-cache/dev-python/pexpect-4.8.0
 2007152339 metadata/md5-cache/dev-python/pytest-httpbin-1.0.0
 2007152339 metadata/md5-cache/dev-python/requests-2.23.0
-2007160539 metadata/md5-cache/dev-python/rsa-4.2
 2007152209 metadata/md5-cache/dev-python/shiboken2-5.14.2
-2007160509 metadata/md5-cache/dev-python/sure-1.4.11
-2007160739 metadata/md5-cache/dev-python/vcrpy-4.0.2
+2007170909 metadata/md5-cache/dev-python/Manifest.gz
+2007170339 metadata/md5-cache/dev-python/boto-2.49.0-r3
+2007161509 metadata/md5-cache/dev-python/cliff-3.3.0
+2007170209 metadata/md5-cache/dev-python/cryptography-2.9
+2007170509 metadata/md5-cache/dev-python/dogpile-cache-0.9.1
+2007170439 metadata/md5-cache/dev-python/dulwich-0.19.15
+2007170709 metadata/md5-cache/dev-python/geventhttpclient-1.4.2
+2007170439 metadata/md5-cache/dev-python/geventhttpclient-1.4.4
+2007170739 metadata/md5-cache/dev-python/helpdev-0.7.1
+2007170339 metadata/md5-cache/dev-python/httpretty-1.0.2-r1
+2007170339 metadata/md5-cache/dev-python/importlib_metadata-1.6.1
+2007170739 metadata/md5-cache/dev-python/jedi-0.17.1-r1
+2007162239 metadata/md5-cache/dev-python/jeepney-0.4.3
+2007170509 metadata/md5-cache/dev-python/jmespath-0.10.0
+2007170509 metadata/md5-cache/dev-python/jsonpatch-1.26
+2007162239 metadata/md5-cache/dev-python/keyring-21.2.1
+2007170509 metadata/md5-cache/dev-python/keystoneauth-4.0.1
+2007170739 metadata/md5-cache/dev-python/libsass-0.20.0
+2007162139 metadata/md5-cache/dev-python/lit-10.0.0
+2007162209 metadata/md5-cache/dev-python/m2crypto-0.36.0
+2007161609 metadata/md5-cache/dev-python/multidict-4.7.6
+2007170509 metadata/md5-cache/dev-python/openstackdocstheme-1.18.1
+2007170509 metadata/md5-cache/dev-python/openstacksdk-0.46.0
+2007170509 metadata/md5-cache/dev-python/os-service-types-1.7.0
+2007161609 metadata/md5-cache/dev-python/pathspec-0.8.0
+2007170739 metadata/md5-cache/dev-python/pep8-1.7.1-r1
+2007162209 metadata/md5-cache/dev-python/psutil-5.7.2
+2007170309 metadata/md5-cache/dev-python/pycairo-1.19.1
+2007170739 metadata/md5-cache/dev-python/pydocstyle-5.0.2-r1
+2007170339 metadata/md5-cache/dev-python/pyfakefs-3.7.2
+2007170439 metadata/md5-cache/dev-python/pyre2-1.0.7
+2007170609 metadata/md5-cache/dev-python/pyrsistent-0.16.0
+2007170739 metadata/md5-cache/dev-python/pytest-cache-1.0-r3
+2007170739 metadata/md5-cache/dev-python/pytest-pep8-1.0.6-r2
+2007170909 metadata/md5-cache/dev-python/pytest-timeout-1.4.2
+2007170439 metadata/md5-cache/dev-python/python-fastimport-0.9.8
+2007170739 metadata/md5-cache/dev-python/python-language-server-0.34.1
+2007170739 metadata/md5-cache/dev-python/qdarkstyle-2.8.1
+2007170739 metadata/md5-cache/dev-python/qtsass-0.3.0
+2007170639 metadata/md5-cache/dev-python/regex-2020.4.4
+2007170509 metadata/md5-cache/dev-python/reno-2.11.3
+2007170509 metadata/md5-cache/dev-python/requestsexceptions-1.4.0
+2007170739 metadata/md5-cache/dev-python/rope-0.17.0
+2007170339 metadata/md5-cache/dev-python/rsa-4.2
+2007170539 metadata/md5-cache/dev-python/scrypt-0.8.15
+2007162239 metadata/md5-cache/dev-python/secretstorage-3.1.2
+2007162239 metadata/md5-cache/dev-python/selenium-3.141.0-r1
+2007170909 metadata/md5-cache/dev-python/simplejson-3.17.2
+2007162109 metadata/md5-cache/dev-python/six-1.15.0
+2007170739 metadata/md5-cache/dev-python/sphinxcontrib-issuetracker-0.11-r2
+2007170739 metadata/md5-cache/dev-python/spyder-4.1.4
+2007170739 metadata/md5-cache/dev-python/spyder-kernels-1.9.2
+2007170609 metadata/md5-cache/dev-python/sqlalchemy-1.3.17
+2007170509 metadata/md5-cache/dev-python/stevedore-3.1.0
+2007170509 metadata/md5-cache/dev-python/subunit-1.4.0
+2007170339 metadata/md5-cache/dev-python/sure-1.4.11
+2007170909 metadata/md5-cache/dev-python/tox-3.17.1
+2007170909 metadata/md5-cache/dev-python/tqdm-4.48.0
+2007170739 metadata/md5-cache/dev-python/ujson-1.35-r1
+2007161609 metadata/md5-cache/dev-python/vcrpy-4.0.2
+2007170909 metadata/md5-cache/dev-python/virtualenv-20.0.27
+2007162139 metadata/md5-cache/dev-python/waitress-1.4.4
+2007162239 metadata/md5-cache/dev-python/webob-1.8.6
+2007170639 metadata/md5-cache/dev-python/werkzeug-1.0.1
+2007162309 metadata/md5-cache/dev-python/wstools-0.4.8
+2007170739 metadata/md5-cache/dev-python/wurlitzer-2.0.1
+2007170809 metadata/md5-cache/dev-python/xmlschema-1.2.0
+2007161609 metadata/md5-cache/dev-python/yarl-1.4.2
 2005201639 metadata/md5-cache/dev-qt/qt-docs-5.14.2_p202003291239
 2006141358 metadata/md5-cache/dev-qt/assistant-5.14.2
 2006141358 metadata/md5-cache/dev-qt/assistant-5.15.0
@@ -46225,10 +46189,6 @@
 2007152209 metadata/md5-cache/dev-qt/qt-creator-4.12.3
 2007152209 metadata/md5-cache/dev-qt/qt-creator-4.8.2
 2007152209 metadata/md5-cache/dev-qt/qt-creator-9999
-2007041046 metadata/md5-cache/dev-ros/actionlib-1.11.13
-2007041046 metadata/md5-cache/dev-ros/actionlib-1.11.14
-2007041046 metadata/md5-cache/dev-ros/actionlib-1.11.15
-2007041046 metadata/md5-cache/dev-ros/actionlib-9999
 2007041046 metadata/md5-cache/dev-ros/ament_cmake_core-0.8.1
 2007041046 metadata/md5-cache/dev-ros/ament_cmake_core-9999
 2007041046 metadata/md5-cache/dev-ros/ament_cmake_export_definitions-0.8.1
@@ -46257,101 +46217,9 @@
 2007041046 metadata/md5-cache/dev-ros/ament_cmake_test-9999
 2007041046 metadata/md5-cache/dev-ros/ament_cmake_version-0.8.1
 2007041046 metadata/md5-cache/dev-ros/ament_cmake_version-9999
-2007041046 metadata/md5-cache/dev-ros/angles-1.9.11
-2007041046 metadata/md5-cache/dev-ros/angles-9999
-2007041046 metadata/md5-cache/dev-ros/audio_capture-0.3.1
-2007041046 metadata/md5-cache/dev-ros/audio_capture-0.3.2
-2007041046 metadata/md5-cache/dev-ros/audio_capture-0.3.3
-2007041046 metadata/md5-cache/dev-ros/audio_capture-9999
-2007041046 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.1
-2007041046 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.2
-2007041046 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.3
-2007041046 metadata/md5-cache/dev-ros/audio_common_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/audio_play-0.3.1
-2007041046 metadata/md5-cache/dev-ros/audio_play-0.3.2
-2007041046 metadata/md5-cache/dev-ros/audio_play-0.3.3
-2007041046 metadata/md5-cache/dev-ros/audio_play-9999
-2007041046 metadata/md5-cache/dev-ros/camera_calibration_parsers-1.11.13-r1
-2007041046 metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.10
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.12
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.13
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.7
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.8
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-1.11.9
-2007041046 metadata/md5-cache/dev-ros/camera_info_manager-9999
-2007041046 metadata/md5-cache/dev-ros/class_loader-0.4.1-r1
-2007041046 metadata/md5-cache/dev-ros/class_loader-9999
-2007041046 metadata/md5-cache/dev-ros/cmake_modules-0.4.2
-2007041046 metadata/md5-cache/dev-ros/cmake_modules-0.5.0
-2007041046 metadata/md5-cache/dev-ros/cmake_modules-9999
-2007041046 metadata/md5-cache/dev-ros/collada_parser-1.12.10-r3
-2007041046 metadata/md5-cache/dev-ros/collada_parser-1.12.12
-2007041046 metadata/md5-cache/dev-ros/collada_parser-9999
-2007041046 metadata/md5-cache/dev-ros/collada_urdf-1.12.10-r1
-2007041046 metadata/md5-cache/dev-ros/collada_urdf-1.12.12
-2007041046 metadata/md5-cache/dev-ros/collada_urdf-9999
 2007041046 metadata/md5-cache/dev-ros/console_bridge_vendor-1.2.0
 2007041046 metadata/md5-cache/dev-ros/console_bridge_vendor-9999
-2007041046 metadata/md5-cache/dev-ros/control_msgs-1.4.0
-2007041046 metadata/md5-cache/dev-ros/control_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/control_toolbox-1.14.0
-2007041046 metadata/md5-cache/dev-ros/control_toolbox-1.15.0
-2007041046 metadata/md5-cache/dev-ros/control_toolbox-1.16.0
-2007041046 metadata/md5-cache/dev-ros/control_toolbox-9999
-2007041046 metadata/md5-cache/dev-ros/convex_decomposition-0.1.10
-2007041046 metadata/md5-cache/dev-ros/convex_decomposition-0.1.11
-2007041046 metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
-2007041046 metadata/md5-cache/dev-ros/convex_decomposition-9999
-2007041046 metadata/md5-cache/dev-ros/cv_bridge-1.13.0
-2007041046 metadata/md5-cache/dev-ros/cv_bridge-9999
-2007041046 metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.7-r2
-2007041046 metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
-2007041046 metadata/md5-cache/dev-ros/driver_base-1.6.8
-2007041046 metadata/md5-cache/dev-ros/driver_base-9999
-2007041046 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.48
-2007041046 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.5.49
-2007041046 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.6.0
-2007041046 metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
-2007041046 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.4
-2007041046 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
-2007041046 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.6
-2007041046 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.7
-2007041046 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
-2007041046 metadata/md5-cache/dev-ros/eigen_stl_containers-9999
 2007041046 metadata/md5-cache/dev-ros/fake_localization-9999
-2007041046 metadata/md5-cache/dev-ros/filters-1.8.1-r1
-2007041046 metadata/md5-cache/dev-ros/filters-9999
-2007041046 metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
-2007041046 metadata/md5-cache/dev-ros/gazebo_dev-2.7.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_dev-2.8.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_dev-2.8.5
-2007041046 metadata/md5-cache/dev-ros/gazebo_dev-2.8.7
-2007041046 metadata/md5-cache/dev-ros/gazebo_dev-9999
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-2.6.2
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-2.7.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-2.8.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-2.8.5
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-2.8.7
-2007041046 metadata/md5-cache/dev-ros/gazebo_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/gazebo_plugins-2.8.7
-2007041046 metadata/md5-cache/dev-ros/gazebo_plugins-9999
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-2.6.2
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-2.7.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-2.8.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-2.8.5
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-2.8.7
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros-9999
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.2-r1
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.4
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.5
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-2.8.7
-2007041046 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
 2007041046 metadata/md5-cache/dev-ros/gencpp-0.6.5
 2007041046 metadata/md5-cache/dev-ros/gencpp-9999
 2007041046 metadata/md5-cache/dev-ros/geneus-3.0.0
@@ -46360,223 +46228,19 @@
 2007041046 metadata/md5-cache/dev-ros/genlisp-9999
 2007041046 metadata/md5-cache/dev-ros/genmsg-0.5.16
 2007041046 metadata/md5-cache/dev-ros/genmsg-9999
-2007041046 metadata/md5-cache/dev-ros/gennodejs-2.0.1
-2007041046 metadata/md5-cache/dev-ros/gennodejs-9999
 2007041046 metadata/md5-cache/dev-ros/genpy-0.6.11
 2007041046 metadata/md5-cache/dev-ros/genpy-9999
 2007041046 metadata/md5-cache/dev-ros/geodesy-0.5.2
 2007041046 metadata/md5-cache/dev-ros/geodesy-0.5.3
-2007041046 metadata/md5-cache/dev-ros/geodesy-9999
 2007041046 metadata/md5-cache/dev-ros/geographic_msgs-0.5.0
 2007041046 metadata/md5-cache/dev-ros/geographic_msgs-0.5.2
 2007041046 metadata/md5-cache/dev-ros/geographic_msgs-0.5.3
-2007041046 metadata/md5-cache/dev-ros/geographic_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/geometric_shapes-0.6.1
-2007041046 metadata/md5-cache/dev-ros/geometric_shapes-9999
-2007041046 metadata/md5-cache/dev-ros/gmapping-1.3.10
-2007041046 metadata/md5-cache/dev-ros/gmapping-1.4.0
-2007041046 metadata/md5-cache/dev-ros/gmapping-9999
-2007041046 metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
-2007041046 metadata/md5-cache/dev-ros/hector_geotiff-0.3.5-r2
-2007041046 metadata/md5-cache/dev-ros/hector_geotiff-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_geotiff-9999
-2007041046 metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5-r1
-2007041046 metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
-2007041046 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
-2007041046 metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_imu_tools-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_imu_tools-9999
-2007041046 metadata/md5-cache/dev-ros/hector_map_server-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_map_server-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_map_server-9999
-2007041046 metadata/md5-cache/dev-ros/hector_map_tools-0.4.0-r1
-2007041046 metadata/md5-cache/dev-ros/hector_map_tools-9999
-2007041046 metadata/md5-cache/dev-ros/hector_mapping-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_mapping-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_mapping-9999
-2007041046 metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
-2007041046 metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
-2007041046 metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_marker_drawing-9999
-2007041046 metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_nav_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
-2007041046 metadata/md5-cache/dev-ros/hector_pose_estimation-9999
-2007041046 metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
-2007041046 metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
-2007041046 metadata/md5-cache/dev-ros/hector_slam_launch-0.3.3
-2007041046 metadata/md5-cache/dev-ros/hector_slam_launch-0.3.4
-2007041046 metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_slam_launch-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_slam_launch-9999
-2007041046 metadata/md5-cache/dev-ros/hector_trajectory_server-0.3.5
-2007041046 metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.0
-2007041046 metadata/md5-cache/dev-ros/hector_trajectory_server-9999
-2007041046 metadata/md5-cache/dev-ros/image_geometry-1.12.3
-2007041046 metadata/md5-cache/dev-ros/image_geometry-1.12.4
-2007041046 metadata/md5-cache/dev-ros/image_geometry-1.12.5
-2007041046 metadata/md5-cache/dev-ros/image_geometry-1.12.7
-2007041046 metadata/md5-cache/dev-ros/image_geometry-1.12.8
-2007041046 metadata/md5-cache/dev-ros/image_geometry-1.13.0
-2007041046 metadata/md5-cache/dev-ros/image_geometry-9999
-2007041046 metadata/md5-cache/dev-ros/image_transport-1.11.13-r2
-2007041046 metadata/md5-cache/dev-ros/image_transport-9999
-2007041046 metadata/md5-cache/dev-ros/imu_processors-0.2.1
-2007041046 metadata/md5-cache/dev-ros/imu_processors-0.2.2
-2007041046 metadata/md5-cache/dev-ros/imu_processors-0.2.3
-2007041046 metadata/md5-cache/dev-ros/imu_processors-9999
-2007041046 metadata/md5-cache/dev-ros/imu_transformer-0.2.2-r1
-2007041046 metadata/md5-cache/dev-ros/imu_transformer-0.2.3
-2007041046 metadata/md5-cache/dev-ros/imu_transformer-9999
-2007041046 metadata/md5-cache/dev-ros/interactive_markers-1.11.3
-2007041046 metadata/md5-cache/dev-ros/interactive_markers-1.11.4
-2007041046 metadata/md5-cache/dev-ros/interactive_markers-9999
-2007041046 metadata/md5-cache/dev-ros/ivcon-0.1.5
-2007041046 metadata/md5-cache/dev-ros/ivcon-0.1.6
-2007041046 metadata/md5-cache/dev-ros/ivcon-0.1.7
-2007041046 metadata/md5-cache/dev-ros/ivcon-9999
-2007041046 metadata/md5-cache/dev-ros/kdl_parser-1.12.10
-2007041046 metadata/md5-cache/dev-ros/kdl_parser-1.13.0
-2007041046 metadata/md5-cache/dev-ros/kdl_parser-1.13.1
-2007041046 metadata/md5-cache/dev-ros/kdl_parser-9999
-2007041046 metadata/md5-cache/dev-ros/kdl_parser_py-1.12.10
-2007041046 metadata/md5-cache/dev-ros/kdl_parser_py-1.13.0
-2007041046 metadata/md5-cache/dev-ros/kdl_parser_py-1.13.1
-2007041046 metadata/md5-cache/dev-ros/kdl_parser_py-9999
-2007041046 metadata/md5-cache/dev-ros/laser_assembler-1.7.6
-2007041046 metadata/md5-cache/dev-ros/laser_assembler-1.7.7
-2007041046 metadata/md5-cache/dev-ros/laser_assembler-9999
-2007041046 metadata/md5-cache/dev-ros/laser_filters-1.8.6
-2007041046 metadata/md5-cache/dev-ros/laser_filters-1.8.7
-2007041046 metadata/md5-cache/dev-ros/laser_filters-9999
-2007041046 metadata/md5-cache/dev-ros/laser_geometry-1.6.4
-2007041046 metadata/md5-cache/dev-ros/laser_geometry-9999
-2007041046 metadata/md5-cache/dev-ros/laser_proc-0.1.5
-2007041046 metadata/md5-cache/dev-ros/laser_proc-9999
-2007041046 metadata/md5-cache/dev-ros/libmavconn-0.19.0-r1
-2007041046 metadata/md5-cache/dev-ros/libmavconn-9999
-2007041046 metadata/md5-cache/dev-ros/map_msgs-1.13.0
-2007041046 metadata/md5-cache/dev-ros/map_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.2.7-r1
-2007041046 metadata/md5-cache/dev-ros/mavlink-gbp-release-2017.5.5
-2007041046 metadata/md5-cache/dev-ros/mavlink-gbp-release-2019.11.11
-2007041046 metadata/md5-cache/dev-ros/mavros-0.19.0-r1
-2007041046 metadata/md5-cache/dev-ros/mavros-9999
-2007041046 metadata/md5-cache/dev-ros/mavros_extras-0.19.0-r1
-2007041046 metadata/md5-cache/dev-ros/mavros_extras-9999
-2007041046 metadata/md5-cache/dev-ros/mavros_msgs-0.18.7
-2007041046 metadata/md5-cache/dev-ros/mavros_msgs-0.19.0
-2007041046 metadata/md5-cache/dev-ros/mavros_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/media_export-0.2.0
-2007041046 metadata/md5-cache/dev-ros/media_export-9999
-2007041046 metadata/md5-cache/dev-ros/message_generation-0.3.0
-2007041046 metadata/md5-cache/dev-ros/message_generation-0.4.0
-2007041046 metadata/md5-cache/dev-ros/message_generation-9999
-2007041046 metadata/md5-cache/dev-ros/message_runtime-0.4.12
-2007041046 metadata/md5-cache/dev-ros/message_runtime-9999
-2007041046 metadata/md5-cache/dev-ros/message_to_tf-0.3.0
-2007041046 metadata/md5-cache/dev-ros/message_to_tf-9999
-2007041046 metadata/md5-cache/dev-ros/move_base_msgs-1.13.0
-2007041046 metadata/md5-cache/dev-ros/move_base_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/moveit_msgs-0.10.0
-2007041046 metadata/md5-cache/dev-ros/moveit_msgs-0.9.1
-2007041046 metadata/md5-cache/dev-ros/moveit_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/nmea_msgs-1.0.0
-2007041046 metadata/md5-cache/dev-ros/nmea_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
-2007041046 metadata/md5-cache/dev-ros/object_recognition_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/octomap_msgs-0.3.3
-2007041046 metadata/md5-cache/dev-ros/octomap_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
-2007041046 metadata/md5-cache/dev-ros/octomap_ros-9999
-2007041046 metadata/md5-cache/dev-ros/opencv_apps-2.0.1
-2007041046 metadata/md5-cache/dev-ros/opencv_apps-9999
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.1-r1
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.2
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.3
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.4
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.5
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.7
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.12.8
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-1.13.0
-2007041046 metadata/md5-cache/dev-ros/opencv_tests-9999
-2007041046 metadata/md5-cache/dev-ros/openni2_camera-0.3.0-r1
-2007041046 metadata/md5-cache/dev-ros/openni2_camera-0.4.0
-2007041046 metadata/md5-cache/dev-ros/openni2_camera-0.4.2
-2007041046 metadata/md5-cache/dev-ros/openni2_camera-9999
-2007041046 metadata/md5-cache/dev-ros/openni2_launch-0.4.0
-2007041046 metadata/md5-cache/dev-ros/openni2_launch-0.4.2
-2007041046 metadata/md5-cache/dev-ros/openni2_launch-9999
-2007041046 metadata/md5-cache/dev-ros/openslam_gmapping-0.1.1
-2007041046 metadata/md5-cache/dev-ros/openslam_gmapping-0.1.2
-2007041046 metadata/md5-cache/dev-ros/openslam_gmapping-9999
-2007041046 metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
-2007041046 metadata/md5-cache/dev-ros/pcl_conversions-9999
-2007041046 metadata/md5-cache/dev-ros/pcl_msgs-0.2.0
-2007041046 metadata/md5-cache/dev-ros/pcl_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/pcl_ros-1.7.1
-2007041046 metadata/md5-cache/dev-ros/pcl_ros-9999
-2007041046 metadata/md5-cache/dev-ros/pluginlib-1.12.0-r1
-2007041046 metadata/md5-cache/dev-ros/pluginlib-1.12.1
-2007041046 metadata/md5-cache/dev-ros/pluginlib-9999
 2007041046 metadata/md5-cache/dev-ros/poco_vendor-1.2.0
 2007041046 metadata/md5-cache/dev-ros/poco_vendor-9999
-2007041046 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.0-r1
-2007041046 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
-2007041046 metadata/md5-cache/dev-ros/polled_camera-1.11.12
-2007041046 metadata/md5-cache/dev-ros/polled_camera-1.11.13
-2007041046 metadata/md5-cache/dev-ros/polled_camera-9999
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.10
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.13
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.14
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.9
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.0
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.1
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.2
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.3
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
-2007041046 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
-2007041046 metadata/md5-cache/dev-ros/pr2_description-1.12.0
-2007041046 metadata/md5-cache/dev-ros/pr2_description-1.12.1
-2007041046 metadata/md5-cache/dev-ros/pr2_description-1.12.2
-2007041046 metadata/md5-cache/dev-ros/pr2_description-1.12.3
-2007041046 metadata/md5-cache/dev-ros/pr2_description-1.12.4
-2007041046 metadata/md5-cache/dev-ros/pr2_description-9999
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.11.10
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.11.11
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.11.13
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.11.14
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.11.9
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.12.0
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.12.1
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.12.2
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.12.3
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-1.12.4
-2007041046 metadata/md5-cache/dev-ros/pr2_machine-9999
-2007041046 metadata/md5-cache/dev-ros/pr2_msgs-1.12.0
-2007041046 metadata/md5-cache/dev-ros/pr2_msgs-1.12.1
-2007041046 metadata/md5-cache/dev-ros/pr2_msgs-1.12.2
-2007041046 metadata/md5-cache/dev-ros/pr2_msgs-1.12.3
-2007041046 metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
-2007041046 metadata/md5-cache/dev-ros/pr2_msgs-9999
-2007041046 metadata/md5-cache/dev-ros/python_qt_binding-0.3.4
-2007041046 metadata/md5-cache/dev-ros/python_qt_binding-0.3.5-r1
-2007041046 metadata/md5-cache/dev-ros/python_qt_binding-9999
 2007041046 metadata/md5-cache/dev-ros/rosbag-9999
 2007041046 metadata/md5-cache/dev-ros/roscpp-9999
 2007041046 metadata/md5-cache/dev-ros/rqt_image_view-0.4.15
 2007041046 metadata/md5-cache/dev-ros/rqt_image_view-9999
-2007041046 metadata/md5-cache/dev-ros/rviz-1.13.6-r1
-2007041046 metadata/md5-cache/dev-ros/rviz-1.14.0
-2007041046 metadata/md5-cache/dev-ros/rviz-9999
 2007041046 metadata/md5-cache/dev-ros/turtle_tf-0.2.3
 2007041046 metadata/md5-cache/dev-ros/turtle_tf-9999
 2007041046 metadata/md5-cache/dev-ros/turtle_tf2-0.2.3
@@ -46993,7 +46657,6 @@
 2007101639 metadata/md5-cache/dev-ros/rqt_web-9999
 2007102009 metadata/md5-cache/dev-ros/turtlesim-0.10.1
 2007101909 metadata/md5-cache/dev-ros/voxel_grid-1.17.0
-2007152009 metadata/md5-cache/dev-ros/Manifest.gz
 2007152009 metadata/md5-cache/dev-ros/qt_dotgraph-0.4.1
 2007152009 metadata/md5-cache/dev-ros/qt_dotgraph-9999
 2007152009 metadata/md5-cache/dev-ros/qt_gui-0.4.1
@@ -47046,6 +46709,186 @@
 2007151839 metadata/md5-cache/dev-ros/roslisp-9999
 2007151839 metadata/md5-cache/dev-ros/rospack-2.6.2
 2007151839 metadata/md5-cache/dev-ros/rospack-9999
+2007162039 metadata/md5-cache/dev-ros/Manifest.gz
+2007162039 metadata/md5-cache/dev-ros/actionlib-1.13.1
+2007162039 metadata/md5-cache/dev-ros/actionlib-9999
+2007162039 metadata/md5-cache/dev-ros/actionlib_tools-1.13.1
+2007162039 metadata/md5-cache/dev-ros/actionlib_tools-9999
+2007162039 metadata/md5-cache/dev-ros/angles-1.9.13
+2007162039 metadata/md5-cache/dev-ros/angles-9999
+2007162039 metadata/md5-cache/dev-ros/audio_capture-0.3.6
+2007162039 metadata/md5-cache/dev-ros/audio_capture-9999
+2007162039 metadata/md5-cache/dev-ros/audio_common_msgs-0.3.6
+2007162039 metadata/md5-cache/dev-ros/audio_common_msgs-9999
+2007162039 metadata/md5-cache/dev-ros/audio_play-0.3.6
+2007162039 metadata/md5-cache/dev-ros/audio_play-9999
+2007161609 metadata/md5-cache/dev-ros/camera_calibration_parsers-1.12.0
+2007161609 metadata/md5-cache/dev-ros/camera_calibration_parsers-9999
+2007161609 metadata/md5-cache/dev-ros/camera_info_manager-1.12.0
+2007161609 metadata/md5-cache/dev-ros/camera_info_manager-9999
+2007162039 metadata/md5-cache/dev-ros/class_loader-0.5.0
+2007162039 metadata/md5-cache/dev-ros/class_loader-9999
+2007162039 metadata/md5-cache/dev-ros/cmake_modules-0.5.0
+2007162039 metadata/md5-cache/dev-ros/cmake_modules-9999
+2007162039 metadata/md5-cache/dev-ros/collada_parser-1.12.13
+2007162039 metadata/md5-cache/dev-ros/collada_parser-9999
+2007162039 metadata/md5-cache/dev-ros/collada_urdf-1.12.13
+2007162039 metadata/md5-cache/dev-ros/collada_urdf-9999
+2007162039 metadata/md5-cache/dev-ros/control_msgs-1.5.2
+2007162039 metadata/md5-cache/dev-ros/control_msgs-9999
+2007162039 metadata/md5-cache/dev-ros/control_toolbox-1.18.2
+2007162039 metadata/md5-cache/dev-ros/control_toolbox-9999
+2007162039 metadata/md5-cache/dev-ros/convex_decomposition-0.1.12
+2007162039 metadata/md5-cache/dev-ros/convex_decomposition-9999
+2007161609 metadata/md5-cache/dev-ros/cv_bridge-1.15.0
+2007161609 metadata/md5-cache/dev-ros/cv_bridge-9999
+2007162039 metadata/md5-cache/dev-ros/depthimage_to_laserscan-1.0.8
+2007162039 metadata/md5-cache/dev-ros/depthimage_to_laserscan-9999
+2007162039 metadata/md5-cache/dev-ros/driver_base-1.6.8
+2007162039 metadata/md5-cache/dev-ros/driver_base-9999
+2007162039 metadata/md5-cache/dev-ros/dynamic_reconfigure-1.7.0
+2007162039 metadata/md5-cache/dev-ros/dynamic_reconfigure-9999
+2007162039 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.8
+2007162039 metadata/md5-cache/dev-ros/eigen_stl_containers-9999
+2007162039 metadata/md5-cache/dev-ros/filters-1.9.0
+2007162039 metadata/md5-cache/dev-ros/filters-9999
+2007162039 metadata/md5-cache/dev-ros/gazebo_dev-2.9.1
+2007162039 metadata/md5-cache/dev-ros/gazebo_dev-9999
+2007162039 metadata/md5-cache/dev-ros/gazebo_msgs-2.9.1
+2007162039 metadata/md5-cache/dev-ros/gazebo_msgs-9999
+2007162039 metadata/md5-cache/dev-ros/gazebo_plugins-2.9.1
+2007162039 metadata/md5-cache/dev-ros/gazebo_plugins-9999
+2007162039 metadata/md5-cache/dev-ros/gazebo_ros-2.9.1
+2007162039 metadata/md5-cache/dev-ros/gazebo_ros-9999
+2007162039 metadata/md5-cache/dev-ros/gazebo_ros_control-2.9.1
+2007162039 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+2007162039 metadata/md5-cache/dev-ros/gennodejs-2.0.1
+2007162039 metadata/md5-cache/dev-ros/gennodejs-9999
+2007162039 metadata/md5-cache/dev-ros/geodesy-0.5.5
+2007162039 metadata/md5-cache/dev-ros/geodesy-9999
+2007162039 metadata/md5-cache/dev-ros/geographic_msgs-0.5.5
+2007162039 metadata/md5-cache/dev-ros/geographic_msgs-9999
+2007162039 metadata/md5-cache/dev-ros/geometric_shapes-0.7.0
+2007162039 metadata/md5-cache/dev-ros/geometric_shapes-9999
+2007162039 metadata/md5-cache/dev-ros/gmapping-1.4.1
+2007162039 metadata/md5-cache/dev-ros/gmapping-9999
+2007161939 metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_compressed_map_transport-9999
+2007161939 metadata/md5-cache/dev-ros/hector_geotiff-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_geotiff-9999
+2007161939 metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_geotiff_plugins-9999
+2007161939 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-9999
+2007161939 metadata/md5-cache/dev-ros/hector_imu_tools-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_imu_tools-9999
+2007161939 metadata/md5-cache/dev-ros/hector_map_server-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_map_server-9999
+2007161939 metadata/md5-cache/dev-ros/hector_map_tools-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_map_tools-9999
+2007161939 metadata/md5-cache/dev-ros/hector_mapping-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_mapping-9999
+2007161939 metadata/md5-cache/dev-ros/hector_marker_drawing-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_marker_drawing-9999
+2007161939 metadata/md5-cache/dev-ros/hector_nav_msgs-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_nav_msgs-9999
+2007161939 metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0-r1
+2007161939 metadata/md5-cache/dev-ros/hector_pose_estimation-9999
+2007161939 metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.3.0-r1
+2007161939 metadata/md5-cache/dev-ros/hector_pose_estimation_core-9999
+2007161939 metadata/md5-cache/dev-ros/hector_slam_launch-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_slam_launch-9999
+2007161939 metadata/md5-cache/dev-ros/hector_trajectory_server-0.4.1
+2007161939 metadata/md5-cache/dev-ros/hector_trajectory_server-9999
+2007161609 metadata/md5-cache/dev-ros/image_geometry-1.15.0
+2007161609 metadata/md5-cache/dev-ros/image_geometry-9999
+2007161609 metadata/md5-cache/dev-ros/image_transport-1.12.0
+2007161609 metadata/md5-cache/dev-ros/image_transport-9999
+2007161939 metadata/md5-cache/dev-ros/imu_processors-0.3.0
+2007161939 metadata/md5-cache/dev-ros/imu_processors-9999
+2007161939 metadata/md5-cache/dev-ros/imu_transformer-0.3.0
+2007161939 metadata/md5-cache/dev-ros/imu_transformer-9999
+2007161609 metadata/md5-cache/dev-ros/interactive_markers-1.12.0
+2007161609 metadata/md5-cache/dev-ros/interactive_markers-9999
+2007161939 metadata/md5-cache/dev-ros/ivcon-0.1.7
+2007161939 metadata/md5-cache/dev-ros/ivcon-9999
+2007161939 metadata/md5-cache/dev-ros/kdl_parser-1.14.0
+2007161939 metadata/md5-cache/dev-ros/kdl_parser-9999
+2007161939 metadata/md5-cache/dev-ros/kdl_parser_py-1.14.0
+2007161939 metadata/md5-cache/dev-ros/kdl_parser_py-9999
+2007161939 metadata/md5-cache/dev-ros/laser_assembler-1.7.8
+2007161939 metadata/md5-cache/dev-ros/laser_assembler-9999
+2007161939 metadata/md5-cache/dev-ros/laser_filters-1.8.11
+2007161939 metadata/md5-cache/dev-ros/laser_filters-9999
+2007161939 metadata/md5-cache/dev-ros/laser_geometry-1.6.5
+2007161939 metadata/md5-cache/dev-ros/laser_geometry-9999
+2007161939 metadata/md5-cache/dev-ros/laser_proc-0.1.6
+2007161939 metadata/md5-cache/dev-ros/laser_proc-9999
+2007161939 metadata/md5-cache/dev-ros/libmavconn-1.2.0
+2007161939 metadata/md5-cache/dev-ros/libmavconn-9999
+2007161939 metadata/md5-cache/dev-ros/map_msgs-1.14.0
+2007161939 metadata/md5-cache/dev-ros/map_msgs-9999
+2007161939 metadata/md5-cache/dev-ros/mavlink-gbp-release-2020.7.7
+2007161939 metadata/md5-cache/dev-ros/mavros-1.2.0
+2007161939 metadata/md5-cache/dev-ros/mavros-9999
+2007161939 metadata/md5-cache/dev-ros/mavros_extras-1.2.0
+2007161939 metadata/md5-cache/dev-ros/mavros_extras-9999
+2007161939 metadata/md5-cache/dev-ros/mavros_msgs-1.2.0
+2007161939 metadata/md5-cache/dev-ros/mavros_msgs-9999
+2007161939 metadata/md5-cache/dev-ros/media_export-0.3.0
+2007161939 metadata/md5-cache/dev-ros/media_export-9999
+2007161939 metadata/md5-cache/dev-ros/message_generation-0.4.1
+2007161939 metadata/md5-cache/dev-ros/message_generation-9999
+2007161939 metadata/md5-cache/dev-ros/message_runtime-0.4.13
+2007161939 metadata/md5-cache/dev-ros/message_runtime-9999
+2007161939 metadata/md5-cache/dev-ros/message_to_tf-0.3.0
+2007161939 metadata/md5-cache/dev-ros/message_to_tf-9999
+2007161939 metadata/md5-cache/dev-ros/move_base_msgs-1.14.0
+2007161939 metadata/md5-cache/dev-ros/move_base_msgs-9999
+2007161939 metadata/md5-cache/dev-ros/moveit_msgs-0.10.1
+2007161939 metadata/md5-cache/dev-ros/moveit_msgs-9999
+2007161609 metadata/md5-cache/dev-ros/nmea_msgs-1.1.0
+2007161609 metadata/md5-cache/dev-ros/nmea_msgs-9999
+2007161609 metadata/md5-cache/dev-ros/object_recognition_msgs-0.4.1
+2007161609 metadata/md5-cache/dev-ros/object_recognition_msgs-9999
+2007161939 metadata/md5-cache/dev-ros/octomap_msgs-0.3.5
+2007161939 metadata/md5-cache/dev-ros/octomap_msgs-9999
+2007161609 metadata/md5-cache/dev-ros/octomap_ros-0.4.1
+2007161609 metadata/md5-cache/dev-ros/octomap_ros-9999
+2007161939 metadata/md5-cache/dev-ros/opencv_apps-2.0.1
+2007161939 metadata/md5-cache/dev-ros/opencv_apps-9999
+2007161609 metadata/md5-cache/dev-ros/opencv_tests-1.15.0
+2007161609 metadata/md5-cache/dev-ros/opencv_tests-9999
+2007161609 metadata/md5-cache/dev-ros/openni2_camera-1.4.2
+2007161609 metadata/md5-cache/dev-ros/openni2_camera-9999
+2007161609 metadata/md5-cache/dev-ros/openni2_launch-1.4.2
+2007161609 metadata/md5-cache/dev-ros/openni2_launch-9999
+2007161609 metadata/md5-cache/dev-ros/openslam_gmapping-0.2.1
+2007161609 metadata/md5-cache/dev-ros/openslam_gmapping-9999
+2007161609 metadata/md5-cache/dev-ros/pcl_conversions-1.7.1
+2007161609 metadata/md5-cache/dev-ros/pcl_conversions-9999
+2007161939 metadata/md5-cache/dev-ros/pcl_msgs-0.3.0
+2007161939 metadata/md5-cache/dev-ros/pcl_msgs-9999
+2007161609 metadata/md5-cache/dev-ros/pcl_ros-1.7.1
+2007161609 metadata/md5-cache/dev-ros/pcl_ros-9999
+2007161609 metadata/md5-cache/dev-ros/pluginlib-1.13.0
+2007161609 metadata/md5-cache/dev-ros/pluginlib-9999
+2007161609 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-1.4.1
+2007161609 metadata/md5-cache/dev-ros/pointcloud_to_laserscan-9999
+2007161609 metadata/md5-cache/dev-ros/polled_camera-1.12.0
+2007161609 metadata/md5-cache/dev-ros/polled_camera-9999
+2007161609 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.12.4
+2007161609 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-9999
+2007161609 metadata/md5-cache/dev-ros/pr2_description-1.12.4
+2007161609 metadata/md5-cache/dev-ros/pr2_description-9999
+2007161609 metadata/md5-cache/dev-ros/pr2_machine-1.12.4
+2007161609 metadata/md5-cache/dev-ros/pr2_machine-9999
+2007161609 metadata/md5-cache/dev-ros/pr2_msgs-1.12.4
+2007161609 metadata/md5-cache/dev-ros/pr2_msgs-9999
+2007161609 metadata/md5-cache/dev-ros/python_qt_binding-0.4.3
+2007161609 metadata/md5-cache/dev-ros/python_qt_binding-9999
+2007161609 metadata/md5-cache/dev-ros/rviz-1.14.1
+2007161609 metadata/md5-cache/dev-ros/rviz-9999
 2006141358 metadata/md5-cache/dev-ruby/facter-3.14.10
 2006141358 metadata/md5-cache/dev-ruby/facter-3.14.9
 2006141358 metadata/md5-cache/dev-ruby/mecab-ruby-0.996-r1
@@ -47544,7 +47387,6 @@
 2007062109 metadata/md5-cache/dev-ruby/jwt-1.5.6
 2007062109 metadata/md5-cache/dev-ruby/jwt-2.1.0
 2007062109 metadata/md5-cache/dev-ruby/jwt-2.2.0
-2007062109 metadata/md5-cache/dev-ruby/jwt-2.2.1
 2007062109 metadata/md5-cache/dev-ruby/kirbybase-2.6.1-r2
 2007062109 metadata/md5-cache/dev-ruby/kissfft-0.0.2
 2007062109 metadata/md5-cache/dev-ruby/kpeg-1.1.0-r1
@@ -47714,7 +47556,6 @@
 2007062109 metadata/md5-cache/dev-ruby/oauth2-1.4.3
 2007062109 metadata/md5-cache/dev-ruby/octokit-4.17.0
 2007062109 metadata/md5-cache/dev-ruby/octokit-4.18.0
-2007062109 metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
 2007062109 metadata/md5-cache/dev-ruby/omniauth-1.9.0
 2007062109 metadata/md5-cache/dev-ruby/omniauth-1.9.1
 2007062109 metadata/md5-cache/dev-ruby/open4-1.3.4
@@ -48341,8 +48182,10 @@
 2007142009 metadata/md5-cache/dev-ruby/shoulda-matchers-4.3.0-r1
 2007141739 metadata/md5-cache/dev-ruby/sys-uname-1.2.1
 2007150639 metadata/md5-cache/dev-ruby/zeitwerk-2.4.0
-2007152309 metadata/md5-cache/dev-ruby/Manifest.gz
 2007152309 metadata/md5-cache/dev-ruby/puppetdb-termini-6.11.2
+2007170409 metadata/md5-cache/dev-ruby/Manifest.gz
+2007170409 metadata/md5-cache/dev-ruby/jwt-2.2.1
+2007170409 metadata/md5-cache/dev-ruby/octokit-4.18.0-r1
 1807201639 metadata/md5-cache/dev-scheme/gauche-gl-0.6
 1807201639 metadata/md5-cache/dev-scheme/gauche-mecab-1.0.2
 1802122238 metadata/md5-cache/dev-scheme/goosh-1.3-r1
@@ -49302,7 +49145,6 @@
 2007062109 metadata/md5-cache/dev-util/cucumber-tag_expressions-1.1.1
 2007071639 metadata/md5-cache/dev-util/clion-2020.1.2
 2007091139 metadata/md5-cache/dev-util/debhelper-13.2
-2007082009 metadata/md5-cache/dev-util/idea-community-2020.1.3.201.8538.31
 2007100139 metadata/md5-cache/dev-util/objconv-2.51
 2007092039 metadata/md5-cache/dev-util/shellcheck-bin-0.7.1
 2007111239 metadata/md5-cache/dev-util/aruba-0.6.2-r2
@@ -49349,7 +49191,6 @@
 2007151039 metadata/md5-cache/dev-util/pycharm-professional-2020.1
 2007151039 metadata/md5-cache/dev-util/pycharm-professional-2020.1.1
 2007151039 metadata/md5-cache/dev-util/pycharm-professional-2020.1.3
-2007160809 metadata/md5-cache/dev-util/Manifest.gz
 2007152209 metadata/md5-cache/dev-util/bcc-0.13.0
 2007152209 metadata/md5-cache/dev-util/bcc-0.14.0
 2007152209 metadata/md5-cache/dev-util/bcc-0.15.0
@@ -49378,10 +49219,13 @@
 2007152209 metadata/md5-cache/dev-util/perf-5.6.14
 2007152209 metadata/md5-cache/dev-util/perf-5.7
 2007152209 metadata/md5-cache/dev-util/perf-5.7-r1
-2007160739 metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
 2007152209 metadata/md5-cache/dev-util/spirv-llvm-translator-10.0.0
 2007152209 metadata/md5-cache/dev-util/spirv-llvm-translator-8.0.1.3
 2007152209 metadata/md5-cache/dev-util/spirv-llvm-translator-9.0.1.1
+2007170409 metadata/md5-cache/dev-util/Manifest.gz
+2007161809 metadata/md5-cache/dev-util/conan-1.26.1
+2007170409 metadata/md5-cache/dev-util/idea-community-2020.1.3.201.8538.31
+2007161609 metadata/md5-cache/dev-util/pkgcheck-0.7.6-r1
 1910111911 metadata/md5-cache/dev-vcs/colorcvs-1.4-r2
 1902111809 metadata/md5-cache/dev-vcs/cvs2cl-2.71-r1
 1809152309 metadata/md5-cache/dev-vcs/cvsutils-0.2.5-r1
@@ -50500,8 +50344,9 @@
 2007130039 metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.36.1
 2007130039 metadata/md5-cache/gnome-base/nautilus-3.36.3
 2007131639 metadata/md5-cache/gnome-base/gdm-3.36.2
-2007151039 metadata/md5-cache/gnome-base/Manifest.gz
 2007151039 metadata/md5-cache/gnome-base/gnome-shell-3.36.4-r1
+2007162039 metadata/md5-cache/gnome-base/Manifest.gz
+2007162039 metadata/md5-cache/gnome-base/gnome-shell-3.36.4-r2
 2003261841 metadata/md5-cache/gnome-extra/gnome-utils-3.8.0
 2004032241 metadata/md5-cache/gnome-extra/polkit-gnome-0.105-r2
 2004202139 metadata/md5-cache/gnome-extra/gnome-shell-frippery-3.34.2
@@ -50687,7 +50532,6 @@
 2006141358 metadata/md5-cache/gnustep-libs/sqlclient-1.8.1-r1
 2006141358 metadata/md5-cache/gui-apps/nm-tray-0.4.3
 2007030209 metadata/md5-cache/gui-apps/tuigreet-0_pre20200702
-2007050309 metadata/md5-cache/gui-apps/Manifest.gz
 2007050309 metadata/md5-cache/gui-apps/grim-1.2.0
 2007050309 metadata/md5-cache/gui-apps/grim-9999
 2007050309 metadata/md5-cache/gui-apps/gtkgreet-0.6
@@ -50699,7 +50543,6 @@
 2007050309 metadata/md5-cache/gui-apps/mako-1.4.1
 2007050309 metadata/md5-cache/gui-apps/mako-9999
 2007050309 metadata/md5-cache/gui-apps/slurp-1.2.0
-2007050309 metadata/md5-cache/gui-apps/slurp-9999
 2007050309 metadata/md5-cache/gui-apps/swaybg-1.0
 2007050309 metadata/md5-cache/gui-apps/swaybg-9999
 2007050309 metadata/md5-cache/gui-apps/swayidle-1.6
@@ -50719,6 +50562,9 @@
 2007050309 metadata/md5-cache/gui-apps/wl-clipboard-1.0.0
 2007050309 metadata/md5-cache/gui-apps/wl-clipboard-2.0.0
 2007050309 metadata/md5-cache/gui-apps/wl-clipboard-9999
+2007161809 metadata/md5-cache/gui-apps/Manifest.gz
+2007161809 metadata/md5-cache/gui-apps/grim-1.3.0
+2007161809 metadata/md5-cache/gui-apps/slurp-9999
 2006141358 metadata/md5-cache/gui-libs/amtk-5.0.2
 2006141358 metadata/md5-cache/gui-libs/libwpe-1.4.0.1
 2006141358 metadata/md5-cache/gui-libs/tepl-4.2.1
@@ -50729,18 +50575,19 @@
 2007050309 metadata/md5-cache/gui-libs/wf-config-9999
 2007050309 metadata/md5-cache/gui-libs/wlroots-0.10.0
 2007050309 metadata/md5-cache/gui-libs/wlroots-0.10.1
-2007050309 metadata/md5-cache/gui-libs/wlroots-9999
-2007091609 metadata/md5-cache/gui-libs/Manifest.gz
 2007091609 metadata/md5-cache/gui-libs/gtk-layer-shell-0.1.0-r1
 2007072309 metadata/md5-cache/gui-libs/xdg-desktop-portal-wlr-9999
+2007161809 metadata/md5-cache/gui-libs/Manifest.gz
+2007161809 metadata/md5-cache/gui-libs/wlroots-0.11.0
+2007161809 metadata/md5-cache/gui-libs/wlroots-9999
 2006060509 metadata/md5-cache/gui-wm/hikari-1.2.0
 2006290139 metadata/md5-cache/gui-wm/hikari-2.0.2
-2007050309 metadata/md5-cache/gui-wm/Manifest.gz
 2007050309 metadata/md5-cache/gui-wm/sway-1.4-r2
-2007050309 metadata/md5-cache/gui-wm/sway-1.5_rc1
-2007050309 metadata/md5-cache/gui-wm/sway-9999
 2007050309 metadata/md5-cache/gui-wm/wayfire-0.4.0-r2
 2007050309 metadata/md5-cache/gui-wm/wayfire-9999
+2007161809 metadata/md5-cache/gui-wm/Manifest.gz
+2007161809 metadata/md5-cache/gui-wm/sway-1.5
+2007161809 metadata/md5-cache/gui-wm/sway-9999
 2006141358 metadata/md5-cache/java-virtuals/Manifest.gz
 2006141358 metadata/md5-cache/java-virtuals/ejb-api-0
 2006141358 metadata/md5-cache/java-virtuals/interceptor-api-0
@@ -52200,7 +52047,6 @@
 2006141358 metadata/md5-cache/media-gfx/feh-3.4
 2006141358 metadata/md5-cache/media-gfx/fim-0.5_rc3
 2006141358 metadata/md5-cache/media-gfx/flam3-3.1.1
-2006141358 metadata/md5-cache/media-gfx/flameshot-0.6.0
 2006141358 metadata/md5-cache/media-gfx/fondu-20060102-r1
 2006141358 metadata/md5-cache/media-gfx/fotowall-1.0
 2006141358 metadata/md5-cache/media-gfx/fotoxx-15.05
@@ -52233,7 +52079,6 @@
 2006141358 metadata/md5-cache/media-gfx/imv-4.0.1-r2
 2006141358 metadata/md5-cache/media-gfx/imv-4.1.0-r1
 2006141358 metadata/md5-cache/media-gfx/iscan-2.30.4.2
-2006141358 metadata/md5-cache/media-gfx/iscan-3.62.0
 2006141358 metadata/md5-cache/media-gfx/iscan-data-1.39.0.1
 2006141358 metadata/md5-cache/media-gfx/iscan-plugin-esdip-1.0.0.5-r1
 2006141358 metadata/md5-cache/media-gfx/iscan-plugin-gt-f500-1.0.0.1-r1
@@ -52349,7 +52194,6 @@
 2006222139 metadata/md5-cache/media-gfx/meshlab-2016.12-r4
 2006222339 metadata/md5-cache/media-gfx/monica-3.7
 2006211839 metadata/md5-cache/media-gfx/pngquant-2.12.6
-2006241739 metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
 2006270039 metadata/md5-cache/media-gfx/darktable-3.0.2-r1
 2006262339 metadata/md5-cache/media-gfx/iscan-plugin-network-nt-1.1.3
 2006262339 metadata/md5-cache/media-gfx/pqiv-2.11
@@ -52392,7 +52236,6 @@
 2007050309 metadata/md5-cache/media-gfx/frogr-1.5
 2007041046 metadata/md5-cache/media-gfx/geeqie-9999
 2007041046 metadata/md5-cache/media-gfx/gimp-2.10.14-r1
-2007041046 metadata/md5-cache/media-gfx/gimp-2.10.18-r1
 2007051139 metadata/md5-cache/media-gfx/gimp-2.10.20
 2007041046 metadata/md5-cache/media-gfx/gimp-2.8.22-r2
 2007041046 metadata/md5-cache/media-gfx/gimp-2.9.8-r1
@@ -52413,7 +52256,6 @@
 2007041046 metadata/md5-cache/media-gfx/img2pdf-0.3.6
 2007041046 metadata/md5-cache/media-gfx/imv-9999
 2007041046 metadata/md5-cache/media-gfx/inkscape-9999
-2007041739 metadata/md5-cache/media-gfx/jhead-3.04
 2007041046 metadata/md5-cache/media-gfx/krita-4.2.9
 2007041046 metadata/md5-cache/media-gfx/krita-4.3.0
 2007041046 metadata/md5-cache/media-gfx/librecad-9999
@@ -52460,7 +52302,12 @@
 2007141639 metadata/md5-cache/media-gfx/inkscape-1.0-r1
 2007141639 metadata/md5-cache/media-gfx/scour-0.37
 2007151009 metadata/md5-cache/media-gfx/exiv2-0.27.3
-2007160439 metadata/md5-cache/media-gfx/Manifest.gz
+2007170639 metadata/md5-cache/media-gfx/Manifest.gz
+2007161609 metadata/md5-cache/media-gfx/flameshot-0.6.0
+2007170339 metadata/md5-cache/media-gfx/gimp-2.10.18-r1
+2007161809 metadata/md5-cache/media-gfx/iscan-3.62.0
+2007170639 metadata/md5-cache/media-gfx/jhead-3.04
+2007170339 metadata/md5-cache/media-gfx/mypaint-brushes-1.3.0-r1
 1802221208 metadata/md5-cache/media-libs/blib-1.1.7-r2
 1806121239 metadata/md5-cache/media-libs/elles_icc_profiles-20160501.0932-r1
 1805290208 metadata/md5-cache/media-libs/lastfmlib-0.4.0
@@ -52525,7 +52372,6 @@
 2006141358 metadata/md5-cache/media-libs/avidemux-core-2.7.3-r1
 2006141358 metadata/md5-cache/media-libs/avidemux-core-2.7.4-r1
 2006141358 metadata/md5-cache/media-libs/bcg729-1.0.4
-2006141358 metadata/md5-cache/media-libs/bcg729-1.0.4-r1
 2006141358 metadata/md5-cache/media-libs/bio2jack-0.9-r2
 2006141358 metadata/md5-cache/media-libs/cal3d-0.11.0-r1
 2006141358 metadata/md5-cache/media-libs/clutter-1.26.4
@@ -52584,7 +52430,6 @@
 2006141358 metadata/md5-cache/media-libs/liblastfm-1.1.0_pre20150206
 2006141358 metadata/md5-cache/media-libs/libldac-2.0.2-r1
 2006141358 metadata/md5-cache/media-libs/liblo-0.30
-2006141358 metadata/md5-cache/media-libs/liblo-0.31
 2006141358 metadata/md5-cache/media-libs/liblqr-0.4.2-r1
 2006141358 metadata/md5-cache/media-libs/liblrdf-0.6.1
 2006141358 metadata/md5-cache/media-libs/liblscp-9999
@@ -53111,7 +52956,6 @@
 2007121309 metadata/md5-cache/media-libs/libprojectm-2.1.0-r2
 2007150009 metadata/md5-cache/media-libs/gexiv2-0.12.0-r1
 2007151539 metadata/md5-cache/media-libs/lv2-1.18.0
-2007160439 metadata/md5-cache/media-libs/Manifest.gz
 2007160439 metadata/md5-cache/media-libs/libharu-2.3.0-r2
 2007152209 metadata/md5-cache/media-libs/mesa-20.0.8
 2007152209 metadata/md5-cache/media-libs/mesa-20.1.1
@@ -53121,6 +52965,9 @@
 2007152339 metadata/md5-cache/media-libs/openh264-2.1.1
 2007152209 metadata/md5-cache/media-libs/osl-1.10.10
 2007152209 metadata/md5-cache/media-libs/osl-1.10.5
+2007162109 metadata/md5-cache/media-libs/Manifest.gz
+2007162109 metadata/md5-cache/media-libs/bcg729-1.0.4-r1
+2007161609 metadata/md5-cache/media-libs/liblo-0.31
 1702282326 metadata/md5-cache/media-plugins/gimp-lqr-0.7.2
 1908120039 metadata/md5-cache/media-plugins/hexter-1.1.0
 1911121409 metadata/md5-cache/media-plugins/ladspa-bs2b-0.9.1-r1
@@ -54514,16 +54361,16 @@
 2007041046 metadata/md5-cache/media-video/yle-dl-20200419
 2007041046 metadata/md5-cache/media-video/yle-dl-20200628
 2007061209 metadata/md5-cache/media-video/smplayer-20.6.0
-2007091539 metadata/md5-cache/media-video/ffmpeg-4.2.4
 2007091209 metadata/md5-cache/media-video/gaupol-1.8-r1
 2007090009 metadata/md5-cache/media-video/subliminal-2.1.0
 2007121139 metadata/md5-cache/media-video/ffmpeg-4.3-r1
 2007131109 metadata/md5-cache/media-video/libva-utils-2.8.0
 2007131539 metadata/md5-cache/media-video/shotcut-20.06.28
-2007140139 metadata/md5-cache/media-video/Manifest.gz
 2007132309 metadata/md5-cache/media-video/obs-v4l2sink-0.1.0_p20181012-r2
 2007140139 metadata/md5-cache/media-video/rav1e-0.3.3
 2007140139 metadata/md5-cache/media-video/rav1e-9999
+2007170639 metadata/md5-cache/media-video/Manifest.gz
+2007170639 metadata/md5-cache/media-video/ffmpeg-4.2.4
 1910070809 metadata/md5-cache/net-analyzer/arptools-1.0.2
 1906051110 metadata/md5-cache/net-analyzer/authforce-0.9.9-r2
 1702282328 metadata/md5-cache/net-analyzer/calamaris-2.99.4.0
@@ -55000,11 +54847,6 @@
 2007041046 metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre1-r1
 2007041046 metadata/md5-cache/net-analyzer/net-snmp-5.8.1_pre2
 2007041046 metadata/md5-cache/net-analyzer/net-snmp-99999999
-2007041046 metadata/md5-cache/net-analyzer/netdata-1.21.1-r1
-2007041046 metadata/md5-cache/net-analyzer/netdata-1.22.0-r1
-2007041046 metadata/md5-cache/net-analyzer/netdata-1.22.1-r1
-2007041046 metadata/md5-cache/net-analyzer/netdata-1.23.0
-2007041046 metadata/md5-cache/net-analyzer/netdata-1.23.1
 2007041046 metadata/md5-cache/net-analyzer/netdata-9999
 2007041046 metadata/md5-cache/net-analyzer/netselect-9999
 2007041046 metadata/md5-cache/net-analyzer/nmap-9999
@@ -55061,8 +54903,9 @@
 2007151209 metadata/md5-cache/net-analyzer/cacti-spine-1.2.13
 2007151139 metadata/md5-cache/net-analyzer/gvmd-9.0.1
 2007151009 metadata/md5-cache/net-analyzer/tracebox-0.4.4
-2007152109 metadata/md5-cache/net-analyzer/Manifest.gz
 2007152109 metadata/md5-cache/net-analyzer/snallygaster-0.0.8
+2007161609 metadata/md5-cache/net-analyzer/Manifest.gz
+2007161609 metadata/md5-cache/net-analyzer/netdata-1.23.2
 1704281609 metadata/md5-cache/net-dialup/dial-1.2-r2
 2002112051 metadata/md5-cache/net-dialup/wvdial-1.61
 2004032241 metadata/md5-cache/net-dialup/ppp-scripts-0
@@ -55203,9 +55046,9 @@
 2007041046 metadata/md5-cache/net-dns/unbound-1.10.1
 2007041046 metadata/md5-cache/net-dns/unbound-1.10.1-r1
 2007121909 metadata/md5-cache/net-dns/bind-9.16.4
-2007142009 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.44
-2007151139 metadata/md5-cache/net-dns/Manifest.gz
 2007151139 metadata/md5-cache/net-dns/nsd-4.3.2
+2007170339 metadata/md5-cache/net-dns/Manifest.gz
+2007170339 metadata/md5-cache/net-dns/dnscrypt-proxy-2.0.44
 1902190039 metadata/md5-cache/net-firewall/ipkungfu-0.6.1-r1
 2001260341 metadata/md5-cache/net-firewall/lutelwall-0.99-r1
 2006141358 metadata/md5-cache/net-firewall/arno-iptables-firewall-2.0.3
@@ -55308,12 +55151,12 @@
 2007041046 metadata/md5-cache/net-fs/samba-4.11.8
 2007041046 metadata/md5-cache/net-fs/samba-4.11.9-r1
 2007041046 metadata/md5-cache/net-fs/samba-4.12.3-r1
-2007041046 metadata/md5-cache/net-fs/samba-4.12.4
 2007050309 metadata/md5-cache/net-fs/sshfs-3.7.0
 2007091209 metadata/md5-cache/net-fs/nfs-utils-2.4.3
 2007111909 metadata/md5-cache/net-fs/mc-2020.07.11.05.18.52
-2007121709 metadata/md5-cache/net-fs/Manifest.gz
-2007121709 metadata/md5-cache/net-fs/samba-4.11.11
+2007170639 metadata/md5-cache/net-fs/Manifest.gz
+2007170639 metadata/md5-cache/net-fs/samba-4.11.11
+2007161609 metadata/md5-cache/net-fs/samba-4.12.4
 1910111911 metadata/md5-cache/net-ftp/cmdftp-0.9.8
 1912111539 metadata/md5-cache/net-ftp/tnftp-20141104
 1912111539 metadata/md5-cache/net-ftp/tnftp-20151004
@@ -55650,7 +55493,6 @@
 2006141358 metadata/md5-cache/net-libs/libosmocore-0.10.2
 2006141358 metadata/md5-cache/net-libs/libosmocore-0.8.0
 2006141358 metadata/md5-cache/net-libs/libpcapnav-0.8
-2006141358 metadata/md5-cache/net-libs/libpri-1.6.0
 2006141358 metadata/md5-cache/net-libs/libprotoident-2.0.12
 2006141358 metadata/md5-cache/net-libs/libprotoident-2.0.14_p1
 2006141358 metadata/md5-cache/net-libs/libqmi-1.12.6
@@ -55708,11 +55550,9 @@
 2006141358 metadata/md5-cache/net-libs/onion-0.8
 2006141358 metadata/md5-cache/net-libs/openmq-cclient-4.4.1
 2006141358 metadata/md5-cache/net-libs/ortp-0.23.0-r1
-2006141358 metadata/md5-cache/net-libs/osptoolkit-4.13.0
 2006141358 metadata/md5-cache/net-libs/phodav-2.2
 2006141358 metadata/md5-cache/net-libs/pjproject-2.7.1-r1
 2006141358 metadata/md5-cache/net-libs/pjproject-2.7.2-r2
-2006141358 metadata/md5-cache/net-libs/pjproject-2.9-r2
 2006141358 metadata/md5-cache/net-libs/qxmpp-1.2.0
 2006141358 metadata/md5-cache/net-libs/rabbitmq-c-0.10.0
 2006141358 metadata/md5-cache/net-libs/rpcsvc-proto-1.4.1-r1
@@ -55800,7 +55640,6 @@
 2007051709 metadata/md5-cache/net-libs/libbtbb-2018.12.1
 2007041046 metadata/md5-cache/net-libs/libbtbb-9999
 2007041046 metadata/md5-cache/net-libs/libcapi-3.0.7-r1
-2007041046 metadata/md5-cache/net-libs/libcrafter-9999
 2007041046 metadata/md5-cache/net-libs/libhackrf-9999
 2007041046 metadata/md5-cache/net-libs/libhtp-0.5.33
 2007041046 metadata/md5-cache/net-libs/libiio-9999
@@ -55927,8 +55766,6 @@
 2007091439 metadata/md5-cache/net-libs/kdsoap-1.9.50_pre20200317
 2007091439 metadata/md5-cache/net-libs/kdsoap-ws-discovery-client-0.2_pre20200317
 2007081709 metadata/md5-cache/net-libs/libesmtp-9999
-2007091109 metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
-2007091109 metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
 2007081009 metadata/md5-cache/net-libs/wvstreams-4.6.1_p14-r1
 2007081609 metadata/md5-cache/net-libs/xrootd-5.0.0
 2007081809 metadata/md5-cache/net-libs/xrootd-ceph-5.0.0
@@ -55936,15 +55773,22 @@
 2007102339 metadata/md5-cache/net-libs/libnsl-1.3.0-r1
 2007102209 metadata/md5-cache/net-libs/libtorrent-0.13.8
 2007120339 metadata/md5-cache/net-libs/webkit-gtk-2.28.3
-2007121139 metadata/md5-cache/net-libs/libslirp-4.3.1
 2007141709 metadata/md5-cache/net-libs/libpcap-1.9.1-r3
 2007150009 metadata/md5-cache/net-libs/quiche-0.5.0
-2007150009 metadata/md5-cache/net-libs/quiche-9999
 2007150209 metadata/md5-cache/net-libs/shairplay-0_pre20180824-r1
-2007151639 metadata/md5-cache/net-libs/Manifest.gz
 2007151009 metadata/md5-cache/net-libs/libcrafter-0.3_p20171019
 2007151639 metadata/md5-cache/net-libs/telepathy-qt-0.9.8
 2007151639 metadata/md5-cache/net-libs/telepathy-qt-9999
+2007170509 metadata/md5-cache/net-libs/Manifest.gz
+2007161639 metadata/md5-cache/net-libs/libcrafter-1.0
+2007161639 metadata/md5-cache/net-libs/libcrafter-9999
+2007162109 metadata/md5-cache/net-libs/libpri-1.6.0
+2007170339 metadata/md5-cache/net-libs/libslirp-4.3.1
+2007170509 metadata/md5-cache/net-libs/mbedtls-2.16.7-r1
+2007170509 metadata/md5-cache/net-libs/mbedtls-2.23.0-r1
+2007162109 metadata/md5-cache/net-libs/osptoolkit-4.13.0
+2007162109 metadata/md5-cache/net-libs/pjproject-2.9-r2
+2007170309 metadata/md5-cache/net-libs/quiche-9999
 1904081739 metadata/md5-cache/net-mail/amavis-logwatch-1.51.03-r5
 1702282329 metadata/md5-cache/net-mail/imapsync-1.592-r1
 1804271339 metadata/md5-cache/net-mail/imapsync-1.836
@@ -56186,9 +56030,6 @@
 2004140139 metadata/md5-cache/net-misc/geoipupdate-3.1.0
 2004140139 metadata/md5-cache/net-misc/geoipupdate-3.1.1
 2004211009 metadata/md5-cache/net-misc/keychain-2.8.1
-2005061009 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
-2005061009 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
-2005061009 metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1
 2005311209 metadata/md5-cache/net-misc/ip-sentinel-0.12-r1
 2006062109 metadata/md5-cache/net-misc/bsdwhois-1.43.2.1
 2006141358 metadata/md5-cache/net-misc/adjtimex-1.29-r2
@@ -56234,7 +56075,6 @@
 2006141358 metadata/md5-cache/net-misc/connman-ui-0_p20150622
 2006141358 metadata/md5-cache/net-misc/csync-0.50.0
 2006141358 metadata/md5-cache/net-misc/csync-0.50.0-r1
-2006141358 metadata/md5-cache/net-misc/dahdi-tools-3.1.0
 2006141358 metadata/md5-cache/net-misc/datapipe-1.0-r2
 2006141358 metadata/md5-cache/net-misc/dcetest-2.0
 2006141358 metadata/md5-cache/net-misc/dhcdrop-0.5
@@ -56531,7 +56371,6 @@
 2006262339 metadata/md5-cache/net-misc/lksctp-tools-1.0.17
 2006262339 metadata/md5-cache/net-misc/mcproxy-1.1.1-r1
 2006262339 metadata/md5-cache/net-misc/minidlna-1.2.1-r1
-2006281009 metadata/md5-cache/net-misc/putty-0.74
 2006262339 metadata/md5-cache/net-misc/r8168-8.048.00
 2006262339 metadata/md5-cache/net-misc/r8168-8.048.02
 2006262339 metadata/md5-cache/net-misc/r8168-8.048.03
@@ -56552,9 +56391,7 @@
 2006290109 metadata/md5-cache/net-misc/wakeonlan-0.41-r2
 2006291709 metadata/md5-cache/net-misc/etherdfs-20180203-r1
 2006291739 metadata/md5-cache/net-misc/kea-1.7.9
-2007011009 metadata/md5-cache/net-misc/asterisk-13.33.0
 2007011009 metadata/md5-cache/net-misc/asterisk-13.34.0
-2007011009 metadata/md5-cache/net-misc/asterisk-16.10.0
 2007011009 metadata/md5-cache/net-misc/asterisk-16.11.1
 2007020109 metadata/md5-cache/net-misc/icecast-2.4.4
 2007021039 metadata/md5-cache/net-misc/icaclient-20.04.0.21
@@ -56688,10 +56525,8 @@
 2007041046 metadata/md5-cache/net-misc/youtube-dl-2020.06.16.1
 2007041046 metadata/md5-cache/net-misc/youtube-dl-99999999
 2007041046 metadata/md5-cache/net-misc/youtube-viewer-9999
-2007062109 metadata/md5-cache/net-misc/curl-7.71.1
 2007061209 metadata/md5-cache/net-misc/dropbear-2020.80
 2007061109 metadata/md5-cache/net-misc/rsync-3.2.2
-2007091139 metadata/md5-cache/net-misc/curl-7.71.0
 2007081809 metadata/md5-cache/net-misc/dhcdrop-0.5-r1
 2007100709 metadata/md5-cache/net-misc/exabgp-4.2.7-r3
 2007081609 metadata/md5-cache/net-misc/geomyidae-0.34
@@ -56708,9 +56543,18 @@
 2007142209 metadata/md5-cache/net-misc/cadaver-0.23.3
 2007141609 metadata/md5-cache/net-misc/dropbear-2020.80-r1
 2007151209 metadata/md5-cache/net-misc/networkmanager-1.26.0
-2007152209 metadata/md5-cache/net-misc/Manifest.gz
-2007152109 metadata/md5-cache/net-misc/dahdi-3.1.0-r1
 2007152209 metadata/md5-cache/net-misc/zerotier-1.4.6
+2007170639 metadata/md5-cache/net-misc/Manifest.gz
+2007162109 metadata/md5-cache/net-misc/asterisk-13.33.0
+2007162109 metadata/md5-cache/net-misc/asterisk-16.10.0
+2007162109 metadata/md5-cache/net-misc/asterisk-core-sounds-1.6.1-r1
+2007162109 metadata/md5-cache/net-misc/asterisk-extra-sounds-1.5.2
+2007162109 metadata/md5-cache/net-misc/asterisk-moh-opsound-2.03-r1
+2007170639 metadata/md5-cache/net-misc/curl-7.71.0
+2007170639 metadata/md5-cache/net-misc/curl-7.71.1
+2007162109 metadata/md5-cache/net-misc/dahdi-3.1.0-r1
+2007162109 metadata/md5-cache/net-misc/dahdi-tools-3.1.0
+2007170339 metadata/md5-cache/net-misc/putty-0.74
 1911091712 metadata/md5-cache/net-nds/led-1.111
 1912052009 metadata/md5-cache/net-nds/phpldapadmin-1.2.5
 2002171109 metadata/md5-cache/net-nds/shelldap-1.5.0
@@ -57141,7 +56985,6 @@
 2006221738 metadata/md5-cache/net-wireless/inspectrum-0.2.2
 2006212009 metadata/md5-cache/net-wireless/iw-5.4
 2006222209 metadata/md5-cache/net-wireless/unifi-5.13.29
-2006232108 metadata/md5-cache/net-wireless/unifi-5.14.15
 2006262339 metadata/md5-cache/net-wireless/broadcom-sta-6.30.223.271-r5
 2006262339 metadata/md5-cache/net-wireless/iwd-1.5
 2006262339 metadata/md5-cache/net-wireless/iwd-1.6
@@ -57267,8 +57110,10 @@
 2007061639 metadata/md5-cache/net-wireless/iwd-1.7
 2007061639 metadata/md5-cache/net-wireless/iwd-1.7-r1
 2007092139 metadata/md5-cache/net-wireless/unifi-6.0.3
-2007151009 metadata/md5-cache/net-wireless/Manifest.gz
 2007151009 metadata/md5-cache/net-wireless/wireless-tools-30_pre9-r1
+2007161709 metadata/md5-cache/net-wireless/Manifest.gz
+2007161709 metadata/md5-cache/net-wireless/unifi-5.14.18
+2007161709 metadata/md5-cache/net-wireless/unifi-6.0.4
 1910170740 metadata/md5-cache/perl-core/JSON-PP-2.273.0
 1912110241 metadata/md5-cache/perl-core/CPAN-Meta-2.150.1
 2002110109 metadata/md5-cache/perl-core/Archive-Tar-2.300.0
@@ -57362,7 +57207,6 @@
 2007041046 metadata/md5-cache/ros-meta/geographic_info-0.5.0
 2007041046 metadata/md5-cache/ros-meta/geographic_info-0.5.2
 2007041046 metadata/md5-cache/ros-meta/geographic_info-0.5.3
-2007041046 metadata/md5-cache/ros-meta/geographic_info-9999
 2007041046 metadata/md5-cache/ros-meta/geometry-1.11.7
 2007041046 metadata/md5-cache/ros-meta/geometry-1.11.8
 2007041046 metadata/md5-cache/ros-meta/geometry-1.11.9
@@ -57398,10 +57242,6 @@
 2007041046 metadata/md5-cache/ros-meta/image_transport_plugins-1.9.3
 2007041046 metadata/md5-cache/ros-meta/image_transport_plugins-1.9.5
 2007041046 metadata/md5-cache/ros-meta/image_transport_plugins-9999
-2007041046 metadata/md5-cache/ros-meta/imu_pipeline-0.2.1
-2007041046 metadata/md5-cache/ros-meta/imu_pipeline-0.2.2
-2007041046 metadata/md5-cache/ros-meta/imu_pipeline-0.2.3
-2007041046 metadata/md5-cache/ros-meta/imu_pipeline-9999
 2007041046 metadata/md5-cache/ros-meta/laser_pipeline-1.6.3
 2007041046 metadata/md5-cache/ros-meta/laser_pipeline-9999
 2007041046 metadata/md5-cache/ros-meta/navigation-1.15.1
@@ -57421,17 +57261,6 @@
 2007041046 metadata/md5-cache/ros-meta/perception_pcl-1.7.0
 2007041046 metadata/md5-cache/ros-meta/perception_pcl-1.7.1
 2007041046 metadata/md5-cache/ros-meta/perception_pcl-9999
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.11.10
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.11.11
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.11.13
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.11.14
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.11.9
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.12.0
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.12.1
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.12.2
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.12.3
-2007041046 metadata/md5-cache/ros-meta/pr2_common-1.12.4
-2007041046 metadata/md5-cache/ros-meta/pr2_common-9999
 2007041046 metadata/md5-cache/ros-meta/qt_gui_core-0.3.10
 2007041046 metadata/md5-cache/ros-meta/qt_gui_core-0.3.11
 2007041046 metadata/md5-cache/ros-meta/qt_gui_core-0.3.16
@@ -57552,11 +57381,23 @@
 2007101909 metadata/md5-cache/ros-meta/simulators-9999
 2007101909 metadata/md5-cache/ros-meta/viz-1.5.0
 2007101909 metadata/md5-cache/ros-meta/viz-9999
-2007152009 metadata/md5-cache/ros-meta/Manifest.gz
 2007152009 metadata/md5-cache/ros-meta/qt_gui_core-0.4.1
 2007151839 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.3
 2007151839 metadata/md5-cache/ros-meta/rosbridge_suite-0.11.9
 2007151839 metadata/md5-cache/ros-meta/rosbridge_suite-9999
+2007162039 metadata/md5-cache/ros-meta/Manifest.gz
+2007162039 metadata/md5-cache/ros-meta/audio_common-0.3.6
+2007162039 metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.9.1
+2007162039 metadata/md5-cache/ros-meta/geographic_info-0.5.5
+2007162039 metadata/md5-cache/ros-meta/geographic_info-9999
+2007161939 metadata/md5-cache/ros-meta/hector_slam-0.4.1
+2007161609 metadata/md5-cache/ros-meta/image_common-1.12.0
+2007161939 metadata/md5-cache/ros-meta/imu_pipeline-0.3.0
+2007161939 metadata/md5-cache/ros-meta/imu_pipeline-9999
+2007161939 metadata/md5-cache/ros-meta/mavros-1.2.0
+2007161609 metadata/md5-cache/ros-meta/pr2_common-1.12.4
+2007161609 metadata/md5-cache/ros-meta/pr2_common-9999
+2007161609 metadata/md5-cache/ros-meta/vision_opencv-1.15.0
 1707052239 metadata/md5-cache/sci-astronomy/fitsh-0.9.2
 1702282330 metadata/md5-cache/sci-astronomy/fitspng-0.3.5
 1707301308 metadata/md5-cache/sci-astronomy/idlastro-20161220
@@ -57611,13 +57452,14 @@
 2006150109 metadata/md5-cache/sci-astronomy/kstars-3.4.2
 2006280009 metadata/md5-cache/sci-astronomy/wcslib-5.16
 2006290009 metadata/md5-cache/sci-astronomy/stellarium-0.20.1
-2007041046 metadata/md5-cache/sci-astronomy/Manifest.gz
 2007041046 metadata/md5-cache/sci-astronomy/celestia-9999
 2007041046 metadata/md5-cache/sci-astronomy/idlastro-99999999
 2007041046 metadata/md5-cache/sci-astronomy/pyephem-3.7.6.0-r1
 2007041046 metadata/md5-cache/sci-astronomy/pyephem-3.7.7.1
 2007040239 metadata/md5-cache/sci-astronomy/skycat-3.1.2-r2
 2007040239 metadata/md5-cache/sci-astronomy/skycat-3.1.3
+2007161809 metadata/md5-cache/sci-astronomy/Manifest.gz
+2007161809 metadata/md5-cache/sci-astronomy/stellarium-0.20.2
 1806091739 metadata/md5-cache/sci-biology/aaindex-9.1-r1
 1910170740 metadata/md5-cache/sci-biology/bioperl-db-1.6.9-r1
 1703082208 metadata/md5-cache/sci-biology/biosql-1.0.1-r1
@@ -57785,8 +57627,8 @@
 2007041046 metadata/md5-cache/sci-biology/seqan-9999
 2007041046 metadata/md5-cache/sci-biology/shrimp-2.2.3
 2007041046 metadata/md5-cache/sci-biology/vienna-rna-2.1.8
-2007121539 metadata/md5-cache/sci-biology/Manifest.gz
-2007121539 metadata/md5-cache/sci-biology/clustalw-2.1-r1
+2007170339 metadata/md5-cache/sci-biology/Manifest.gz
+2007170339 metadata/md5-cache/sci-biology/clustalw-2.1-r1
 1812231809 metadata/md5-cache/sci-calculators/datamash-1.4
 1909181309 metadata/md5-cache/sci-calculators/datamash-1.5
 1702282330 metadata/md5-cache/sci-calculators/transcalc-0.14-r2
@@ -58154,7 +57996,8 @@
 2007041046 metadata/md5-cache/sci-geosciences/routino-3.3.2
 2007081739 metadata/md5-cache/sci-geosciences/gpxsee-7.31
 2007090339 metadata/md5-cache/sci-geosciences/mapserver-7.6.0
-2007130239 metadata/md5-cache/sci-geosciences/Manifest.gz
+2007161939 metadata/md5-cache/sci-geosciences/GeographicLib-1.50.1
+2007161939 metadata/md5-cache/sci-geosciences/Manifest.gz
 1702282330 metadata/md5-cache/sci-libs/clashscore-db-3.17
 1702282331 metadata/md5-cache/sci-libs/fetk-1.5
 1706010238 metadata/md5-cache/sci-libs/h5part-1.6.6
@@ -58465,7 +58308,6 @@
 2006222209 metadata/md5-cache/sci-libs/cholmod-3.0.13
 2006222209 metadata/md5-cache/sci-libs/klu-1.3.9
 2006222209 metadata/md5-cache/sci-libs/ldl-2.2.6
-2006211939 metadata/md5-cache/sci-libs/proj-7.0.1
 2006222209 metadata/md5-cache/sci-libs/spqr-2.0.9
 2006222209 metadata/md5-cache/sci-libs/suitesparse-5.4.0
 2006211909 metadata/md5-cache/sci-libs/votca-tools-1.6.1
@@ -58603,9 +58445,10 @@
 2007131509 metadata/md5-cache/sci-libs/fplll-5.3.3
 2007151139 metadata/md5-cache/sci-libs/Shapely-1.7.0
 2007152009 metadata/md5-cache/sci-libs/octomap-1.9.5
-2007160439 metadata/md5-cache/sci-libs/Manifest.gz
 2007160439 metadata/md5-cache/sci-libs/vtk-8.2.0
 2007160439 metadata/md5-cache/sci-libs/xdmf2-1.0_p141226-r4
+2007170609 metadata/md5-cache/sci-libs/Manifest.gz
+2007170609 metadata/md5-cache/sci-libs/proj-7.0.1
 1909120939 metadata/md5-cache/sci-mathematics/alt-ergo-1.30
 1907310209 metadata/md5-cache/sci-mathematics/lpsolve-5.5.2.0
 1912080309 metadata/md5-cache/sci-mathematics/rngstreams-1.0.1
@@ -60251,7 +60094,6 @@
 2007071039 metadata/md5-cache/sys-apps/dtc-9999
 2007061709 metadata/md5-cache/sys-apps/systemd-245.5
 2007080009 metadata/md5-cache/sys-apps/ack-3.4.0
-2007091209 metadata/md5-cache/sys-apps/diffutils-3.7
 2007091209 metadata/md5-cache/sys-apps/edid-decode-0_pre20200422
 2007082309 metadata/md5-cache/sys-apps/help2man-1.47.15
 2007081439 metadata/md5-cache/sys-apps/keyutils-1.6.3
@@ -60279,10 +60121,12 @@
 2007151539 metadata/md5-cache/sys-apps/s6-linux-utils-2.5.1.1
 2007151539 metadata/md5-cache/sys-apps/s6-portable-utils-2.2.2.1
 2007151539 metadata/md5-cache/sys-apps/s6-rc-0.5.1.1
-2007161309 metadata/md5-cache/sys-apps/Manifest.gz
 2007161309 metadata/md5-cache/sys-apps/kbd-2.3.0-r1
 2007161309 metadata/md5-cache/sys-apps/kbd-9999
-2007160739 metadata/md5-cache/sys-apps/pkgcore-0.10.12
+2007161839 metadata/md5-cache/sys-apps/Manifest.gz
+2007161839 metadata/md5-cache/sys-apps/diffutils-3.7
+2007161809 metadata/md5-cache/sys-apps/dstat-0.7.4-r2
+2007161609 metadata/md5-cache/sys-apps/pkgcore-0.10.12
 1802112038 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
 1702282333 metadata/md5-cache/sys-auth/ykclient-2.15
 2001012339 metadata/md5-cache/sys-auth/pam_mount-2.16
@@ -60517,8 +60361,8 @@
 2007041046 metadata/md5-cache/sys-block/zram-init-9999
 2007061209 metadata/md5-cache/sys-block/ms-sys-2.7.0
 2007091209 metadata/md5-cache/sys-block/vblade-24
-2007160739 metadata/md5-cache/sys-block/Manifest.gz
-2007160739 metadata/md5-cache/sys-block/libzbc-5.5.1
+2007170239 metadata/md5-cache/sys-block/Manifest.gz
+2007170239 metadata/md5-cache/sys-block/libzbc-5.5.1
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.1
 1907151840 metadata/md5-cache/sys-boot/bootcreator-1.2
 1911100139 metadata/md5-cache/sys-boot/makebootfat-1.4
@@ -60619,7 +60463,6 @@
 2003191839 metadata/md5-cache/sys-cluster/kube-controller-manager-1.16.8
 2003191839 metadata/md5-cache/sys-cluster/kube-proxy-1.16.8
 2003191839 metadata/md5-cache/sys-cluster/kube-scheduler-1.16.8
-2004161139 metadata/md5-cache/sys-cluster/spark-bin-2.4.5
 2004291509 metadata/md5-cache/sys-cluster/kube-router-0.3.1
 2004291509 metadata/md5-cache/sys-cluster/kube-router-0.4.0
 2005081846 metadata/md5-cache/sys-cluster/c3-4.0.1
@@ -60723,7 +60566,6 @@
 2006141358 metadata/md5-cache/sys-cluster/resource-agents-3.9.6
 2006141358 metadata/md5-cache/sys-cluster/resource-agents-4.0.1
 2006141358 metadata/md5-cache/sys-cluster/slurm-20.02.3.1
-2006141358 metadata/md5-cache/sys-cluster/spark-bin-2.3.1-r1
 2006141358 metadata/md5-cache/sys-cluster/teleport-4.0.10
 2006141358 metadata/md5-cache/sys-cluster/teleport-4.0.9
 2006141358 metadata/md5-cache/sys-cluster/teleport-4.1.1
@@ -60830,9 +60672,10 @@
 2007140009 metadata/md5-cache/sys-cluster/kubernetes-1.17.8-r1
 2007140009 metadata/md5-cache/sys-cluster/kubernetes-1.18.4-r1
 2007140009 metadata/md5-cache/sys-cluster/kubernetes-1.18.5-r1
-2007141909 metadata/md5-cache/sys-cluster/Manifest.gz
 2007141909 metadata/md5-cache/sys-cluster/k9scli-0.21.2
 2007141709 metadata/md5-cache/sys-cluster/rdma-core-30.0-r1
+2007161809 metadata/md5-cache/sys-cluster/Manifest.gz
+2007161809 metadata/md5-cache/sys-cluster/spark-bin-2.4.6
 1910071309 metadata/md5-cache/sys-devel/cons-2.3.0
 1910111911 metadata/md5-cache/sys-devel/llvm-common-8.0.1
 1901180209 metadata/md5-cache/sys-devel/slibtool-0.5.28
@@ -60927,7 +60770,6 @@
 2006211509 metadata/md5-cache/sys-devel/gcc-config-2.3.1
 2006260139 metadata/md5-cache/sys-devel/gnuconfig-20200621
 2006262339 metadata/md5-cache/sys-devel/pmake-1.111.3.3
-2007022009 metadata/md5-cache/sys-devel/binutils-config-5.3.1
 2007041046 metadata/md5-cache/sys-devel/autoconf-9999
 2007041046 metadata/md5-cache/sys-devel/automake-1.10.3-r3
 2007041046 metadata/md5-cache/sys-devel/automake-1.11.6-r3
@@ -60942,7 +60784,6 @@
 2007041046 metadata/md5-cache/sys-devel/automake-9999
 2007041046 metadata/md5-cache/sys-devel/binutils-9999
 2007041046 metadata/md5-cache/sys-devel/binutils-config-9999
-2007041609 metadata/md5-cache/sys-devel/clang-runtime-10.0.0
 2007041046 metadata/md5-cache/sys-devel/clang-runtime-10.0.1.9999
 2007041046 metadata/md5-cache/sys-devel/clang-runtime-10.0.1_rc1
 2007041046 metadata/md5-cache/sys-devel/clang-runtime-10.0.1_rc2
@@ -60965,7 +60806,6 @@
 2007041046 metadata/md5-cache/sys-devel/gnuconfig-99999999
 2007041046 metadata/md5-cache/sys-devel/libtool-9999
 2007041046 metadata/md5-cache/sys-devel/llvm-8.0.1
-2007041609 metadata/md5-cache/sys-devel/llvmgold-10
 2007041046 metadata/md5-cache/sys-devel/parity-9999
 2007041046 metadata/md5-cache/sys-devel/prelink-99999999
 2007041046 metadata/md5-cache/sys-devel/smatch-9999
@@ -61009,15 +60849,11 @@
 2007081139 metadata/md5-cache/sys-devel/clang-runtime-10.0.1_rc4
 2007091809 metadata/md5-cache/sys-devel/gcc-6.5.0-r2
 2007091639 metadata/md5-cache/sys-devel/gcc-7.5.0-r1
-2007091539 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
-2007091539 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
 2007091239 metadata/md5-cache/sys-devel/gettext-0.20.2
 2007082139 metadata/md5-cache/sys-devel/llvm-roc-3.6.0
 2007120409 metadata/md5-cache/sys-devel/gcc-config-2.3
 2007151039 metadata/md5-cache/sys-devel/gcc-6.5.0-r3
-2007161109 metadata/md5-cache/sys-devel/Manifest.gz
 2007152209 metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
-2007152209 metadata/md5-cache/sys-devel/clang-10.0.0
 2007152209 metadata/md5-cache/sys-devel/clang-10.0.1.9999
 2007152209 metadata/md5-cache/sys-devel/clang-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-devel/clang-10.0.1_rc2
@@ -61027,7 +60863,6 @@
 2007152209 metadata/md5-cache/sys-devel/clang-12.0.0.9999
 2007152209 metadata/md5-cache/sys-devel/clang-8.0.1
 2007152209 metadata/md5-cache/sys-devel/clang-9.0.1
-2007152209 metadata/md5-cache/sys-devel/clang-common-10.0.0
 2007152209 metadata/md5-cache/sys-devel/clang-common-10.0.1.9999
 2007152209 metadata/md5-cache/sys-devel/clang-common-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-devel/clang-common-10.0.1_rc2
@@ -61037,7 +60872,6 @@
 2007152209 metadata/md5-cache/sys-devel/clang-common-12.0.0.9999
 2007152209 metadata/md5-cache/sys-devel/clang-common-9.0.1
 2007152209 metadata/md5-cache/sys-devel/clang-runtime-12.0.0.9999
-2007152209 metadata/md5-cache/sys-devel/lld-10.0.0
 2007152209 metadata/md5-cache/sys-devel/lld-10.0.1.9999
 2007152209 metadata/md5-cache/sys-devel/lld-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-devel/lld-10.0.1_rc2
@@ -61047,7 +60881,6 @@
 2007152209 metadata/md5-cache/sys-devel/lld-12.0.0.9999
 2007152209 metadata/md5-cache/sys-devel/lld-8.0.1
 2007152209 metadata/md5-cache/sys-devel/lld-9.0.1
-2007152209 metadata/md5-cache/sys-devel/llvm-10.0.0
 2007152209 metadata/md5-cache/sys-devel/llvm-10.0.1.9999
 2007152209 metadata/md5-cache/sys-devel/llvm-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-devel/llvm-10.0.1_rc2
@@ -61056,7 +60889,6 @@
 2007152209 metadata/md5-cache/sys-devel/llvm-11.0.0.9999
 2007152209 metadata/md5-cache/sys-devel/llvm-12.0.0.9999
 2007152209 metadata/md5-cache/sys-devel/llvm-9.0.1
-2007152209 metadata/md5-cache/sys-devel/llvm-common-10.0.0
 2007152209 metadata/md5-cache/sys-devel/llvm-common-10.0.1.9999
 2007152209 metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-devel/llvm-common-10.0.1_rc2
@@ -61069,6 +60901,17 @@
 2007152209 metadata/md5-cache/sys-devel/sparse-0.6.1
 2007152209 metadata/md5-cache/sys-devel/sparse-0.6.2
 2007152209 metadata/md5-cache/sys-devel/sparse-9999
+2007170609 metadata/md5-cache/sys-devel/Manifest.gz
+2007170609 metadata/md5-cache/sys-devel/binutils-config-5.3.1
+2007162139 metadata/md5-cache/sys-devel/clang-10.0.0
+2007162139 metadata/md5-cache/sys-devel/clang-common-10.0.0
+2007162139 metadata/md5-cache/sys-devel/clang-runtime-10.0.0
+2007170209 metadata/md5-cache/sys-devel/gcc-8.4.0-r1
+2007161639 metadata/md5-cache/sys-devel/gcc-9.3.0-r1
+2007162139 metadata/md5-cache/sys-devel/lld-10.0.0
+2007162139 metadata/md5-cache/sys-devel/llvm-10.0.0
+2007162139 metadata/md5-cache/sys-devel/llvm-common-10.0.0
+2007162139 metadata/md5-cache/sys-devel/llvmgold-10
 2006141358 metadata/md5-cache/sys-fabric/dapl-2.0.40
 2006141358 metadata/md5-cache/sys-fabric/ibacm-1.0.8
 2006141358 metadata/md5-cache/sys-fabric/infiniband-diags-1.6.4
@@ -61575,11 +61418,8 @@
 2007091809 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.51
 2007091809 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.8
 2007091539 metadata/md5-cache/sys-kernel/vanilla-sources-4.14.188
-2007091539 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.132
 2007091539 metadata/md5-cache/sys-kernel/vanilla-sources-4.4.230
 2007091539 metadata/md5-cache/sys-kernel/vanilla-sources-4.9.230
-2007091539 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.51
-2007091539 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.8
 2007110939 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.51
 2007110939 metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.8
 2007110939 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.51
@@ -61590,9 +61430,21 @@
 2007131009 metadata/md5-cache/sys-kernel/git-sources-5.8_rc5
 2007131839 metadata/md5-cache/sys-kernel/bliss-initramfs-8.1.0
 2007140309 metadata/md5-cache/sys-kernel/bliss-initramfs-9.0.0
-2007152309 metadata/md5-cache/sys-kernel/Manifest.gz
 2007152309 metadata/md5-cache/sys-kernel/bliss-kernel-bin-4.14.178
 2007152309 metadata/md5-cache/sys-kernel/bliss-kernel-bin-5.4.51
+2007162209 metadata/md5-cache/sys-kernel/Manifest.gz
+2007162209 metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.52
+2007162209 metadata/md5-cache/sys-kernel/gentoo-kernel-5.7.9
+2007162209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.52
+2007162209 metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.7.9
+2007161609 metadata/md5-cache/sys-kernel/gentoo-sources-4.19.133
+2007161639 metadata/md5-cache/sys-kernel/gentoo-sources-5.4.52
+2007161639 metadata/md5-cache/sys-kernel/gentoo-sources-5.7.9
+2007162209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.52
+2007162209 metadata/md5-cache/sys-kernel/vanilla-kernel-5.7.9
+2007161509 metadata/md5-cache/sys-kernel/vanilla-sources-4.19.133
+2007161509 metadata/md5-cache/sys-kernel/vanilla-sources-5.4.52
+2007161509 metadata/md5-cache/sys-kernel/vanilla-sources-5.7.9
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.6
 1804301209 metadata/md5-cache/sys-libs/fortify-headers-0.7
 1908230439 metadata/md5-cache/sys-libs/freeipmi-1.6.4
@@ -61753,11 +61605,8 @@
 2007062139 metadata/md5-cache/sys-libs/libcap-2.38
 2007091209 metadata/md5-cache/sys-libs/libhx-3.24
 2007071239 metadata/md5-cache/sys-libs/libutempter-1.2.1
-2007121709 metadata/md5-cache/sys-libs/ldb-2.0.12
 2007131239 metadata/md5-cache/sys-libs/libcap-2.39
 2007131939 metadata/md5-cache/sys-libs/libseccomp-2.4.3
-2007161209 metadata/md5-cache/sys-libs/Manifest.gz
-2007152209 metadata/md5-cache/sys-libs/compiler-rt-10.0.0
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-10.0.1.9999
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-10.0.1_rc2
@@ -61767,7 +61616,6 @@
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-12.0.0.9999
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-8.0.1
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-9.0.1
-2007152209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1.9999
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.1_rc2
@@ -61797,7 +61645,6 @@
 2007152209 metadata/md5-cache/sys-libs/libcxxabi-12.0.0.9999
 2007152209 metadata/md5-cache/sys-libs/libcxxabi-8.0.1
 2007152209 metadata/md5-cache/sys-libs/libcxxabi-9.0.1
-2007152209 metadata/md5-cache/sys-libs/libomp-10.0.0
 2007152209 metadata/md5-cache/sys-libs/libomp-10.0.1.9999
 2007152209 metadata/md5-cache/sys-libs/libomp-10.0.1_rc1
 2007152209 metadata/md5-cache/sys-libs/libomp-10.0.1_rc2
@@ -61820,6 +61667,11 @@
 2007152209 metadata/md5-cache/sys-libs/llvm-libunwind-8.0.1
 2007152209 metadata/md5-cache/sys-libs/llvm-libunwind-9.0.1
 2007152209 metadata/md5-cache/sys-libs/tapi-2.0.0
+2007170639 metadata/md5-cache/sys-libs/Manifest.gz
+2007162139 metadata/md5-cache/sys-libs/compiler-rt-10.0.0
+2007162139 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-10.0.0
+2007170639 metadata/md5-cache/sys-libs/ldb-2.0.12
+2007162139 metadata/md5-cache/sys-libs/libomp-10.0.0
 1902071639 metadata/md5-cache/sys-power/acpi-1.7-r1
 1901132309 metadata/md5-cache/sys-power/hibernate-script-2.0-r6
 1907151840 metadata/md5-cache/sys-power/uhubctl-1.8-r1
@@ -62339,7 +62191,6 @@
 2006141358 metadata/md5-cache/www-apps/cgit-1.2.3
 2006141358 metadata/md5-cache/www-apps/cvsweb-3.0.6-r1
 2006141358 metadata/md5-cache/www-apps/dotproject-2.1.7-r1
-2006141358 metadata/md5-cache/www-apps/gitea-1.11.6
 2006141358 metadata/md5-cache/www-apps/gitit-0.12.1.1
 2006141358 metadata/md5-cache/www-apps/gitit-0.12.1.1-r2
 2006141358 metadata/md5-cache/www-apps/gitit-0.12.2
@@ -62379,7 +62230,6 @@
 2007041046 metadata/md5-cache/www-apps/blohg-0.13-r4
 2007041046 metadata/md5-cache/www-apps/blohg-9999
 2007041046 metadata/md5-cache/www-apps/cgit-9999
-2007041046 metadata/md5-cache/www-apps/gitea-9999
 2007041046 metadata/md5-cache/www-apps/icingaweb2-9999
 2007041046 metadata/md5-cache/www-apps/icingaweb2-module-director-9999
 2007041046 metadata/md5-cache/www-apps/icingaweb2-module-graphite-9999
@@ -62435,10 +62285,13 @@
 2007132009 metadata/md5-cache/www-apps/moodle-3.7.7
 2007132009 metadata/md5-cache/www-apps/moodle-3.8.4
 2007132009 metadata/md5-cache/www-apps/moodle-3.9.1
-2007142309 metadata/md5-cache/www-apps/Manifest.gz
 2007142139 metadata/md5-cache/www-apps/chromedriver-bin-83.0.4103.39-r1
 2007142309 metadata/md5-cache/www-apps/chromedriver-bin-84.0.4147.30
 2007142009 metadata/md5-cache/www-apps/roundup-2.0.0_beta0
+2007161809 metadata/md5-cache/www-apps/Manifest.gz
+2007161809 metadata/md5-cache/www-apps/gitea-1.11.8
+2007161809 metadata/md5-cache/www-apps/gitea-1.12.1
+2007161809 metadata/md5-cache/www-apps/gitea-9999
 1703072138 metadata/md5-cache/www-client/fetch-1.0-r3
 2002231739 metadata/md5-cache/www-client/httrack-3.49.2-r2
 2003261841 metadata/md5-cache/www-client/lynx-2.9.0_pre4
@@ -62495,17 +62348,18 @@
 2007091739 metadata/md5-cache/www-client/opera-beta-70.0.3728.21
 2007092039 metadata/md5-cache/www-client/qutebrowser-1.13.0
 2007071239 metadata/md5-cache/www-client/seamonkey-2.53.3
-2007102309 metadata/md5-cache/www-client/chromium-85.0.4183.15
 2007132239 metadata/md5-cache/www-client/google-chrome-beta-84.0.4147.89
-2007132239 metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.15
 2007132009 metadata/md5-cache/www-client/opera-developer-71.0.3749.0
 2007142039 metadata/md5-cache/www-client/chromium-84.0.4147.89
 2007142139 metadata/md5-cache/www-client/google-chrome-84.0.4147.89
 2007151709 metadata/md5-cache/www-client/netsurf-3.10-r2
-2007161309 metadata/md5-cache/www-client/Manifest.gz
 2007152209 metadata/md5-cache/www-client/firefox-68.10.0
 2007152209 metadata/md5-cache/www-client/firefox-78.0.2
 2007161309 metadata/md5-cache/www-client/opera-69.0.3686.77
+2007162109 metadata/md5-cache/www-client/Manifest.gz
+2007162109 metadata/md5-cache/www-client/chromium-85.0.4183.26
+2007162109 metadata/md5-cache/www-client/google-chrome-unstable-85.0.4183.26
+2007161639 metadata/md5-cache/www-client/opera-beta-70.0.3728.46
 1808151104 metadata/md5-cache/www-misc/log-toolkit-0.9.6-r1
 1910071209 metadata/md5-cache/www-misc/profile-sync-daemon-5.75
 1910090839 metadata/md5-cache/www-misc/profile-sync-daemon-6.35
@@ -62554,10 +62408,10 @@
 2007041046 metadata/md5-cache/www-plugins/passff-host-1.2.1
 2007041046 metadata/md5-cache/www-plugins/passff-host-1.2.1-r1
 2007132239 metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.89_beta
-2007132239 metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.15_alpha
-2007142139 metadata/md5-cache/www-plugins/Manifest.gz
 2007141139 metadata/md5-cache/www-plugins/adobe-flash-32.0.0.403
 2007142139 metadata/md5-cache/www-plugins/chrome-binary-plugins-84.0.4147.89
+2007162109 metadata/md5-cache/www-plugins/Manifest.gz
+2007162109 metadata/md5-cache/www-plugins/chrome-binary-plugins-85.0.4183.26_alpha
 1702282335 metadata/md5-cache/www-servers/mongrel2-1.11.0-r1
 1802271938 metadata/md5-cache/www-servers/pshs-0.3.3
 2006041239 metadata/md5-cache/www-servers/spawn-fcgi-1.6.4-r1
@@ -62761,8 +62615,8 @@
 2007041046 metadata/md5-cache/x11-drivers/xf86-video-ati-9999
 2007041046 metadata/md5-cache/x11-drivers/xf86-video-intel-9999
 2007041046 metadata/md5-cache/x11-drivers/xf86-video-qxl-0.1.5
-2007092039 metadata/md5-cache/x11-drivers/Manifest.gz
-2007092039 metadata/md5-cache/x11-drivers/nvidia-drivers-450.57
+2007162009 metadata/md5-cache/x11-drivers/Manifest.gz
+2007162009 metadata/md5-cache/x11-drivers/nvidia-drivers-450.57
 1702282335 metadata/md5-cache/x11-libs/gtk-mac-integration-2.0.5
 1705241709 metadata/md5-cache/x11-libs/liboglappth-1.0.0
 1706300138 metadata/md5-cache/x11-libs/libtinynotify-0.2.1
@@ -63299,7 +63153,6 @@
 2006150109 metadata/md5-cache/x11-misc/kronometer-2.2.3
 2006150209 metadata/md5-cache/x11-misc/qps-2.1.0-r1
 2006150109 metadata/md5-cache/x11-misc/qtfm-6.2.0
-2006151639 metadata/md5-cache/x11-misc/qt5ct-1.0
 2006151809 metadata/md5-cache/x11-misc/shared-mime-info-1.10-r1
 2006182009 metadata/md5-cache/x11-misc/birdtray-1.8.1
 2006181539 metadata/md5-cache/x11-misc/sddm-0.18.1-r1
@@ -63397,13 +63250,14 @@
 2007041046 metadata/md5-cache/x11-misc/xsel-9999
 2007041609 metadata/md5-cache/x11-misc/xvfb-run-1.20.8_p2
 2007041046 metadata/md5-cache/x11-misc/xwallpaper-9999
-2007051709 metadata/md5-cache/x11-misc/zim-0.73.1
 2007060239 metadata/md5-cache/x11-misc/shutter-0.94.3_p20200621
 2007091339 metadata/md5-cache/x11-misc/fbpanel-7.0-r2
 2007101639 metadata/md5-cache/x11-misc/slim-1.3.6-r5
 2007101539 metadata/md5-cache/x11-misc/slock-1.4
 2007121809 metadata/md5-cache/x11-misc/grub2-theme-preview-1.5.1
-2007150039 metadata/md5-cache/x11-misc/Manifest.gz
+2007161739 metadata/md5-cache/x11-misc/Manifest.gz
+2007161639 metadata/md5-cache/x11-misc/qt5ct-1.0
+2007161739 metadata/md5-cache/x11-misc/zim-0.73.1
 1908180209 metadata/md5-cache/x11-plugins/e16-epplets-0.16
 1905230009 metadata/md5-cache/x11-plugins/gkrellm-plugins-2.0
 1803190338 metadata/md5-cache/x11-plugins/pidgin-birthday-reminder-1.7-r1
@@ -64026,8 +63880,10 @@
 2006292139 metadata/md5-cache/xfce-base/xfce4-session-4.14.2
 2006292139 metadata/md5-cache/xfce-base/xfce4-settings-4.14.3
 2007021339 metadata/md5-cache/xfce-base/thunar-4.15.1
-2007131839 metadata/md5-cache/xfce-base/Manifest.gz
 2007131839 metadata/md5-cache/xfce-base/libxfce4ui-4.15.3-r1
+2007170809 metadata/md5-cache/xfce-base/Manifest.gz
+2007170809 metadata/md5-cache/xfce-base/libxfce4util-4.15.2
+2007161509 metadata/md5-cache/xfce-base/xfconf-4.15.0
 1910102139 metadata/md5-cache/xfce-extra/thunar-media-tags-plugin-0.3.0
 1910102139 metadata/md5-cache/xfce-extra/thunar-shares-plugin-0.3.0
 1811152009 metadata/md5-cache/xfce-extra/transd-0_p20120503-r1
@@ -64060,8 +63916,6 @@
 2004082109 metadata/md5-cache/xfce-extra/xfce4-notifyd-0.6.0
 2004192139 metadata/md5-cache/xfce-extra/xfce4-weather-plugin-0.10.1
 2004231409 metadata/md5-cache/xfce-extra/xfce4-power-manager-1.6.6
-2005081846 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
-2006120139 metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
 2006141358 metadata/md5-cache/xfce-extra/eatmonkey-0.1.4-r1
 2006141358 metadata/md5-cache/xfce-extra/multiload-nandhp-0.3-r4
 2006141358 metadata/md5-cache/xfce-extra/thunar-vcs-plugin-0.2.0
@@ -64093,6 +63947,8 @@
 2007041046 metadata/md5-cache/xfce-extra/xfce4-panel-profiles-1.0.10
 2007041609 metadata/md5-cache/xfce-extra/xfce4-places-plugin-1.8.1
 2007041046 metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6-r3
-2007070939 metadata/md5-cache/xfce-extra/Manifest.gz
 2007070939 metadata/md5-cache/xfce-extra/xfce4-time-out-plugin-1.1.1
-2007161309 metadata/md5-cache/Manifest.gz
+2007161739 metadata/md5-cache/xfce-extra/Manifest.gz
+2007161609 metadata/md5-cache/xfce-extra/xfce4-screensaver-0.1.10
+2007161739 metadata/md5-cache/xfce-extra/xfce4-volumed-pulse-0.2.3
+2007170909 metadata/md5-cache/Manifest.gz
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e4518244797e..d2b776e22e11 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Jul 2020 10:30:01 +0000
+Fri, 17 Jul 2020 06:30:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 807301749883..fb103ef87ee9 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f671d917fbb8728607e2af5b57e3506493928b8b 1594893923 2020-07-16T10:05:23+00:00
+31ca5f6a998f5e7641746958923e5e0561b60ff8 1594965387 2020-07-17T05:56:27+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 869afe2f05b4..6de240f0db57 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1594893901 Thu 16 Jul 2020 10:05:01 AM UTC
+1594965901 Fri 17 Jul 2020 06:05:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 516d00e727ad..345ee6956a2c 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 16 Jul 2020 10:08:20 +0000
+Fri, 17 Jul 2020 06:08:26 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index a60c1cd40047..1681a70b2314 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/netdata/Manifest b/net-analyzer/netdata/Manifest
index 46d74bbed3b9..86324005eed2 100644
--- a/net-analyzer/netdata/Manifest
+++ b/net-analyzer/netdata/Manifest
@@ -1,12 +1,4 @@
-DIST netdata-1.21.1.tar.gz 3748090 BLAKE2B 5cc8dd47b768838eecc7c8af35a82548dc5bb16acb0a88c17ee1254f86ca9b63a5108bce9205c000283b817478749d963b69c65e3bdc8e2fadecc9a1826a7f2e SHA512 66d2e0cb977275250fd7b51e5156957a4506ddba586de5fe796459ea241cbbed7013fd4cf9d7acf6666407352fb34e3b962a2d01565a9cb982c89c76b7cd79b9
-DIST netdata-1.22.0.tar.gz 3786121 BLAKE2B ad34bcdb94cf44f8de154bf53b2e4ecbecee43c6cef2e5337c0fa6bd08b0feb41c25ee96e51fc6c54d72909559e5ac822b44153daa71255487bb0713ce6eca1d SHA512 3bf239c3e950195ef7b8b43f1c17f2cc94f9257a4f21665629f7b518cc6fcef3b0837743254efd03323408b39e2afa9533487147fa30c8f015705c391aa543f3
-DIST netdata-1.22.1.tar.gz 3787203 BLAKE2B cb09ade9540d81fac9b30738650206bce263b74445ce76bf3e9c57a7935bd5fed04806b3b3ba6631ad7ed119b93b1f36eb10261a239127e238e4cf09ca2f4e7a SHA512 47a0b6c4c1b3d8ab18cf25725223c72683ed74084f0efd09cddbe293950839315f8fcadb16c2e5fa9a179745f20b08ce8652d4b972465eacc6a1792b4cfc296e
-DIST netdata-1.23.0.tar.gz 3819410 BLAKE2B 33b41bacfdba03e0e8cc15ba6c200f98f4c3304136d57798c32410f04d568a2aaf12aebca87136b420d50d0f508d7ce849793b0c11b78a43c30ffed48a991c2c SHA512 edf333b40889547f454101694cadc7766da11acba96db1351d956634e5e240535f5bd9d029fbe3fce79d80e184bd60cc9649055264baea6279d1e63d2db2335f
-DIST netdata-1.23.1.tar.gz 3819097 BLAKE2B d04b41232248c4216227b759a66c6a4db48d466b44b73b00211b40e3c1512f91df84fd927dbd58bbdec178b3ef126b44e1ce61c213df98a31aebcac6a6831dd5 SHA512 2b4873aaac9a569c29c5de718da816fe2f6f2ee2de44ef82e8771d5fb02bca21257647c357cf0fb9117a86f075a1deefb9fea380c1ea66147eb34713e0722ad2
-EBUILD netdata-1.21.1-r1.ebuild 3370 BLAKE2B 4fd3103e4841a6146365d93a6e5c77b633b7786864c47ca9eba4067197b7c093536b91d8f1ee323ff84ed41a8af6ec952008d5938f0835a5b785081ae9590d3c SHA512 e80fc41089efdaa6cd11cd1131d961ccda8a67a8260a8363312d0fd6fdbc18fa67d6ce7c23d6c89682a9ac2a207f9c5464d5d055ebb4780dfd80eb33706da1c8
-EBUILD netdata-1.22.0-r1.ebuild 3457 BLAKE2B a4ee70e56b2298eea11449b09783f3778c09920ede42149949910c28a5a4ab6a01dc8137bacc4ff72490172db3f5995923b1483dc0f39478ca97f880ec778f02 SHA512 34bc66ca8bc201a24a07b2f2b0258132aecf1109cfe6c2928904e9de5effb978aed53716fec6af79c9c5b6a16879c33cc4be194c181db8de38f6be1ccb719c1b
-EBUILD netdata-1.22.1-r1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
-EBUILD netdata-1.23.0.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
-EBUILD netdata-1.23.1.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
+DIST netdata-1.23.2.tar.gz 3839012 BLAKE2B f0c225307b61a0a3b5d581e6d5e4a90d5f26ad0aae49e32dfd3dc36405e48d2e8f7a088c31a2a19059418f88e362eb9840b6c020f5459a0d0388f10b7c729eb0 SHA512 4a4dc647e0326da4f785444e15e2f74af09428374bfe2db57c44dd2765ce77b2babbd8b52e33e04f49b95937a6ca8691ffa18b51d1717ea927025b70fa7e369f
+EBUILD netdata-1.23.2.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 EBUILD netdata-9999.ebuild 3459 BLAKE2B 51e39961afa8e068776f3316df2f6becf524e0506f4097c8e77d4fbd939f58ea29aa41b47e70b163ad97c660681c47b1322adcb95a5e888cd48afdfcebdc1876 SHA512 091da4e745725d9f4c626bb62e163ae999c822e148d84551225836ee83f50acd7619e5e96dbfcb1ddc765bd4bcf6c0e657c791a0da1f32c4431cd08a6a0a89c1
 MISC metadata.xml 1270 BLAKE2B e2c5bac8fd169d84daf8a6e6cfea30761490cca3d7211a29e29f6cf298a9cd728ddc56075e5a85c8f5ed5467900a2f3fb1e09c40b764c2bb0e02bf1ff8e98108 SHA512 77e4d91d31d9d48b769b13f5c9778e09fc8d64941a145ea0bc1ce3e735eb64e5c89fa36a4314753e7c0871738a7b3e94f6a998a87b9c7b9d1d7aa6e8800cdbdf
diff --git a/net-analyzer/netdata/netdata-1.21.1-r1.ebuild b/net-analyzer/netdata/netdata-1.21.1-r1.ebuild
deleted file mode 100644
index 7d7a959dc6c5..000000000000
--- a/net-analyzer/netdata/netdata-1.21.1-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.22.0-r1.ebuild b/net-analyzer/netdata/netdata-1.22.0-r1.ebuild
deleted file mode 100644
index 16f4f1078275..000000000000
--- a/net-analyzer/netdata/netdata-1.22.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-cloud \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.23.0.ebuild b/net-analyzer/netdata/netdata-1.23.0.ebuild
deleted file mode 100644
index 3b6458e2fb4e..000000000000
--- a/net-analyzer/netdata/netdata-1.23.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-cloud \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.23.1.ebuild b/net-analyzer/netdata/netdata-1.23.1.ebuild
deleted file mode 100644
index 3b6458e2fb4e..000000000000
--- a/net-analyzer/netdata/netdata-1.23.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-
-inherit autotools fcaps linux-info python-single-r1 systemd
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/netdata/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/netdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Linux real time system monitoring, done right!"
-HOMEPAGE="https://github.com/netdata/netdata https://my-netdata.io/"
-
-LICENSE="GPL-3+ MIT BSD"
-SLOT="0"
-IUSE="caps +compression cpu_flags_x86_sse2 cups +dbengine ipmi +jsonc kinesis mongodb mysql nfacct nodejs postgres prometheus +python tor xen"
-REQUIRED_USE="
-	mysql? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	tor? ( python )"
-
-# most unconditional dependencies are for plugins.d/charts.d.plugin:
-RDEPEND="
-	acct-group/netdata
-	acct-user/netdata
-	app-misc/jq
-	>=app-shells/bash-4:0
-	|| (
-		net-analyzer/openbsd-netcat
-		net-analyzer/netcat
-	)
-	net-misc/curl
-	net-misc/wget
-	sys-apps/util-linux
-	virtual/awk
-	caps? ( sys-libs/libcap )
-	cups? ( net-print/cups )
-	dbengine? (
-		app-arch/lz4
-		dev-libs/judy
-		dev-libs/openssl:=
-	)
-	dev-libs/libuv
-	compression? ( sys-libs/zlib )
-	ipmi? ( sys-libs/freeipmi )
-	jsonc? ( dev-libs/json-c:= )
-	kinesis? ( dev-libs/aws-sdk-cpp[kinesis] )
-	mongodb? ( dev-libs/mongo-c-driver )
-	nfacct? (
-		net-firewall/nfacct
-		net-libs/libmnl
-	)
-	nodejs? ( net-libs/nodejs )
-	prometheus? (
-		dev-libs/protobuf:=
-		app-arch/snappy
-	)
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_MULTI_USEDEP}]')
-		mysql? (
-			|| (
-				$(python_gen_cond_dep 'dev-python/mysqlclient[${PYTHON_MULTI_USEDEP}]')
-				$(python_gen_cond_dep 'dev-python/mysql-python[${PYTHON_MULTI_USEDEP}]')
-			)
-		)
-		postgres? ( $(python_gen_cond_dep 'dev-python/psycopg:2[${PYTHON_MULTI_USEDEP}]') )
-		tor? ( $(python_gen_cond_dep 'net-libs/stem[${PYTHON_MULTI_USEDEP}]') )
-	)
-	xen? (
-		app-emulation/xen-tools
-		dev-libs/yajl
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-FILECAPS=(
-	'cap_dac_read_search,cap_sys_ptrace+ep' 'usr/libexec/netdata/plugins.d/apps.plugin'
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# --disable-cloud: https://github.com/netdata/netdata/issues/8961
-	econf \
-		--localstatedir="${EPREFIX}"/var \
-		--with-user=netdata \
-		--disable-cloud \
-		$(use_enable jsonc) \
-		$(use_enable cups plugin-cups) \
-		$(use_enable dbengine) \
-		$(use_enable nfacct plugin-nfacct) \
-		$(use_enable ipmi plugin-freeipmi) \
-		$(use_enable kinesis backend-kinesis) \
-		$(use_enable mongodb backend-mongodb) \
-		$(use_enable prometheus backend-prometheus-remote-write) \
-		$(use_enable xen plugin-xenstat) \
-		$(use_enable cpu_flags_x86_sse2 x86-sse) \
-		$(use_with compression zlib)
-}
-
-src_install() {
-	default
-
-	rm -rf "${D}/var/cache" || die
-
-	keepdir /var/log/netdata
-	fowners -Rc netdata:netdata /var/log/netdata
-	keepdir /var/lib/netdata
-	keepdir /var/lib/netdata/registry
-	fowners -Rc netdata:netdata /var/lib/netdata
-
-	fowners -Rc root:netdata /usr/share/${PN}
-
-	newinitd system/netdata-openrc ${PN}
-	systemd_dounit system/netdata.service
-	insinto /etc/netdata
-	doins system/netdata.conf
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if use xen ; then
-		fcaps 'cap_dac_override' 'usr/libexec/netdata/plugins.d/xenstat.plugin'
-	fi
-}
diff --git a/net-analyzer/netdata/netdata-1.22.1-r1.ebuild b/net-analyzer/netdata/netdata-1.23.2.ebuild
similarity index 100%
rename from net-analyzer/netdata/netdata-1.22.1-r1.ebuild
rename to net-analyzer/netdata/netdata-1.23.2.ebuild
diff --git a/net-analyzer/tracebox/Manifest b/net-analyzer/tracebox/Manifest
index 286ccfa34f8b..1a8d2fe608bd 100644
--- a/net-analyzer/tracebox/Manifest
+++ b/net-analyzer/tracebox/Manifest
@@ -1,5 +1,5 @@
 AUX tracebox-0.2-deps.patch 1119 BLAKE2B dc1a567aec9ec7cf6d66f3b722f1786d5730c5d351ae4fa2c9d03387fd6cb2c5b04229803ea7ed7fdc075692ca04deb4ec6068d65dfd01d73169ac63a0db887b SHA512 ecfffb4fca07597361170681762ea001a403979a96b8681fa144f7dc86c6d3b508d756863f8b2584f4951c1207a23c6babf7457f5f48dce1c400fe87ab5985b3
-AUX tracebox-0.4.4-deps.patch 4991 BLAKE2B 52f9ea560a7206c1a084812ad3b6eca432d3c0257f13cbf43d9a3a067ed0a48b1fc54c7749027f6a3edd79e4846fe042bae09a2f26745e42746049cfd7737252 SHA512 a69fd522a3a199f8d4ae4516aa3e225f7f18c8044354f2ebf7b429ccb4d20b0cf693ff9e021a5efe74c93f906bce20b3755cd3177fd7250a05e1d0b1ec996f8c
+AUX tracebox-0.4.4-deps.patch 5159 BLAKE2B cea5cfb75b407c7e9a88062abc931ae27b7f5022e586ee7f811129ac2b5c5a54a61b6a0ce71961ebf6102d1b53087e91260cfe4d8f6622d78e98e87408c2d64b SHA512 a87ff6ef0079f99241dd975d1fcb1bb3d1c2a0a623af1932d9a00b45b6d70b403e34f8dbc07551cda55707d5eea5e48a7bb7ac931474efe6186937942a769761
 DIST tracebox-0.2.tar.gz 27954 BLAKE2B 57f4e36c727ebbb19161a6b4c887b64fdd362b033e09116f2e602a01737f19f10e6d0378296e70f683a5b8d53a57dae032e67098dd5989bb094daf3a3382a5d5 SHA512 15bfaede7e4828c14efbf7395f3d1c681b672b47157c370f4fe92d5d306ccc8e3e061107c3d36a505d732451d67ea146c21c299e6e826205725ab12680ee773e
 DIST tracebox-0.4.4.tar.gz 76828 BLAKE2B 0c3fbe9ea3fd5a967c85cf7b175900d899885f6c43ca8ffa32ba98256490b5bc23e8f80618208df6ec05f0484e5ce27599528aa5d84e331ac71eca960b6b1fd0 SHA512 2113d6ed4543b0c3a9b44bc92c4eb8ab2a860b4409a5eba374b9960ddb4ba299a33c0dea49595c94bc725eda36633d8bb698236d662ea9cc1027070b597c52f6
 EBUILD tracebox-0.2.ebuild 973 BLAKE2B 8b26b66ed51cb1059a4dcbee1a5cf1167ac5523af0289e538fe9de05e6d042a4765ebf874a557b2659f34461d76e8197a3d1f92a152a9ed384f35739d746a36b SHA512 85a7b38d61154683a1288d9e1e8ef5a271e7840493998a1caa462ce13a3df1327520c3e8dd0be1e4246e4e3d48cca02fee32bc94ceea28dde8a7fff06a3daec1
diff --git a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch b/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
index cb47ad0d2ac2..43c0132a49a7 100644
--- a/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
+++ b/net-analyzer/tracebox/files/tracebox-0.4.4-deps.patch
@@ -9,7 +9,7 @@
  AX_CXX_COMPILE_STDCXX_11
  
  # Checks for header files.
-@@ -32,40 +34,13 @@
+@@ -32,40 +34,14 @@
  AC_FUNC_FORK
  AC_CHECK_FUNCS([gettimeofday memset select socket strtol])
  
@@ -47,17 +47,18 @@
 -        fi
 -    ]
 -)
-+PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found]))
-+PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found]))
-+PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
++PKG_CHECK_MODULES([LUA53], [lua-5.3], [LUA_FOUND=5.3; LUA_INCLUDE="${LUA53_CFLAGS}"; LUA_LIB="${LUA53_LIBS}"],AC_MSG_WARN([lua 5.3 not found]))
++PKG_CHECK_MODULES([LUA52], [lua-5.2], [LUA_FOUND=5.2; LUA_INCLUDE="${LUA52_CFLAGS}"; LUA_LIB="${LUA52_LIBS}"],AC_MSG_WARN([lua 5.2 not found]))
++PKG_CHECK_MODULES([LUA51], [lua5.1], [LUA_FOUND=5.1; LUA_INCLUDE="${LUA51_CFLAGS}"; LUA_LIB="${LUA51_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
++PKG_CHECK_MODULES([LUA], [lua], [LUA_FOUND=5.1-noSLOT; LUA_INCLUDE="${LUA_CFLAGS}"; LUA_LIB="${LUA_LIBS}"],AC_MSG_WARN([lua 5.1 not found]))
 +
-+if test -z "$LUA_INCLUDE" -o -z "$LUA_LIB"; then
++if test -z "$LUA_FOUND"; then
 +     AC_MSG_ERROR([lua 5.3, 5.2 or 5.1 is required])
 +fi
  AC_SUBST(LUA_INCLUDE)
  AC_SUBST(LUA_LIB)
  
-@@ -121,24 +96,12 @@
+@@ -121,24 +97,12 @@
  AC_ARG_WITH(json,
  [  --with-json=DIR      use json-c in DIR],
  [ case "$withval" in
@@ -84,7 +85,7 @@
       AC_SUBST(JSON_INCLUDE)
       AC_SUBST(JSON_LIB)
       AC_DEFINE([HAVE_JSONC], [1], [Using json-c])
-@@ -153,41 +116,7 @@
+@@ -153,41 +117,7 @@
      ]
  )
  
@@ -127,7 +128,7 @@
  AC_SUBST(PCAPINC)
  AC_SUBST(PCAPLIB)
  
-@@ -234,17 +163,7 @@
+@@ -234,17 +164,7 @@
      AC_CHECK_LIB([pthread], [pthread_create])
  ])
  
@@ -146,7 +147,7 @@
  
  # Enable click submodule
  AS_IF([test "x$enable_tests" = "xyes"], [
-@@ -254,7 +173,6 @@
+@@ -254,7 +174,6 @@
  
      AC_CONFIG_COMMANDS_PRE([ac_configure_args="$ac_configure_args_pre"])
      AC_CONFIG_COMMANDS_POST([ac_configure_args="$ac_configure_args_post"])
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index c62a14567dac..3ef6319fa232 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index c11c29c95452..fd1fa8c5abc7 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -11,6 +11,6 @@ DIST dnscrypt-proxy-2.0.44.tar.gz 2279842 BLAKE2B 90f156914dd29ab5baa2eb02ed2992
 EBUILD dnscrypt-proxy-2.0.41.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
 EBUILD dnscrypt-proxy-2.0.42.ebuild 2842 BLAKE2B df98833edc111d3b2ee8304eddbf5ca002ee4f787ad09985f0b8e1f5edb5d2b27ef2f457aaa481198a8c42267e700892a7a910552a4ee7b333726a217768d755 SHA512 db0f3e0abb5cfbc76493c57ec29d6833c360f1a9a929ababc9a95e25c48ccd2a7ded9874177e14d1f078729d58ee23136122034644e6cbebc1485ff5df93b4f9
 EBUILD dnscrypt-proxy-2.0.43.ebuild 2845 BLAKE2B 0ccc6dff79fa94a1d4551a6f96247d19bc2a416297ccd6bdf40d0f6ef82e96d6878f52a78af405f1c936a1d9b6ff77c0f329ca815080a5ddbc35da80f01c8503 SHA512 be46f29a4efdf62a62b6293f1aa2b420ce52c6adeb9dbad219257f2cbfb146a35fa185acd6f4b9af90405565d5bfb2b39f970d12d6921795431bc477174e6df0
-EBUILD dnscrypt-proxy-2.0.44.ebuild 2844 BLAKE2B 42db64c5e0d2534bfc6b39acc2a231072e5bee4385551ddd20e1364f5dca2d43b19480f7ee9faf6e7d054d241100df6ff86076e3e8f937136897dec9e4308ff2 SHA512 045740e4522f53842aa8ac195ee7a6b3f0f50ca4dc972416c785c894882c670e299ab1f47a1f1ab1181a137b448d11cc94db9ef60432afd5414999288da71978
+EBUILD dnscrypt-proxy-2.0.44.ebuild 2843 BLAKE2B 478ec97ffb19400f44196166f0a4a8cb69c4dccc35c7e5d8d78b20542fa11a1d67abf7034020580320693f8fe47102c82dad6272ed597a4bc97fedc6adb75e7c SHA512 68b818c6bb7fa91e04875e6c7e84e554181051c3496bca6d31d5fcd2d6a581a4d5a73b0520809511537030ec7a7668de1e8fc1500ea4bd20297bc928e406471b
 EBUILD dnscrypt-proxy-9999.ebuild 2838 BLAKE2B e163d4d89bd9d66036ea6f454439a55f6b9bbf1fd859b0410c508880c063243a1b2e24f129ab94b06c79a0395d6bfa5705bd0e59169e66c15b6177f36652c3a4 SHA512 8e12277cf798a6aba9dd55ac8f35a9218a13b2ca4b06cf91e3255e6b09ef5be14209559f64574fb4454af455d152227ec7ce981bf4c3cad8fe1d045c99105af5
 MISC metadata.xml 618 BLAKE2B 5289dcd30374f9bedf43f71df91f80ca017c12474e22bcab3f5cd763e80e65174503c7d02bc4313ed927b0cc28dd8531526ce1435f56a929e45ed9c87f5f634a SHA512 78edb67c2f21c0b00eeff5d70298b187b7a0ac41845c10e2524da0d3b3e5127958f62796d53ec79e1d4565d46d7dd8b94e42753451c75f81687bacd0be5d00d5
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
index 08493ba2da8a..fb95b87cdf9a 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.44.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://${EGO_PN}.git"
 else
 	SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="~amd64 arm arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 4d1773aa292f..02ee1b33f779 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index 72ff3683e991..567b6dcd507e 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -11,9 +11,9 @@ DIST samba-4.11.8.tar.gz 18571308 BLAKE2B 024920789ac8fcedfc79f4d094a47e4c1399a0
 DIST samba-4.11.9.tar.gz 18576961 BLAKE2B 584e62df96bd7de6c0ff93f8fb45b85583b048c300cae020e1e1b467e773b4198c215cbef3b9c34ddf2e138118cca1dd7002ab9c671d111606e735ba8595f720 SHA512 77c1e928d23115eed0cc20f5836b02e73a26b0c23b2061c6148177fbf5b140e3d3a7a9fabfee3a2306158bc157708636c58c6655a57a64f0ff9a20c1a91e4f23
 DIST samba-4.12.3.tar.gz 18203604 BLAKE2B 4d95e472fe4dbec259c6efe14db56d38056209f22a1ad98a62f7b8a9efb09c09ef4ff16ac1ee287e5a93cc86cb7472ee7c1d4feb1d0e1bdc4b887b1a7213fdf2 SHA512 5de66c21db0710880b6e0347ae1eff17ff1881eb926e9a0cf5af9ddc27599cf8daa9ca6ea35b2a0a2158226a38cdf7074b28a51e460a139720c78a522b1a5908
 DIST samba-4.12.4.tar.gz 18212485 BLAKE2B 90b356ca989bd4724468da4d5eab4540e00d3ee5cd648295ef9cfca9a0bd79a7f2ee1d3fdc65e697220ad3cec8b0b97819fa8cc4dc0c42147f287b2b8fcd9294 SHA512 d52a76e8896790756810db6a2cebc5c4f67f4172dad9e411493301a9941345d360f720108d2ab49bf4d590a43622b174583bbf0f87d433593c88b26f00753f69
-EBUILD samba-4.11.11.ebuild 9446 BLAKE2B 7b4bfa9d6a3ae52130e0632b7eb54139c13d1f5856ac029c15d5a51225acf6322d6605cff752ee51ee5a6689099729681f5945693c2d3a1c444f964bdb9076d4 SHA512 f91c2f22461d1624e6bd8bc9c7824bb03b05b45bdf2c22ab1a7c44b51349033b98689ec30e6cedd49f91522a3169c7ffb0526e27ff544b4a36f7e4bfe7605b2d
+EBUILD samba-4.11.11.ebuild 9445 BLAKE2B bc759b4cf06dce0b34e29322ac17b8eb457e90ad886e27587dc162c5086e7334859101633d115ac62e13b2042ca8060f85bf2dc9990127e0391fca2e400a583e SHA512 2349949e6e4440ce6e5d595bf4fd4dff1bb82d83adc17586218c489f005fe16bc9866ec22e0683e0da5e837d45c1c6dd45ea97c8030281eda755210176d00cbe
 EBUILD samba-4.11.8.ebuild 9276 BLAKE2B f8d481cf12c33d41c6e95d34e32107b7129965db381759108dca19d1404a096314b08fec95b5bb56b6b217db37b67964ad55f42e6ef2ac709526734b9eea78cd SHA512 436fe7292912e01ef4c83a6ba444ab8737cf981b57d26434cbb65d3692f2090347f6ed8477a10044d107240b9732c22a9a8c5f21af1fe099a170893efb3854ae
 EBUILD samba-4.11.9-r1.ebuild 9450 BLAKE2B bf862dcba7d3d9ad650257825bbb1ac8d8dacf736d150c298f5fa915f57ce0b52141cc48c0fe0463aa3e7bb6cfe3490c415ccaf37e5c4fd4a619bfb629d7ea06 SHA512 1efb645a8107f54c166588e0202b5863f176d97970bb5c4ebdaef10dabc7b5ec424b5e99f7e10111ee8f62151c85d4a6b17323c13f1aa0f330aae0cac4d339d1
 EBUILD samba-4.12.3-r1.ebuild 9436 BLAKE2B b7e75105693152f660aa7d912bb99c56dda131370acc94d003c3f7f007d6b2716f84baaed9af1efb49e8239698b2b254f99b0486efdebb34cd4ab379c82e2ea4 SHA512 ef90ee10eaa5063e51b433884da72d38bd42c3183a3081f6ca4150cfdeff8b2853b2e85d89102ccb3db0b180cd36c3b278cd94e89716208f2c461c835a03b7df
-EBUILD samba-4.12.4.ebuild 9436 BLAKE2B e19873fc892304ed48e10e4b36f3c0c9988243b5fb4d85701cb698964c204b3984e28a11ae3de333452c0b8429e006fb2846087caef723e4132bb9af6fde40bd SHA512 964d3110aa2e28d628343fdfc5cbf10fbded28ec1ff3ff7b804e07a163097b0c50d61046b10ca61129db02a1635abdf2bed446dce9805c300ec0b0097c5c98c6
+EBUILD samba-4.12.4.ebuild 9441 BLAKE2B 114ea83219dd1afbb30b0dd88e4bbaf4dfe23efc39a84085b0782a89291d620ebc7227528aa827f8339fbb6a5fc8d9f05ddcad3ab81e6662f46d70955ece7208 SHA512 f36cad0853339aee01af3dec710110e95b416e8f03632fa910cc53b9763f9649f2d55130f5684ed53e55a25a658bf0b228c00256370cb75691668d0ae447c335
 MISC metadata.xml 1848 BLAKE2B 2ae9d28a0ea8d1b53f4999e23044713b42f0fc829dd2df20c301acefe9d2c9334c97121ed85c50a5d0734cec834652b1f8ec8d0bd5cca30afbecc4730cb4d1a8 SHA512 48ac3deb48a2188836be87c485f1ba988788814aa1b495e89d70eb17f67fa80163132ac788d3bc0d586ba1957b22e4094036186c40af0cfc48aa453490021ec5
diff --git a/net-fs/samba/samba-4.11.11.ebuild b/net-fs/samba/samba-4.11.11.ebuild
index 13a9a1cb101e..8ca8179d827a 100644
--- a/net-fs/samba/samba-4.11.11.ebuild
+++ b/net-fs/samba/samba-4.11.11.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-fs/samba/samba-4.12.4.ebuild b/net-fs/samba/samba-4.12.4.ebuild
index 663417c19979..3baffa9adc3e 100644
--- a/net-fs/samba/samba-4.12.4.ebuild
+++ b/net-fs/samba/samba-4.12.4.ebuild
@@ -15,7 +15,7 @@ SRC_PATH="stable"
 
 SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
 [[ ${PV} = *_rc* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 DESCRIPTION="Samba Suite Version 4"
 HOMEPAGE="https://www.samba.org/"
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 87107b720538..76bb864ed263 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libcrafter/Manifest b/net-libs/libcrafter/Manifest
index 5f60e263d440..890ec8f1ab9a 100644
--- a/net-libs/libcrafter/Manifest
+++ b/net-libs/libcrafter/Manifest
@@ -1,7 +1,9 @@
 AUX libcrafter-0.3_p20171019-libpcap.patch 1679 BLAKE2B a11d50715c98a087b5a858b3a2205fbef50762e1c553887e3e49e10bca39c88e82dff8110288e97eec3614e38cbfc839f1a2ef93de92495f859654b90daed96b SHA512 9d4e2eb90d74511ca9d192e855e72fa691a725af4db273cae9241d6c19b2340882a7e659c8eba62657ade5aa634f32a7aaa2e00a1ca43a2a1cde67c88743f9c2
 DIST libcrafter-0.3.tar.gz 104051 BLAKE2B 6349c260d32ab6f270c05c156dbcf7cf20e85808ce7b8df8747fa9d6e1d413f96c12ff55b3c227952b348f2654cde81b5ca73753da61a9593c3c1699ed96bd7d SHA512 7c396ba942b304dddfaa569adb44697f75568d3ef2ed48dda758e281f3b7c172439309033bbf5498069a4a61a952f93e41af99b129ce874ce76b5ec08da58116
 DIST libcrafter-0.3_p20171019.tar.xz 90152 BLAKE2B 4837a98a45ecdf924a63e916fd2cfdd481624c0cb5b673e0b43eaace328cbcb761ac2d09c50242602730ec2c69ceb8836b7092cbd286c887819db2095ceba749 SHA512 eb53ed641abbce3555f6b7bc3756bc9dc45068bf58320ba0f78dbcefc04cbfe669b12625c81a185fa377bf89e8453b52e0f9bef5c9e1ebfae34bc56eca090438
+DIST libcrafter-1.0.tar.gz 116514 BLAKE2B 6f7adee30b1f7be1bf03fedd39deb53ddc7284934f908ebb056726c31adcaa133405a13c06fa6d35b066992e5ccf24eb971d46a44dcad6932009c1d35fc0c0f7 SHA512 146f34831bf26047be06a0dea406ed0495990fd4256c598b5a4ddea4ab8cc6635dbbe98010cb73ada94ec6bd8be65cdcb3489de7dd9b961711707047f94fb48d
 EBUILD libcrafter-0.3.ebuild 663 BLAKE2B e05dd9b8312201e93436cb91ad135af32143bfa026fe29fe78ec4a2bf6f6c46f11e3beddf2fff850c585a2e52583b852840165390fe6e9d5291a224971cb10b8 SHA512 aeecf9713732f0a28ab57fe8592ba254b45e4fa92239bb6496d834fd6bf90aff672667da01f851698873751949f72eab3729429a7e1ecaafda3c73f8b7df771d
 EBUILD libcrafter-0.3_p20171019.ebuild 680 BLAKE2B 6912dbdf074b622b8deec9a55ebfbbc92a2f54d0153bdda02247f3e28196c7b5ac59333d8a52feaf54ad5b350201613bba481fb54842b87231e884730d445ddb SHA512 663184cfc5ee58d3fd55279bd0ee32ab389c9e29006fb0a605fa98de7f0f1388d12d81091de4833d8e594fef1501819ecb6c6b2be73611383bf7ce576abf9c52
-EBUILD libcrafter-9999.ebuild 642 BLAKE2B faf88eeb20b297e2e835e68df5865dfcc957a09ba7cf1b07995acd72c7b3c6e58c18419659639c75d6f175c320936c6297c664dd6f63f17b803d700399c80d9a SHA512 fe00ffa1ac8a4905d3a71201e5412b74b19e025be2107ce9b5d3aa475d81cb5462504e0fbe58018b518d9796a48082b877b6c012b87294660c098b57e69ba230
+EBUILD libcrafter-1.0.ebuild 786 BLAKE2B 8db66b1266e2ddd24954f0f0f45e7a3b08fcbb1b931411d272da8d248c2f32bd901cd24ee0e8d232357f64af79270f81154a2b580439f656bb0d23d2b05ebebb SHA512 82d315fceac37eb42a91d752939512d632ab5397337b8ed1f48c5c245fc423113dec8cac90e271abb2fd45425eb59dcaa0305ad6e1f7d7ed5d3537d9317f6fcf
+EBUILD libcrafter-9999.ebuild 714 BLAKE2B 76cbdfbeb1b4c767933d94cf485267911ca2cff473d1af72f235eb8bf2306c1a102986a1744932c12acebeebaf75c67a2805550fdf6afaaf2d9b52c095608422 SHA512 6e732a478998c07602e04053cc438fe46bb11c18b5684e442c061940c999366e4061233bc35e5a2e545fa0b40c6fd8b15619f3eb2d08eceae6c1e8a1be852b12
 MISC metadata.xml 1647 BLAKE2B d6ea5e5df1a27925827497df3022b86f82b0fa5c05e8dc87503b836ade2efb04e0e19b07ccf58b512528ba562caff2be6f14e1d56c5ea0f6040419c708287899 SHA512 6e1ee9e3402a26c3981552ff8fd7193f75dae388fb6d1e59739e1cc4e6f027c995cc68b1984fc13d39d56c152fee6b4b6ee82c9c79f6033627b5e9e0261bdc87
diff --git a/net-libs/libcrafter/libcrafter-1.0.ebuild b/net-libs/libcrafter/libcrafter-1.0.ebuild
new file mode 100644
index 000000000000..7b919920ad00
--- /dev/null
+++ b/net-libs/libcrafter/libcrafter-1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
+HOMEPAGE="https://github.com/pellegre/libcrafter"
+SRC_URI="https://github.com/pellegre/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="static-libs"
+
+RDEPEND="
+	net-libs/libpcap
+"
+DEPEND="
+	${RDEPEND}
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
+)
+S=${WORKDIR}/${PN}-version-${PV}/${PN}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+
+	dodoc "${WORKDIR}"/${PN}-version-${PV}/README
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/net-libs/libcrafter/libcrafter-9999.ebuild b/net-libs/libcrafter/libcrafter-9999.ebuild
index 1aac305c3cc0..16291e489096 100644
--- a/net-libs/libcrafter/libcrafter-9999.ebuild
+++ b/net-libs/libcrafter/libcrafter-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools eutils git-r3 ltprune
+EAPI=7
+inherit autotools git-r3
 
-DESCRIPTION="a high level library for C++ designed to make easier the creation and decoding of network packets"
+DESCRIPTION="A high level C++ network packet sniffing and crafting library"
 HOMEPAGE="https://github.com/pellegre/libcrafter"
 EGIT_REPO_URI="https://github.com/pellegre/${PN}"
 
@@ -19,10 +19,13 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 "
-
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3_p20171019-libpcap.patch
+)
 S=${WORKDIR}/${P}/${PN}
 
 src_prepare() {
+	default
 	eautoreconf
 }
 
@@ -33,5 +36,7 @@ src_configure() {
 src_install() {
 	default
 
-	prune_libtool_files
+	dodoc "${WORKDIR}"/${P}/README
+
+	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/net-libs/libpri/Manifest b/net-libs/libpri/Manifest
index 3fb0f8ae4f9a..3e3f788a0ed2 100644
--- a/net-libs/libpri/Manifest
+++ b/net-libs/libpri/Manifest
@@ -2,5 +2,5 @@ AUX libpri-1.4.13-multilib.patch 2541 BLAKE2B 082b9e44d102ddac090faa2efebb9047ed
 AUX libpri-1.4.13-no-static-lib.patch 1252 BLAKE2B 07df96fe923d1e95eaa9041239e706b7fd6043ca8012a74c79b900b00f9a98414812d50b5a6b26acee1bc5b382831ed11bf5636ec6fb4807163017d62f687e9c SHA512 3d057a8bc1401e4580dcdbb401c697cc25117b8ab9fc4feedba39bd980dc9745423eae7cc75fe48c3684b07459d0f5de11717020d3e7726ca89de7c6a8a3861d
 AUX libpri-1.6.0-respect-user-flags.patch 1626 BLAKE2B ec91c7cb1b2e2cecc8f97dc9ff2275527372e670ccb23f2daa3339fdae67aa4f065fc5e5dfa224710fb32e271cf2f6279c44fe999040d13b954418c3627d63e5 SHA512 69bb194721741613ec9e4c6da9d19154dfdb2ed56b2b964e09e888bd0dedd104501f3a51f0bb57587d1c15dafeeacf790ea122bc1c2a8edfeccb2f7d9252519e
 DIST libpri-1.6.0.tar.gz 340578 BLAKE2B abef8004601ea6f2c48c23b7b9e5fe3b231e6b00b0389d0baa8cd8bd2b772bcece52b1e3cc98acb44f47fb4dabfaac30d59a638bf021c5fe66bc49209d942cfe SHA512 3eb876477cdd27c88f274e4a2e35a67f660b8d8eed140e56c40769982a58f1cdd4e5be352f8f220dc100eedf1ad09286c578430a52d9abe326440c8cbf517fa5
-EBUILD libpri-1.6.0.ebuild 734 BLAKE2B 71e6d9b61b87df3ec13166d8a217a4f7ae9a5fd8b3d5144b2e6a2e45f47ecd51e20025a91d79390f55893fb96aa73ed62519f617d9f4e959db5a0525e0989715 SHA512 7cffae1730136be08fb3757a6d60ce5e8f3898c84aaa0f8b85f8b4b708af03e4b257c0a59cea0f409ce8b928e108dd7509b537fdec18eb0af39c352d435f2006
+EBUILD libpri-1.6.0.ebuild 741 BLAKE2B af081d4739230a5cb92f5b99be8fac9c829e8e0dc817a6d32d05e2617bd7be93dad91253558d8b05836683de257ebfd5fa1d8659a92c09cb6c5d58bf5e5590dc SHA512 6aed9b6ac56e43c87a95a118ab653b00b0e42634768dd6e7ee2b074a40e998e3c7e3d643e2caa370736f81de368177f6a774378de6cd6c23f90addcd36d5bd06
 MISC metadata.xml 357 BLAKE2B 34eb2ba7fee2d2df8540a6fb2b5407ec249e1a983e348951dc002373288643cc06b7ceb4cd84de8ae770b9e0ced10892fc08fb6d415d803365f60bfcf6948b0b SHA512 40cc14c2f673767be159cadd8da258d273d99e38d96ccd2c2139f8fa424b30c8878ad6aa7d061c76e52cdd77ea42e58c9018e27849887882e9bcb7cd70827e64
diff --git a/net-libs/libpri/libpri-1.6.0.ebuild b/net-libs/libpri/libpri-1.6.0.ebuild
index 6a62a8d9467e..825a5610e6af 100644
--- a/net-libs/libpri/libpri-1.6.0.ebuild
+++ b/net-libs/libpri/libpri-1.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -14,7 +14,7 @@ SRC_URI="http://downloads.asterisk.org/pub/telephony/${PN}/releases/${MY_P}.tar.
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 PATCHES=(
diff --git a/net-libs/libslirp/Manifest b/net-libs/libslirp/Manifest
index c8c6e69c6a87..b0f67db63efb 100644
--- a/net-libs/libslirp/Manifest
+++ b/net-libs/libslirp/Manifest
@@ -1,3 +1,3 @@
 DIST libslirp-4.3.1.tar.gz 127008 BLAKE2B de40980521a54367fda73b9a67a80159ff14e8ea073086d8df3b42028ffe778b62f0aabe2b3f0929e168c73c453a8eda3fe0bb866d22de5b0712775e9cece19f SHA512 fa38a5e508b00802538f8466b8b52fc4842d6f7f74caa399db1011c15bb37198678415147327a606e3f259fd5def9390012df1d4dc76e8869e9bb77ca6514005
-EBUILD libslirp-4.3.1.ebuild 619 BLAKE2B aa5ccbf3572e3602ddb4e399c1d17dc39fb179a19bb44cf40142952187fcf184102ff5f13cce87f6994cbdb0fd0d09b61bed2cf682d419a3f953bc3543fdb0b4 SHA512 2946046b7d7d6f405c37b09f9adc9f6ad72ad69f2ec7073990396b586e2da33fbc00b7e0ec71da152d80b7c6a2bf825808e0e132bab8a890b258539bbc9703b6
+EBUILD libslirp-4.3.1.ebuild 624 BLAKE2B a9912711cb5b184841598b324ee26065335fc3ae5d59c935afcfa031d0ea859aab9b2a185bb5629c396fbc629812ff1af94e74ec88f8f41b7b77ed3d4a0a45a6 SHA512 50187a3a3e4f4bf4b47476d8ccb74b4be174f6cd8bd5808031c8b97c72b71cb3b1c3e9fbb72cc5437a703bfbcc8560df4eceded1c0927cbe622c2152829fc6a6
 MISC metadata.xml 346 BLAKE2B f8c280b0fc3fadde1f7d8524d281b6c818d0489c98a3d54e9bcb54cf576bf34648041ddd2a9635544378e18fff67d34036626ae4f74ddc8a850347858137b458 SHA512 b237a26cef7a0e4e023b953ad63505c00338d7aab0434bdb346ac3e9810f81813a3567f7dbc2d13b03e0c63d50b9f151a9ece7051a90a0568281e410da2ba9da
diff --git a/net-libs/libslirp/libslirp-4.3.1.ebuild b/net-libs/libslirp/libslirp-4.3.1.ebuild
index d3258bf5dc11..6bf997e6a7ad 100644
--- a/net-libs/libslirp/libslirp-4.3.1.ebuild
+++ b/net-libs/libslirp/libslirp-4.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit meson
 
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="~amd64 ~ppc ~ppc64"
 MY_P="${PN}-v${PV}"
 SRC_URI="https://gitlab.freedesktop.org/slirp/libslirp/-/archive/v${PV}/${MY_P}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="A general purpose TCP-IP emulator used by virtual machine hypervisors to provide virtual networking services."
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 09b9cc44652d..29af4d383ca6 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -3,7 +3,7 @@ DIST mbedtls-2.16.7.tar.gz 2658294 BLAKE2B cb53ac0c8896ce0dcc2b54edf4964267bf270
 DIST mbedtls-2.22.0.tar.gz 3822997 BLAKE2B 0857479e89f9850f611cb8c946c489f715a83edba88673b874cd3e6530a7f72c48671e02435087a48aa9a550d0901a5fd2990f9b3a4d69edceecf1fa01772ab6 SHA512 391b99a59ed4edf9625e71e610ea71c6cefa4ea1210d306eb595d85f7408d5decf5fc995d4a411698f1536651ee1230b305dd354df15dbeef9469aa6a7980e09
 DIST mbedtls-2.23.0.tar.gz 3877508 BLAKE2B 501aee4ec19d9b52f4c3e56b821a00ff592c28ed188f9f192e83a6cd777428eafdc6b2cba3eef20bff5e1b9dc3abd43fbd4f102529ef920e11663703799f4626 SHA512 c2a04f659bf63522f10f6660c2d196d7f39a057ff5a382734ba3b839f463ead4e5c9bc0d21fb909d56fcd2ee4c711248be14861f388cd383385484d364247634
 EBUILD mbedtls-2.16.6.ebuild 2466 BLAKE2B a385e37e1c506efbd1894af6a8b08643000a1561640c46fa602f29c50f19ac2fef9ff6351070c63ed8d3bce0b57c2804e947670f5d935abd1376edb6a0006d4e SHA512 0ffc68758eb5aeb0223a284308d531cb74b627290133e6ccbd517f14bc2d47fa189b1100f658c7c3998e91dca6e0265e944d27a5501bbb7410318ed408d9a5be
-EBUILD mbedtls-2.16.7-r1.ebuild 2502 BLAKE2B 7e9be9c1ffd12b87b48c7c65bca84630cd648120ff54f15136cc2b3e02639731186675049bafb960ccc5d8633571702df46afcec2aaa8f0a1767ff5c34f97344 SHA512 bb55cb849c8187eb741c36ed7caa533aae1e080d277deccd9716246b10da55c65b0b4970bcf9c079a5002ee79c25f8ade92a7c1b1d70cf34e391d795c09d18b0
+EBUILD mbedtls-2.16.7-r1.ebuild 2500 BLAKE2B debe6b14b5b0ec16bb62034eac391ab35e1a89c76f01c4a23ef386feed2ee1a6f8402316fc4ae2bd9b1f099e3454f55f8fcfe2c4fc1d54dc509b72bbc25e46bf SHA512 a07d1d04ca316aa90e5bcc38b73fe2a260761bbb258ef6ca23ff894870e002f896a782c39c6c98075fa0a75f554eba7f3991d447e840c3f628d0b3db456320c2
 EBUILD mbedtls-2.22.0-r1.ebuild 2466 BLAKE2B 90da7d7d549d86b4e1d4c8f2ea81cbe1264e3da6feff6f1c6278ca55c66f3ffe877a98b878873466479df551af1cbe87578572ffea7caa7949ba2951b6d4b582 SHA512 cb69ae5bb9eb99cbaa73f51d31fd253566f5d0bfd1bc55ca5abbc61f13ffb0d834ddbc8c8f8915e34bbaafda381c22e9349f8474c2547a6f2546d3762cf111cd
-EBUILD mbedtls-2.23.0-r1.ebuild 2502 BLAKE2B 12fc7cbe7f8ea7e9895e0ffecddbf5534c3ac3e440f95a7eee99c93f070334b3164634788a6a956004a56800ac37d0bc58070d50db1d65d48fec3cfaa4467e3d SHA512 4016867da80f932f33d86dc75a169a205d77624653bd4d6965309f65746744349d3f8c7684fef6893d23d396c31af1e4685d4d2768d840c43e8120ee01de5f6f
+EBUILD mbedtls-2.23.0-r1.ebuild 2500 BLAKE2B e5a4a99e2b561b75d676605b87150aaa1f8711efb8a0e845f814ee141e78c10bb056aee8444dd93ba5207098ad27e08b11a3a91a96c985a8294e95f3d9659636 SHA512 6da8c9a5ef2d197753c3ad3069f1ea36aa46b1975bd20d15aedba1ce91ab284706b64748c546b10f86e9efc75d10180508f5cde2f9b2440fb7df7bd1660aca6d
 MISC metadata.xml 749 BLAKE2B ae622270ab3325ba6eb31b2699f2a470f348a4c7fa45dd1d11c7e022ded38bc57acb1357082fd57cf951b0422e0b5e08157acc6ebe841db9a5ef23ba9a3d9df9 SHA512 b1d9eb197d6c904a964bc21fadb939a2cdffaab0990c2254ed57e4dcf123353762c860ce36109072a192b3b31dec25b9c1236d209f42b2e95bcedb1e9342e3e5
diff --git a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
index 873f99937955..cad9d987cd82 100644
--- a/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.16.7-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/3.12.0" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
index 3667f3b544eb..a23dcc74b6e5 100644
--- a/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.23.0-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="Apache-2.0"
 SLOT="0/5.13.1" # ffmpeg subslot naming: SONAME tuple of {libmbedcrypto.so,libmbedtls.so,libmbedx509.so}
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
 IUSE="cpu_flags_x86_sse2 doc havege libressl programs -static-libs test threads zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/net-libs/osptoolkit/Manifest b/net-libs/osptoolkit/Manifest
index 45cc5cb07876..c9f9ade2f3df 100644
--- a/net-libs/osptoolkit/Manifest
+++ b/net-libs/osptoolkit/Manifest
@@ -1,4 +1,4 @@
 AUX osptoolkit-4.13.0-gcc5.patch 768 BLAKE2B 778d117c7bf5d4bd6ccb3690c341d5cc828edf67c84160beba7c910ac957fc3fbe507ff4ccfca9a6283b6a47ee05dbcc1eaa901382c3d1a63cc5608adbaf6590 SHA512 4f2d11e32b958ca5621321ed0258d3b8544528c16bb9418eb5ddd7c1929b24d42ec0ec6d714c658905df249a8356efb4cc13309a0ccc70521425faad306136fd
 DIST OSPToolkit-4.13.0.tar.gz 422064 BLAKE2B 13afe4d30a96b7cd59cf4be6116f35f5edf30b70046a7a203e89140bd0b7f338b8d1478fe6a90a7a17b6f93b0c6a8579f43b209119a8c6fdb08dff26e5c13262 SHA512 35e54350cdecf0367af47986a7c3eddfcdf924b0d6e7c52ccccdecd96d3d64ba7f8d8d266cc4d26708f0741e40eeff80db4690272702c35d4e5bafba745776bf
-EBUILD osptoolkit-4.13.0.ebuild 2720 BLAKE2B 7f63e5fded0891e0aba284175ba1152604ccdc4f56252f6a48bb2f0c8db074e20c04012e1dfd7d41b47963485ec732838bb6f4a7fecb9d318ad2aa58211f2c41 SHA512 bdee9975b225101cd0712cbbadac13d43ded13d99c319e3592b81637156d644c7cae31cee6bdd29e8d8244eba95275073dcc42762ad627dbe7d851c3d6ccaa7c
+EBUILD osptoolkit-4.13.0.ebuild 2724 BLAKE2B ce22f6061f5ecb1c490fee4d0dc4430a99d3fb5b44b5199de72622d96e3f3fa0e1bdde5414b9c766abf603db2fc1a9d9356b2a3bf0af179a36b9287f50bbd56b SHA512 bf68c30126ba393d55595f043271c6913c346dd5342802201e69ca3fd75fbe07b762291d75488b95fab3c220598811268264b26cb513692a1b5d2984392a1475
 MISC metadata.xml 336 BLAKE2B e499cd7595c1fa197432bd158c3a7f08a7d9d99496ac9911e38702918a9b35a9088a8168c6a7222acbec3134005674dff3040dd0c2b5177e7df72167f1c1fd84 SHA512 09152b4aecb17930c71dfe645780e61205a9f13c6ade1fd8f16298a7f982e36d802f2b8744a9de95c48b41a28ebafbc8e76a7f0262721c5fa41a61bffef5a5dc
diff --git a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild b/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
index 2c1dd1459dbf..1fc4da7fed86 100644
--- a/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
+++ b/net-libs/osptoolkit/osptoolkit-4.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/osp-toolkit/OSPToolkit-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 RDEPEND="dev-libs/openssl:0="
diff --git a/net-libs/pjproject/Manifest b/net-libs/pjproject/Manifest
index e5510b8c693a..bf8ab8b581d4 100644
--- a/net-libs/pjproject/Manifest
+++ b/net-libs/pjproject/Manifest
@@ -8,5 +8,5 @@ DIST pjproject-2.7.2.tar.bz2 4994233 BLAKE2B 44ecaf0997d5dd9b18e0b811cead7c9104e
 DIST pjproject-2.9.tar.bz2 5009546 BLAKE2B 853f86e57c0f58943e977856bebc7dc20684ac4a6a16a55f3fe4ddf58ca58187bdc1011c5df2bc72de690f1695484012b582e56dd0e88a624ef319a5f3623772 SHA512 a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b
 EBUILD pjproject-2.7.1-r1.ebuild 2618 BLAKE2B 607df084017b04a906260d066fb28ff0a0ee11aa73430e40723c53ad87fee8298bfee203f231d4fe4fe7160521c5bcd47eff85a13a7d02c6790d42e4d29505b8 SHA512 08cfc90ac6007da1ba37c2b58417f9b71064982d818f1bf04c325501486ad8b3382d85347ddd6419ce5195539ad3c77575846eaf52ca9c92628b9bd79fa46670
 EBUILD pjproject-2.7.2-r2.ebuild 2754 BLAKE2B e26d384028d5a0211c48963100f55daa7df626b39d4d64d25d7c60adc33b2925c1f4c61af822699977a8c07cb437c227990e33a53f98eabeb058cfc111b37557 SHA512 1c1b9856f09f6bae89f3da0ed8b5a622a84402bb3f663b8fc1e9d4f435700e157511ae120fb074fa7bf02df6b031cce138c1c288649751bbc84263e39cf36361
-EBUILD pjproject-2.9-r2.ebuild 3038 BLAKE2B 819df44be36c4446a20439019e1a46d05d60c129a9957630ba417174892240539b6c22397f227b8a91587c3e0773ab9b505582ad4adc9cc9ee8cdc05bd774ed8 SHA512 f2ff0153d06d2cca2ceed40919878ec6b94a02ab5c83b1d5c90b80f9d7f9e55599750fcf2e381ffdfef440faed78c203620d2fecd53b962db83aa40486716d85
+EBUILD pjproject-2.9-r2.ebuild 3045 BLAKE2B e75d770f2908efb2c7d4a1a0f0d330bea1eee05adb134ec0293419f074eabb908eb3d48da47719278a4697ea5612e2bef401d0607afdd02d65df6f37c95f88ae SHA512 f6f781b7e193497345ce688d8dc5c43ef327822dc014d2de3de8c0b91667b296d78435dddac10e853143c556c68f194c5c1ae284f4d738e06f08c7ea1ab6cd01
 MISC metadata.xml 1275 BLAKE2B 6d833264ab353a9393a577f50a5241948bffe17ecfa551aebd4736fef54e7ef316c481faee27ddde3a5aab327a22bd38520e781aaeefc5a2c14cb2fd08dcf608 SHA512 563deb2cb83e6a638d9cc99b912c4ca907acd0ea133168a33d452f29d856b27ee38ee73bf27ed6147b6decfb6b4a74ef1ea40b1742e201408916fdeca9400771
diff --git a/net-libs/pjproject/pjproject-2.9-r2.ebuild b/net-libs/pjproject/pjproject-2.9-r2.ebuild
index da65c7055080..abce401573e3 100644
--- a/net-libs/pjproject/pjproject-2.9-r2.ebuild
+++ b/net-libs/pjproject/pjproject-2.9-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic
 DESCRIPTION="Open source SIP, Media, and NAT Traversal Library"
 HOMEPAGE="https://www.pjsip.org/"
 SRC_URI="https://www.pjsip.org/release/${PV}/${P}.tar.bz2"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-libs/quiche/Manifest b/net-libs/quiche/Manifest
index 4ad3cf6f8a48..e9223d9a9f1f 100644
--- a/net-libs/quiche/Manifest
+++ b/net-libs/quiche/Manifest
@@ -286,5 +286,5 @@ EBUILD quiche-0.2.0.ebuild 4047 BLAKE2B b54703dd4bbeed70f436167eec0a09a8f4f21a22
 EBUILD quiche-0.3.0.ebuild 3645 BLAKE2B 404205e38ec6feaa2f674e1ed7cd5e300c63d2d53ebae265e6eda458b50df3ec3fd56db3193efe5ed1375b9b3f3c0f4155779765cc710648dd1a9844bf95eb56 SHA512 da5a2273d70175e2e4bb49221d9ef80b387672d80f6e80938ab3c1ebbe5318052c9399aeb04ed1e42b3d43e5fac42602e4748358c8d2f9af3658845a75857f06
 EBUILD quiche-0.4.0.ebuild 3725 BLAKE2B d88407efe8b1ea50edcda4afe09627161f8953c0d01d830f1ff6c5e04f22b4f2a9301ff0f14da85a6db2d982aa0dada708f0c76164a5331264610c7a108e294b SHA512 9328e6f1e182a31bcbc210a2a541c0c7b3419b306748ac87df933f20dee1f829c0f7c9a4231a6104328ad812b56faedc1f646c232f545d8a9510025f89746915
 EBUILD quiche-0.5.0.ebuild 3826 BLAKE2B a70e63236670db187c88df7c9810b2025ed28fde339d0b68d03b458d14595cdf80889b981eb6d562f07fd5c66aff0a2e695efc408c70a88faf6fc381402a77a0 SHA512 02ff504d7b5662901252505bf8ab5f040c8ef59f4606cc2b44a830d9622e7efd69473aaa3b1aaeb308279475e2b3fe377f7a7e6f1adbe76764ad3e0e374597b3
-EBUILD quiche-9999.ebuild 3826 BLAKE2B a70e63236670db187c88df7c9810b2025ed28fde339d0b68d03b458d14595cdf80889b981eb6d562f07fd5c66aff0a2e695efc408c70a88faf6fc381402a77a0 SHA512 02ff504d7b5662901252505bf8ab5f040c8ef59f4606cc2b44a830d9622e7efd69473aaa3b1aaeb308279475e2b3fe377f7a7e6f1adbe76764ad3e0e374597b3
+EBUILD quiche-9999.ebuild 3798 BLAKE2B 7eb696c045b271619d910a3e458ea8e399238256c59a3a83e71f9dcadc907a6077cc543e861a60e31fe4752f1c902cc5160db95effeab42687731f071e2a1917 SHA512 70f7244d31b0b98f2c1b3c1f87ed36215293b45f6645a070a02265d84a5c73c7242f8f6a65bb1c69b45199dbf2388e37fba7e61967c40b6b09715e6dbf1091fd
 MISC metadata.xml 330 BLAKE2B 19ab5c683b1adc3bdd7929dfd013499d670eb7456dac247358c8da9c45a907e830c17dbfdbae4a5096ee82901de9b3029312cdf5136a6ecdd2288fdde7577248 SHA512 d5c6e39e5d72ad515aa1d61d851fba6db8c01d7b808be38f9fda4fec39a033f6e9986adc20cd561a6f0a4c391111c6d80e61ef7312a1274ed526588a838cf874
diff --git a/net-libs/quiche/quiche-9999.ebuild b/net-libs/quiche/quiche-9999.ebuild
index ed4b166398fb..beff04e0be2a 100644
--- a/net-libs/quiche/quiche-9999.ebuild
+++ b/net-libs/quiche/quiche-9999.ebuild
@@ -137,8 +137,6 @@ DOCS=( CODEOWNERS  COPYING README.md )
 BDEPEND="
 	>=virtual/rust-1.39.0[${MULTILIB_USEDEP}]
 	dev-util/cmake
-	dev-lang/go
-	dev-lang/perl
 "
 DEPEND=""
 RDEPEND=""
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 2f1cd8b9dca3..935018cb2c7b 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/asterisk-core-sounds/Manifest b/net-misc/asterisk-core-sounds/Manifest
index 2b7121156d61..f2a88d846242 100644
--- a/net-misc/asterisk-core-sounds/Manifest
+++ b/net-misc/asterisk-core-sounds/Manifest
@@ -153,6 +153,6 @@ DIST asterisk-core-sounds-sv-ulaw-1.6.1.tar.gz 7254975 BLAKE2B fbc603d336d7ab43a
 DIST asterisk-core-sounds-sv-wav-1.6.1.tar.gz 15042378 BLAKE2B 5f62bfc3fdd0715a15406f281af5c17b46e918b797ac8fa7430ff4e17249513509213c3a15c2ec9d12d2258545ef0be3fb35348617ffe65806ce4bdf74146d44 SHA512 7fe05dff8082b93e5b79a4fb93c873f9c618e1baee03d000a82a98b2d305fd837e32f3bd502896df50aac6e30421d0f48ae8122c1fabbee3bffc45d8717b3b60
 EBUILD asterisk-core-sounds-1.4.21-r1.ebuild 1851 BLAKE2B d5cc2da39d0f1d33af354fec4ef895349ebf4819bf0ec7d6c2d5ade325a77f6c86992c50926f1c71a2fa4bd942341ac28f1e75e21f8fdd6f785aed62ff968bb3 SHA512 41db422df01d02b098e88972d5a71c73accbfea198837c5dbc682c5dbc6c707ee33136bca50e1b304d4aec3b43673140fcba8ccf4ecf323be1cb98f88be63200
 EBUILD asterisk-core-sounds-1.4.22.ebuild 1853 BLAKE2B bbdd6efb432a829f6c3408d5b72fe51bc2758db0800a660d98c6cda8be15af82ce6ed4026ce1d73bdc8de442e225505bf2b598d378a4c7de7822b3c12ac9208a SHA512 b798ec930025c9c5ed86a0c911da5403c57c015f1fd92dbf53e2dcd6c79e951eac4d02692b874147537a518b4d3aade0aec634c635f506bbac75876390d95194
-EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1738 BLAKE2B e118f35620dab8809b0e1dfcde76319e0c058cb9f3bdce058faf3d10b5379258fc1ead1c50c971be7874648736f1512dc0c894977af54245a0efa1e79f4ba1ad SHA512 e7fc7b8684b25b3b15f580321deb0657254c0d2b11d80bb3187350e465c7950ae756275b608b858e3449590d20184c05f01cb355492f0c1218a2a67ca2f27a19
+EBUILD asterisk-core-sounds-1.6.1-r1.ebuild 1745 BLAKE2B a17f70da7aecedd5b5f52e184f4c65c867a9a260d672563095b1e7820ee59bf857b621b456e7b4fa69f0a29d987b5600b0a1505a97c9edbb7fb574ddfed898b5 SHA512 92c4fdbc64007b233637d3b9efb2a25534eea081c0dc31cd61f0928a7fcb57461a7f32b6e2e60f6f4a8e90e60dfc988f28f45b6094fe43fcdd90fc1d9aebd3b3
 EBUILD asterisk-core-sounds-1.6.1.ebuild 1918 BLAKE2B 3fc7d2338255e46b873a530b1faa0695f141dc973067e424a32ead733892c5cb5c52ffe3e8219e85343737c3302553f5ea8a0abc7e8b7d8bdcfebda257bfcbce SHA512 ceac6189c14a623eee56c1095f01c6f038eaa1820a741c2fb2843c92dc9991864b5d01faaa0060831af7e56a49b0acd2e1c5c345338d604c4f6d65cfd7d9d702
 MISC metadata.xml 958 BLAKE2B a0bb142f5343679cc734d2154054fae0a93faf3cba74dd6a0939d37b1acfd7dc0c41b1aa22bc7a45e408b7c046d31d9c29ad9d5f2869d7e6c5388c10bafb99f6 SHA512 0665a156659c7b7199f06cca2a2d9498ae1230f65e850b92b2d8efd56550671c6f1932beae53b27ddd145133dae067e0fc0dfcfd264ab251de17f2bda7e8d3bf
diff --git a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
index ed79a6611dcc..0bda5d6ece3a 100644
--- a/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
+++ b/net-misc/asterisk-core-sounds/asterisk-core-sounds-1.6.1-r1.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 
 S="${WORKDIR}"
 
diff --git a/net-misc/asterisk-extra-sounds/Manifest b/net-misc/asterisk-extra-sounds/Manifest
index 694b6eb5219a..27291923ec53 100644
--- a/net-misc/asterisk-extra-sounds/Manifest
+++ b/net-misc/asterisk-extra-sounds/Manifest
@@ -44,5 +44,5 @@ DIST asterisk-extra-sounds-fr-ulaw-1.5.2.tar.gz 11539559 BLAKE2B 919cacb90afe5a0
 DIST asterisk-extra-sounds-fr-wav-1.4.11.tar.gz 23829634 BLAKE2B 8d45ecaa92673599430a9d652e4965cf1d7d8557bbcc07d49238e21a22b7dbf35fc1bf41f66c35df298bdd2af189a3f63dc3aab7df43961003a0cd42fd8f19fc SHA512 4482f7a95fcd5b43ead86e877e4df88d017ea003bbe56c4813fe6814956fb015d4359bd1257513b34c3d80ac171472c0749e534ede6ab9aecf42a589ad76c0ba
 DIST asterisk-extra-sounds-fr-wav-1.5.2.tar.gz 22856532 BLAKE2B 921135610f7329893f0a90e88845507a26240948dde9fb4b83db4e9133d79fbd395336ceee2504e2438f868216901eb7bae79e2c63168255bc538e2892469102 SHA512 edbf1b36b2c2083f696f52021e7719d4ac6ced29c312de77465fb3ca7d9444e09cc91fe3c6fdb45140124c44418c571f2ce1145fcff5cf88765bd0d62770e3b8
 EBUILD asterisk-extra-sounds-1.4.11-r1.ebuild 1420 BLAKE2B a0c707d7bde726eebb1adaeef4130d5d20dd439675aa6ca95a96eeaf4315dae6c2ce25d88d0e9cab76fdceacc076ef3a39a62f22cf7bdb2149a09e1f387ed268 SHA512 ec0db8212930f95416ec8b9997bc7651a67fe10bc7ce4a47681b89a4f06dc900c8c857351e1724b1ac7d3a578132786f1c5e518f6d80bc94f95625ae430014b3
-EBUILD asterisk-extra-sounds-1.5.2.ebuild 1786 BLAKE2B 079a7e1bef6455869698f2bb5b0ca50b5133d1b158d4e306373f1be4a616f7e613efaae1a081ec1beb587f450d6d826fc0c79bb82429b960b9662b18a383c0b5 SHA512 7914aaba31ffc04329ebd789a0e806f31032aa754aeaf6d5cba16c78fc82ad114723f8f634cd6f59e939bf67a7588799f51df08f85bfe1845fb49e64fcee07bf
+EBUILD asterisk-extra-sounds-1.5.2.ebuild 1793 BLAKE2B ce4c639595a7a78a1e3a594ae179fbba4768d60ea60109fd2bd15fd6b858f6020dddd66aa03d4199128b6cdf5c3c103660cbce23fdb81a3dfc75e2a3e5efc087 SHA512 d9801a6c96ad8068d8b4e7687a19e50489427eeacc57baaba5c5c7ace886cd5b15cdee38a7c17f0600928a5dad2cca89264523df0c5768c21ccf45a99f88d9f1
 MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
diff --git a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
index f90d3165f8f1..6e680fb22622 100644
--- a/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
+++ b/net-misc/asterisk-extra-sounds/asterisk-extra-sounds-1.5.2.ebuild
@@ -22,7 +22,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 
 BLACKLIST=("astcc-followed-by-the-pound-key")
 
diff --git a/net-misc/asterisk-moh-opsound/Manifest b/net-misc/asterisk-moh-opsound/Manifest
index cbbee1babd3b..13c23fe06532 100644
--- a/net-misc/asterisk-moh-opsound/Manifest
+++ b/net-misc/asterisk-moh-opsound/Manifest
@@ -7,6 +7,6 @@ DIST asterisk-moh-opsound-siren7-2.03.tar.gz 4233366 BLAKE2B b628d092b47997b1cd2
 DIST asterisk-moh-opsound-sln16-2.03.tar.gz 31309094 BLAKE2B 1567b63c6e93ea70a1ff3452ed7a0a457bb118a2605248d5fd9cae11ac72ef53e8bb663fb826031a8c680715194d05bb6c0abc7ff7597e62f61608ab403437ba SHA512 e5555af8f08720c01bff19200efb7f139dcbb9d1ffa168716dbf93bed97009a441bfe63080c9ca7b15db2c98fe5839d311c39cdf8c0a8a40f8dd93a89b8a11b6
 DIST asterisk-moh-opsound-ulaw-2.03.tar.gz 7479839 BLAKE2B 87ae22a72ab6da7358fe887af5562a701bca89bec35d7f72644cb6f691e0619671bfacd02ec0f0f269447dad1cd050f144b22254af3812268fbabb1944056bc5 SHA512 2827b635a61e520bb0efb8c5e77ce0d1319d58c027cd3721819b58e4136918b7767c5776a4ca02f675cdb35d6f40154fc863eb7d7cb702a637fe9ec966fe13c1
 DIST asterisk-moh-opsound-wav-2.03.tar.gz 15359473 BLAKE2B a3e9ddf0d54989f07c581facfe4f157120e2b2ae9dbba84bb2edb85ec4bdb98db5bc4783924af0845920d3736c5a512a7615effdf8c4f0b212ea347193efd115 SHA512 e8fefcac32ac88735519f3f9df766d77d1007c8e98952c396943966dd554d4237177f7fbfbb707a838b5f4d479c13c6b4bfecd62d78ba5ea40b248d1bf007872
-EBUILD asterisk-moh-opsound-2.03-r1.ebuild 855 BLAKE2B 1230d319edd882c732824eb2d84fee282ce538bcf3a50e7d3f0c57de4cc0ec2781acb4b60371c9757049e7a1fe42e824fbd4525267aead62f6ced5f32f1d3fdb SHA512 ecfa2a5b1f942921c7e051d0df029317832db8c8e2c9278f9ae39669f64ca39c3782e55a6aff4c098619828ee91b75e1a57f58384e08b6abeb853e2590e32eaa
+EBUILD asterisk-moh-opsound-2.03-r1.ebuild 862 BLAKE2B 6df3f82cf4ca90694a8de5efaa9c6d879329057214b411ec48ae74b77f3be3b710a92397694e4b026836e98312f49ee632585cf9d41ff8ea97c65129f6aab315 SHA512 f61801a590661fd772024de6201bc68debdc437ab8bfa1c5f598d16a4c191941b39b8c606f379611f84368478a418af99b2085de2a45d9ce90feee68618152f3
 EBUILD asterisk-moh-opsound-2.03.ebuild 1140 BLAKE2B 7bdcca804e6f84086415dc3bbe06025b2225267bd261aefea6590fdbc048879db6f2d887862eb4f0d1fe41c573a2389fe932113dd2ba5a8c9e278e66281ca846 SHA512 feff1f6cbdb0786c81e8917a3a5a958d0ebc3d518cc98f93f8d2a2142cf745ab3b05616a15269e92fea082743e4d5f0ddd1f7b18daeb4484f1aa5c242087a7e7
 MISC metadata.xml 1028 BLAKE2B 08c7704731f17c550e58330dcf2d4648aaf470ae9ebf7e1034f7231ef47431bf6e013ced529e2990cdf0edfe7d42a9fff08cac745da4f4dfae8872e0b413c1d5 SHA512 5cf30979bae3fe0a9d0346878b0dedd693a3e79499deff75875c4ed7b433657a3092d870bb0ca816bb566cdb8ebef907b887f62c4acf22c3e9d0fc698bbc1271
diff --git a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
index d9031a7659be..3135738c7736 100644
--- a/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
+++ b/net-misc/asterisk-moh-opsound/asterisk-moh-opsound-2.03-r1.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="|| ( ${CODECS//+/} )"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc ~ppc64 x86"
 
 S="${WORKDIR}"
 
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index 2eebb3899e8d..ea010abcc48e 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -24,8 +24,8 @@ DIST asterisk-16.11.1.tar.gz 27703143 BLAKE2B ad2c70f76e5d59e183713034c9bbe0988c
 DIST gentoo-asterisk-patchset-3.17.tar.bz2 5074 BLAKE2B 3c945e77b54b2449253acb9fcea8d289a7a3184729190622c14aff5557d36c93556efa83320fe4e7ae84021960c09f35ae9f997e8015706eef933aae2948309e SHA512 37f86f3c699b2643afd8080391e817a282571694bb56e00efd0734918dbc33d6c12a2463dbc24667597420863b4f506870140fbb8ef3f1700124ef790ae7252d
 DIST gentoo-asterisk-patchset-4.08.tar.bz2 2176 BLAKE2B 7f8c9b5fda855091e66b2534d2be23fb1616f565480459f71f766826e5deeeecb24899e2ee9eefe74323e892624d32ab954ec7e9be6a002431ff029fc13493ed SHA512 365c1b8628882c48c279e1fd77d982e6d0820ba7d7122e97bb4988f875d7010caa956798c833c3b01d389004fa08a63a9de2c1b452c9e5701c6106e29fd8e9e1
 EBUILD asterisk-11.25.3.ebuild 9607 BLAKE2B dedc0fe6dc53dd63a674648fc309957416f6b0e1f6036803802831ec33754b0fada3af67264744274004c2d29b0b43c1d4ab430aec6c3d368aab024a02c92297 SHA512 90c7b637065abc7953bce1016eee9c3b9f94f3a30df593de81cd72e61afd217db62a505d059623f99f72be643ade955460dbd4138e5a98e979b924de5bbe2cc8
-EBUILD asterisk-13.33.0.ebuild 9211 BLAKE2B 0a41b74f03a243fd9dd6c53a5951ab0beecf77d81dd0fab6ff0aa4e9b3327b51c7f560b6f1eeba41773e4a82d5a239907f4ec4585bd9ff4044a87d39284eff0b SHA512 c8f6edef42e708dfe7b48a2f5d954a646f9c406909a14afaf31eaaec9deb9d4533dba625cbe5bfef63bf38c97a0a776bcfd21d2fe7a1d6fad07eff98efc1f401
+EBUILD asterisk-13.33.0.ebuild 9218 BLAKE2B 8a4e03290f1591d53cd1270d9624b7b92e2a29183082d6181849c790e59237036357f1f16f84f009b69fa79928348f1ebd385852f9232c44867619f9769866af SHA512 8a979ba7536fe3fdc4d0e3fdd1916d84abb4720a3673a908ebab3528aa3491b7caf30f275fd4655a1207e65c25c3e7b8f1f654da8ec3a2243f683d1bc3d12cf1
 EBUILD asterisk-13.34.0.ebuild 9189 BLAKE2B f1372442376f1900d71f676b6182dee9fa68fa3256903b330871df58e108e7e20e2645ea9be95b2d4ded0eeb8b19f5d51b9a673067cb347b7b034bb262d4b810 SHA512 8d3de22d07decb6b2805af27314651334d9319761f6c88ee88ceebc129a81b9cc1b4f39d977b3b7c07e9c9703a7c6db7ce7babe3931d144f5d1549fd59eedbea
-EBUILD asterisk-16.10.0.ebuild 9351 BLAKE2B 7d990e43401afd8449dad175238d13d4a70fc11e791ae233f3db8030cd3be4778d4f3b52aa6a1ced43c7f203bfeb249b3f0ac019a038af0a45f2713fcc150897 SHA512 782c463069a5764b101dc909117f8016f9d524871911f4b7efc1875185eb996dfe93aa39645b38d2f3baabf7213df67287dc34c7045fa97602f355ca0441cf5d
+EBUILD asterisk-16.10.0.ebuild 9358 BLAKE2B ed0ad2b9d03e7055cd3dab3b7e78fba8a08e6cf8ab41fbcef965b5365371f978f71485774356021ddb0ba6ccad3df9208456e90258ad6d784e98902e39aa666d SHA512 5bc04c8d98b9d0d64f0c63ea0c78d75ec76570fdf938221017e1685af0b2da9c202cb60cbc4f0a876a4252812cf41720c5a387ca6001cfd5e4adbe7a799e3e87
 EBUILD asterisk-16.11.1.ebuild 9351 BLAKE2B 7d990e43401afd8449dad175238d13d4a70fc11e791ae233f3db8030cd3be4778d4f3b52aa6a1ced43c7f203bfeb249b3f0ac019a038af0a45f2713fcc150897 SHA512 782c463069a5764b101dc909117f8016f9d524871911f4b7efc1875185eb996dfe93aa39645b38d2f3baabf7213df67287dc34c7045fa97602f355ca0441cf5d
 MISC metadata.xml 1391 BLAKE2B dfa59edbb0e1e073171b7b335bec7c8188af06e97a88674c4a4f516fc42e4754044c8430af549865ff6bb18eb1dc969dbfa3b3868cc7b8964150581d200d946c SHA512 1dce9bbe1879a7a93ec9ca99a618722753251625626f15fcf9efbf9aa781f93084ea0f68857eeeb41664d82bdb2922ce75649c8627dbd9b46e42a7e825e3b3b2
diff --git a/net-misc/asterisk/asterisk-13.33.0.ebuild b/net-misc/asterisk/asterisk-13.33.0.ebuild
index 1e709bfbd068..4643a4e3312d 100644
--- a/net-misc/asterisk/asterisk-13.33.0.ebuild
+++ b/net-misc/asterisk/asterisk-13.33.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar
 	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/asterisk/asterisk-16.10.0.ebuild b/net-misc/asterisk/asterisk-16.10.0.ebuild
index 7ee0fe2eb037..77eace88d296 100644
--- a/net-misc/asterisk/asterisk-16.10.0.ebuild
+++ b/net-misc/asterisk/asterisk-16.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/asterisk/releases/${P}.tar
 	https://downloads.uls.co.za/gentoo/asterisk/gentoo-asterisk-patchset-4.08.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE_VOICEMAIL_STORAGE="
 	+voicemail_storage_file
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index ceaf8b9a5c34..b6ceb097a6e0 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -10,6 +10,6 @@ DIST curl-7.71.1.tar.xz 2387660 BLAKE2B 47b3a4704ae8b09b37f7a9d8850fd7d692d91db3
 EBUILD curl-7.68.0.ebuild 7574 BLAKE2B a63f7bd7c6a27f2c67824d2cd2e742bf6d53f2fb004ab7ea6e4aaf0034bb97a5a59a605c133cd3c27ce84114bdc715c873706f757428a8f3ade59516dea1b882 SHA512 a59e3f0ad00bf9becf08fb624e0f634f6bac617b8ba88f751e2a2a78422eb54f294149db7a1cb9fbd25554637335c01c9467d1774a26b9571d413f90a620e491
 EBUILD curl-7.69.1.ebuild 7663 BLAKE2B c3d98ec0d1f9d40d1173cec9f4a8e6198e5da809fe52fe83db75ba3ec68f0f2ca0812fcc90d29004bdcdf874136ac139a130f913899553d5912392b541f612a9 SHA512 c6f542f18802aaf42ac0ca33477f239587bc20afd9462bf931444ee79a8773e0b1fc1cc8ce503157433d6d45f0600b104fd0a0b200de2ffcbd462dc6d2cd784b
 EBUILD curl-7.70.0-r1.ebuild 7735 BLAKE2B 8bb2413f7fead1501f7146b06c0aa15e6c610c1e731c3ffc59d0a8b979b24cbc491d32087315aa0dfa178701a2a8eaee116d41fdbdd321bcee5c6c62e8ad5a0a SHA512 40c3dd6c2e168de6e596fa6e5177cef48be547fa5e76772a46fbbd076b68ddcaca0c9f8c2d1981ad528c900a3624d80dfa87dc077d84c773f21b35a57b568b9b
-EBUILD curl-7.71.0.ebuild 7692 BLAKE2B 39608bda7ac27fb0a159419c8fcc6696e9e730ab902e9ab12f388da7b02db3d99fff4e20a51946f6169e99b5cdf1fe6695c6f814a00e98d5ac6340a31598355f SHA512 01d1f5234f2cbdc926b849dedb79e299b89a0d09b71186573cc3a8b2c03590a29ded5028f013b8618f7e3e9d441cb5c4c083727894f6c25e3cd715909f3f25f5
-EBUILD curl-7.71.1.ebuild 7701 BLAKE2B 2d72b00048735f2b94425c2238dd8127d94ec27c8730cdbd950627457268e971933f7c69f7fdd86b8d99d093fa84ae48a3564abff20216c5c8b7b3eab2a8fa77 SHA512 5dd107b0f805192867eb65b74bcea9b62dd1d651677046f491a1a41e3b68b2eeab67be8a5b33d501d43fd76f5f75f7420930c7168901bf76b82505f7b50a8b97
+EBUILD curl-7.71.0.ebuild 7692 BLAKE2B a2114c226d010472ced5ed0a4d25feeba6d820defc786c49022c74dd0eb72a56015086fb549d3187dcd01f6cead02da6f9668a3442c833a6f52b8e76419d5bae SHA512 0d10f62aeb9a91c6199034060295064621ece66181019b7530b98d38bd36d31c0d404d1a92a4245cab7386363c84c6bf3c054b977ea07e3a8fb5aa541b877f28
+EBUILD curl-7.71.1.ebuild 7701 BLAKE2B bd7e2e0ebc82cd095ad810f9b7ec2c945cf68fe572e4978f1c8849d8261977d83a07c8e188540193fe9c0ace10f88fe578c4139789fe3922f5fb41dc717078ac SHA512 284fdf2da006a4c8ffafed5a3a25508b95e982406e5ca958d55f59e26923a39e8bd855fd01dbe2667602da40652cbec6190f024c1841beaa33bc9a7ca157084d
 MISC metadata.xml 1643 BLAKE2B 269e3f95823a962466081b171d376e1f13cf4e8ac7d440577f704d585d40d0a4e7f496be1860f283f2e118338183210c1a93d3cff24fe517c9fed57dcd8b615c SHA512 ed329ba19ca89372141274e7fcb161e9f825e219d9bf71dc719b1a2bf5deefdecaaab02bb6e5e4c0bd1c87ce16731f7f5137dffb86e65c67381d98eaf72cc2d9
diff --git a/net-misc/curl/curl-7.71.0.ebuild b/net-misc/curl/curl-7.71.0.ebuild
index 71eee9637f7c..ed0e2adb8d45 100644
--- a/net-misc/curl/curl-7.71.0.ebuild
+++ b/net-misc/curl/curl-7.71.0.ebuild
@@ -48,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[static-libs?,${MULTILIB_USEDEP}] )
 		net-libs/nghttp3[${MULTILIB_USEDEP}]
 		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
 	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	quiche? ( >=net-libs/quiche-0.5.0[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
diff --git a/net-misc/curl/curl-7.71.1.ebuild b/net-misc/curl/curl-7.71.1.ebuild
index 1a4e00817ed5..51a4339b8b8c 100644
--- a/net-misc/curl/curl-7.71.1.ebuild
+++ b/net-misc/curl/curl-7.71.1.ebuild
@@ -48,7 +48,7 @@ RDEPEND="ldap? ( net-nds/openldap[static-libs?,${MULTILIB_USEDEP}] )
 		net-libs/nghttp3[${MULTILIB_USEDEP}]
 		net-libs/ngtcp2[ssl,${MULTILIB_USEDEP}]
 	)
-	quiche? ( >=net-libs/quiche-0.3.0[${MULTILIB_USEDEP}] )
+	quiche? ( >=net-libs/quiche-0.5.0[${MULTILIB_USEDEP}] )
 	idn? ( net-dns/libidn2:0=[static-libs?,${MULTILIB_USEDEP}] )
 	adns? ( net-dns/c-ares:0[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
diff --git a/net-misc/dahdi-tools/Manifest b/net-misc/dahdi-tools/Manifest
index 3874134113d8..e544e425565b 100644
--- a/net-misc/dahdi-tools/Manifest
+++ b/net-misc/dahdi-tools/Manifest
@@ -7,5 +7,5 @@ AUX dahdi-tools-3.1.0-fno-common.patch 1030 BLAKE2B ca9f8ce7116656f66107194c7cce
 AUX dahdi-tools-3.1.0-parallel-make-no-config.patch 681 BLAKE2B c72cc644d88514c836784511abd9d4c06009218a311dc937b32fe3bcd048ae17439a882ed6a5f159e619eea478d664552e59b7a2ff6b4331c9b44e7ed93033c8 SHA512 d368a0fb5b03618d4adb49c01a6ccb518a67b7e48a209b927878b71b68e4a4a1093574e394970f9d6426bd75b5ca737326f27fc8322654ce39f9b2b272813992
 AUX dahdi.init2 582 BLAKE2B 2e273c929772428586f6800601cc0249a33f61c6aad474c19dd45d9d78a187a9fdd34d1ca26e0eed605fc9630c04b0b0ffd29214a5116749db94bf7609bb078a SHA512 684e8dea54a4f082345100f4d05ca286a085b99c46f0b3fa7300ca5d9a666657afb5405c1f14ac3ba4aba02ce39872e74b9c1cfe6321fd631fa6c39ae38e5ebb
 DIST dahdi-tools-3.1.0.tar.gz 607449 BLAKE2B aa8ef197cbdecf5c892386aa1c25c940ed3f7c24884f588dcca975d34ee7b4c41722d2529fa305d7568d03302e10e6eb4d5df36a899315e05bf243163500b22d SHA512 e0e5bf24e4834ca39ef7dc1af1bb7ef26bd258a8b2cb2406a7e1ffed25b4b1d44a5fce41d97c5ad7fc6ebb66f965759d2b49ffa6d89845786f43eadb89ff4694
-EBUILD dahdi-tools-3.1.0.ebuild 1610 BLAKE2B 6ad00f51f5f7bd35456ff314214e51cca71c5ca37522494b42afb964c31bc1f216859449195b10b215c8937f91f76f52e5279574abe7957e16da0f3c5b9053e1 SHA512 a1dc3b4975b9e178d7667a5bf43c16cc24617f4876dcc05a885b963b68994ee8a6b4c94c53cea0ebe9e604ad904bccec1d5ebaa4df96916f414d30f7a4e41a47
+EBUILD dahdi-tools-3.1.0.ebuild 1617 BLAKE2B 15af9f45f90ceb9529de7f4bea1d07886cb7367526e43ade95bce9a15cd75a6f2ac2b2ad2e295f2b5773dc401e5a9156f73557ab565bfa620676fd3fac891756 SHA512 b7f70c6a81075677c9f9ee9023d19d22ec5d5ee155ca7e77033cd1543cebded7b96b82f4e10bc50b46c1008d491e0dd08ea3eafd4bc3e5dd11770ecba609fd18
 MISC metadata.xml 443 BLAKE2B 5a35a0f5e7aa8d8b19423f8aab317e7eef695b76f1b541a96af1c0f6194d3919a56260e3a461a0acbabd268f884265876b9601348179a976b620f39ca4bcab48 SHA512 d071770c4efce5c06137822cbf002d29c11b59f004afc537008417204851e05751df7b21140abc74e8439baa00d2e15bd596b4436f8e8aa5815ea8200018d007
diff --git a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
index 42a85a441515..6b9aa9aac2d7 100644
--- a/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
+++ b/net-misc/dahdi-tools/dahdi-tools-3.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/${PN}/releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="ppp"
 PATCHES=(
 	"${FILESDIR}/dahdi-nondigium-blacklist.patch"
diff --git a/net-misc/dahdi/Manifest b/net-misc/dahdi/Manifest
index 6a70ec2bd3da..6c34dfa083f7 100644
--- a/net-misc/dahdi/Manifest
+++ b/net-misc/dahdi/Manifest
@@ -18,5 +18,5 @@ DIST dahdi-fwload-vpmadt032-1.25.0.tar.gz 149360 BLAKE2B bb754b1abf794d918d1c457
 DIST dahdi-linux-3.1.0.tar.gz 1645832 BLAKE2B 27ea6b68318750639fd90f2061e2e9e128e3faa8cc195b368f7157947f5b522f86b871a3b793016945c9faaed20b38a185adafa29b2fc04019063257f578169e SHA512 440f5e44c933c609f2b3cfcf013c84bcd0c37929a43d69aac0276b11484cb890cd5939c5ac5950cad54d934d27ee6ff0b18f2bdd58477ed9be8055de107727b4
 DIST gentoo-dahdi-patchset-3.1.0-r1-v2.tar.bz2 104683 BLAKE2B 6ad6ede1163baa40e0bc265af5bfba5781bc61bfcabaccb0b8579d8ea8b778a06e2acf4b3d57b5419f3ad406e32d3cbe63cea6b2ee5960644e1458636462decd SHA512 b3acfb0e614073ce8e3a009f5685959f6c226607ba6c50a4657ed1dda808345e745e13005de95e61ac1ed47a2c6da3ce678c5881f5eff945434b8b79551dd304
 DIST jnet-dahdi-drivers-1.0.14.tar.gz 64860 BLAKE2B c8bbb007cd1a76d02b758af35d1d6a26d5617018ad1de8c69dd9bdf7d781d66b85031706efe55edb32eec1d00f3877fe8a2edd4f9899f367824875cd5fe93984 SHA512 419352897d39bae6b51ee302723de6ca3c8041546a1273fa0691cf169e16f37fc730f3033fed4e5f564dce6dcc097e93f609208af8c38d03b9aee96b95037d66
-EBUILD dahdi-3.1.0-r1.ebuild 4785 BLAKE2B 6a28f1b6df0bd71194b0a043995bae184f74ce046db64ed4901749c56af39f0d3dd74573a5b7a4b8b0970e295a31bd9d7dfa3801d572bc2cef97d7b9bb412151 SHA512 3d254bffed5862a7b07309337d56e472fa4360e55824546925d0d9fd6d9b7b8779ff6be122b9d4dc9bd93d6eaee670841fff2b6936af45161894f24a7b5b3c70
+EBUILD dahdi-3.1.0-r1.ebuild 4792 BLAKE2B bf4e72f83f79ad4cb0ef3a751d57daf0793dae3a2a241a2151e9a787ae58f827552965ab9575bdbf0b350fb1607b36b89b93130398e65dead4f3743ffdb356fc SHA512 0d246b3cea8d7024bb07e9abaf616fc5017bbb4dabd290d3680bd670fc71aec32b3d6dfb5ad7dcd4efdf82afd7857e97350053d9bf455a2568a7c0c4d70a3376
 MISC metadata.xml 539 BLAKE2B a0ce99924eb45e3ab924bdf354a54b185775fdf86e412dd53b2f2ad00772376e7e191c9166b9417dc81d0e05dccdaa1e6eb1e72b937a8a125b948f023129624e SHA512 41033deb3d149daf967524383856a8e45eebfc6b6c721ae5a9bb6fcc18c5f1371e49f5f52f403ff9f192911c3345a52ae11b03b4d0fa1d3cf753ec5efd570c5c
diff --git a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
index 544cdbddd16c..8f9ab48a6f5c 100644
--- a/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
+++ b/net-misc/dahdi/dahdi-3.1.0-r1.ebuild
@@ -38,7 +38,7 @@ SRC_URI="https://downloads.asterisk.org/pub/telephony/dahdi-linux/releases/${MY_
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="flash oslec"
 
 PATCHES=( "${WORKDIR}/dahdi-patchset" )
diff --git a/net-misc/putty/Manifest b/net-misc/putty/Manifest
index 41ba145e4a98..d52408782071 100644
--- a/net-misc/putty/Manifest
+++ b/net-misc/putty/Manifest
@@ -2,6 +2,6 @@ DIST putty-0.73.tar.gz 2459115 BLAKE2B 594ad1ebd66bdb27ac8d297525c0c5d846f8a15f7
 DIST putty-0.74.tar.gz 2476513 BLAKE2B 3b3acd8ce1deb5d1659dd2ce77c9e7316e2c639c5f0e962c472b109afc1a54854d30123c4732f9b9e8ba28d9324508894faaa78f3b484c99c0063d1ea2f499b7 SHA512 0da86849ea764cd88643bd2c1984ac7211ae72dd7c41232307b1960a29ca9518044b022d87c60272d6db71a3357026862a112bedb90ee732b41494fca3acde9b
 DIST putty-icons.tar.bz2 4878 BLAKE2B 589f1bace82e3fd202b70bd35661d2ec4ef383363f8ae6716d4a6828bd822ef624b0acde39354d3d837e2d2bb49a34dbb89e031c64c520cbc675cad79813acff SHA512 4e419a71e26770e159221f6b516e7210d29272917b4b9a9e0b67c72e73508b97278e56c82111b02e106c5d513c2561fec6da372b4b18246f29372ae618ff5f71
 EBUILD putty-0.73.ebuild 1582 BLAKE2B 922b7caec11440dc2a07706c8bfd26de95cb91295311736a12df3135aec50873ed1d8d76a0d6dcb447747062b936bff790591a000e24c88dfff1fb895ccc727e SHA512 4275e021f15f898346445fd97563486b6489c478b39a67e106fd2d8d166b6a6036386158c5b42656390dc4743b4b58ec1396c4f76650ae9f83c4182b1d827aa3
-EBUILD putty-0.74.ebuild 1588 BLAKE2B 8945b86e6aeaad3e5c8d0ed2228a4acb873192e0c08727f11037f8ec6f81fdbd0d75c08a19a2bb722f9a90281b926e710a358400f737610b397614c12392daa9 SHA512 b245a8a467f4ede02ed71c185f2c6923bd12cc67db71ea234f982e907441491436c6bdc4d112f7224bb4728359c08071ccd91fc0197e35f91a1d0e24e847385b
+EBUILD putty-0.74.ebuild 1586 BLAKE2B 9d82e60d59e8fcb46d8934aa0138a0c4a4a4f6f5da925d7da22cfeb33736ad8f8cc5b744f7e89fe220bd097235fd579f91c618bab6ef51129f26c98f771d0294 SHA512 1ee2eaf54383f8ec33872dc49dcce9c5925f271dba7c5b1abc5416f6b59b86809ed6bad888d582670f8d45f68c94e277eae4ecd9fd50162fdd655c5ee434e39b
 EBUILD putty-9999.ebuild 1693 BLAKE2B 7f8e29cb9624afb649639374e42269c5e72dcb9eb329e1c40d0eac20bb7ca4a0d8bd903a2d71412eb81733167745fabe27f0699627f5f125a128fe1ade7107fa SHA512 16c7df06d0309f1d3c3df3119dcb72c842451e188203a67c2fcf7409e781f2faa9dcd76cfb31b40526b3d3a00ed8e6842d84727d264cac0374ac6aa036e9e505
 MISC metadata.xml 977 BLAKE2B b73c9f54eaa8d9cdb3e000f25ef6c1eece6a13063d6a646017d2b7c9ee4b91076cfc8797aa021a9148e1750a9f3f6bef9c9c5a5e0c86f6ba67a15a12dbbc4a22 SHA512 ff427f7d01ad2656f8b91937001d451e4c1f5154fd54e04715d82551accf12d6b430ef47c09cb567a03ef7ec644cdd277766a033e9063916ca6aec0922e60fa6
diff --git a/net-misc/putty/putty-0.74.ebuild b/net-misc/putty/putty-0.74.ebuild
index 07d0f147a344..37e2ab481dcb 100644
--- a/net-misc/putty/putty-0.74.ebuild
+++ b/net-misc/putty/putty-0.74.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/putty/"
 LICENSE="MIT"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ppc ppc64 ~sparc ~x86"
 IUSE="doc +gtk gtk2 ipv6 gssapi"
 SRC_URI="
 	https://dev.gentoo.org/~jer/${PN}-icons.tar.bz2
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index ba1902ce64c1..ffda615a0a19 100644
Binary files a/net-wireless/Manifest.gz and b/net-wireless/Manifest.gz differ
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index 71651588cdc9..cc4010c3c03a 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -4,14 +4,16 @@ AUX unifi.initd-r1 648 BLAKE2B 583d5ad1922c6eb83ba3b1388f6240107b4b0e1a479ebc463
 AUX unifi.service 435 BLAKE2B d982d8ae1f4bf2fa6affc149e0edf94e8471283b0353b370d9e95934a6d60d6b700cfdc302e489cafe74d128735b0188bfa4422f30295b267d104a455fe4f1aa SHA512 6dc1dd188515c30ad105d839a2112a75f925f3453cc5eb29b727adb2dbf8bdf53be62eab94b01dfdb483f135fef092c7b6235afd63c61a996efe2d87d4fa6995
 DIST unifi-5.13.29.zip 151004470 BLAKE2B 0980c012bddbbeb5d18d26ebc8427137e410577e22a9c49b799f0e8fa39343191bc361b9345919917e53ded5ff0af2b35fd71e48072a09d5533a5e89feb9a20c SHA512 01b9811e288e377aff727416b32d966af5cc7a45e0f03f08f8892c89ad40a1833f4150bc42d8732468fcd2242c790bcd62b343132149a868c0d95f38b9f17dda
 DIST unifi-5.13.32.zip 151006051 BLAKE2B d853a05c361b26a47f2b3e296a41d3086a05347f6384ff71b4e78d156d5a0a5309eb5bb0b05de31721a8dd21f917d0c5b87697a337ec096a1701640796defbb8 SHA512 f1258d4f8fa73f43385260245ca31ee5d159c99db005609a22b09cbe551a886ebf685069bf95be5a0609335fe9d7290bc04158eb2430bdaa238aa7a13da681ab
-DIST unifi-5.14.15.zip 152267634 BLAKE2B 7c691294d0f359153aab5f0c1df9eb06f15d6d9d7b5b98e460163222a41d4e46b9cbca0d58c0a754242abc57c4f5e6c9d2ed7d7a08b7a587e8424a0d0467f17b SHA512 6807298856a0c14ae2bd6009c167ed73bdaefe91c8c47e227e985b797263a76b2bcc7bbc040237e70ee0f6633060718fd23066bc622232aee14bf0a4f6938535
 DIST unifi-5.14.17.zip 154131925 BLAKE2B fe1adc4f244190b697243498dd542eeb7f13ba209f94d0ddac938e960da9c24ba47cff7a01fbfe0d90eca2bb2b4f43f86bbb765636c5a3267e6b21fff7a919a8 SHA512 1438718e441639fb9cd4112cabfd6e527e1dd401457d1c27c8320152bee289dd8ff2b21e16b63c9ae85ba8b350d396fa9f2f270ed33579f84d027d4962b2ee30
+DIST unifi-5.14.18.zip 154140102 BLAKE2B 2a75197698161316df031a15207c3d145e44a1e2d400a61ea548bcbc9d351be0dd8197b30c8dfd0c62ac08d77e64e65dc85fed4eddc3d0b078b01791eacf151c SHA512 aaa2f4149ffd7135bcdc1795ec483670c8d775038f1f816c0eab194190e0c449ffea79b10d385bcc6e4aaf86d50d7af845a68e83f3db7d41b2c07cdd025b7462
 DIST unifi-5.6.42.zip 63581448 BLAKE2B dc12149acc56587043b9f6c45a43327a9a067dda86127c60ad62a4681a0c8ba873435b60183989332f561fb52f71c7207480766ec23d9c0e892cc20c521a9819 SHA512 467c0ad284a84795537484f371867d851e67c7e396215d539a9705f17f374b50db4051121a6634d1944474a2474bdd75fca860ab00b48634a5d3e8749a122989
 DIST unifi-6.0.3.zip 222062487 BLAKE2B a411a6a35ca04fc8da4dd1cf4b481ae1205631df4ed4432f3060463564b69d54fc4d9737eda72b7e7a8526e674ca8964395fbefb4959d572cc7ba72398ffa104 SHA512 6442ee27ed0a9ffd29baabba2e87f4d0ec04b47cbdf0f35a23dfe5e50703232865b5c1c21b6136ec52071a1920fb17587034fede19a9f8237d40f6f44b0fe7d3
+DIST unifi-6.0.4.zip 222132269 BLAKE2B 6017c08bed2fe7e67e8963f98087f5547f8b203a9fc36bb5fa9fd2cf4dca872d65fea0314d084067f766cf171a3638be7c8101f5182adea00a78f3b56178b077 SHA512 3654c0b7aa5c60e5f52b731a08d3ae940299a7c4838c620fc8113948c66781d1b2b4ea34a3b32245b79528a5b811ac538591d294cd733b33ecc097b592f90c01
 EBUILD unifi-5.13.29.ebuild 1566 BLAKE2B f3518c77f5344023a9f219e5e01b501b0d1855879c06c90b7b89798059100e844325fe1cf42c09117049056d49df19723613977eb3f73da4a5845e403a5303c8 SHA512 b3d01a742500089913ceba14990b18cea9470be9413b753ae3ab17e4adbaf49a5575f4ffdbcbb97c7b369be3aff400a3b3cdcdf711d944dc3865f3844347cadb
 EBUILD unifi-5.13.32.ebuild 1567 BLAKE2B cbfbf056c1f98854bc1732b2b4c3204cc1f9b63f9a3fece1bf629047d87164d9b4487f39825e90f41a6cc4251985bc1e263ab1efeb297034d4316107e93043b2 SHA512 9e251af9c81088256c6bdd06a6c557f9a7cc10c4e6e48aa94e0a76173cd2dedca26886d3b52bc7d39b6a9faad30ebf5306d178803cdc8ba95bc2bdec8b4974d9
-EBUILD unifi-5.14.15.ebuild 1567 BLAKE2B 16561466e5bd3e390af407661b31ffa3feb81a0b5e84092cabd52300e7e5e7fc8981104730588e51f2b2a1de0049e8b1b1b2a9de35b3a95276d334f03156cc6c SHA512 5ff099c41cef65d88a259540e867b368db07f9e118bbad259d0e75aeea195dd2d53a7f3b61cd112165d881ee95991b19e8fe8c929e9d352c424d80ecd4eb3771
 EBUILD unifi-5.14.17.ebuild 1567 BLAKE2B e3eb49ff610d157777ab5e8d907fad641ea4969ba71fb4f428492bf90cc980259370ab4cfa5676f1acc087553386a5ecca375dc232d7a9bdac16a32dbd392623 SHA512 2fbe01cc54bac949f62f2462a6723b3081728a33eba9350a46394561b7a2a782ac65420008e6019bf4c93495ca78f38894ee9062fc2a2a1b45c4c9b66a658c99
+EBUILD unifi-5.14.18.ebuild 1567 BLAKE2B 3008c6d8f460a30a452cb1376b3e405fedbfb93156d5cf00d3a737e13886adb42e13c2a9e9e88bf157cd5e7d47fac833d5a653394ec1981a91b7f1b7cc125a6c SHA512 e0f2dfd906a4134dc836388ec029be8bb43ebb695723faf35c96f2eb18e4031481bfa36381240bd3c0b4131a5fb9c5e292615b8e242128ceb8c13e6965f2cfad
 EBUILD unifi-5.6.42-r1.ebuild 1667 BLAKE2B daea907c2b41f461f707411f8a68dba6cc9ec8dcd7577641d7554539fd5f191eb2684478fd9801bcbaec855e83b765ab4a429cc3bf876e7a42176fdac1eb26ff SHA512 a7001e6fb490e6ad20ea00a080bb76877c85741dd2142f54041afd71d2822684836ed8803bd74b6a8821da7b7e85e0cfb6d10b5294838ae49f08326b6e1141f7
 EBUILD unifi-6.0.3.ebuild 1576 BLAKE2B 077896506bdc39d0498006ffeb585d9b047698a55caac4c7fb8265f9200e9d1f80bed76ccb2890a1cbe1db1d3c73d1446d14f9f795050d6b0262ee13bf0202bd SHA512 ef804e82f040b40363987915662db8811aaff06cc07d9d93a3e8636885e92742ed8c047e46d1dcd11840caa92bbbfab1493c9db4f5d4986b90c53cb2f858ecdb
+EBUILD unifi-6.0.4.ebuild 1576 BLAKE2B 89dbcc27c438fd6261e0fc92f91a9b5ea9c573c12fe546abf062b4cb7ca0c4b32057d3af14a8648b2ec786f0bc582267610874d717ec7ae561b61956312753b9 SHA512 2f618b003fdc0f1063e16b24d70e9aa7235732d4b72ee31b6da6e7696313feee1323f60cc48f44d0eb7e060324b3ae14a67e3b9483d8adb1b030b35f2fbbe718
 MISC metadata.xml 683 BLAKE2B 830f1b290d1836708aebdb1200caed6120df7ca573173584cfac59ec7eb3e8e38be65e237535d722f215ebb69b8739cf900fb79cddb78e60a09d1cbb1ff222f9 SHA512 da328bd64dea83da1f7f2bfe3431701597cc6a9829b0e0a5ec82bb4167f2f57b144b9d9c77656da33dc9b59e0d53ac89e18be6f776ac4356151d331f020c4ae0
diff --git a/net-wireless/unifi/unifi-5.14.15.ebuild b/net-wireless/unifi/unifi-5.14.18.ebuild
similarity index 98%
rename from net-wireless/unifi/unifi-5.14.15.ebuild
rename to net-wireless/unifi/unifi-5.14.18.ebuild
index 22d2f71a0a01..1e572b0492e5 100644
--- a/net-wireless/unifi/unifi-5.14.15.ebuild
+++ b/net-wireless/unifi/unifi-5.14.18.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 # Set this var for any releases except stable
-RC_SUFFIX="-c3f8d69687"
+RC_SUFFIX="-ff62fc7d5c"
 
 inherit systemd
 
diff --git a/net-wireless/unifi/unifi-6.0.4.ebuild b/net-wireless/unifi/unifi-6.0.4.ebuild
new file mode 100644
index 000000000000..4339544fdca0
--- /dev/null
+++ b/net-wireless/unifi/unifi-6.0.4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Set this var for any releases except stable
+RC_SUFFIX="-d88cbf373712731c30d0"
+
+inherit systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+
+KEYWORDS="~amd64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/6.0"
+IUSE="systemd"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+DEPEND="app-arch/unzip"
+
+RESTRICT="bindist mirror"
+
+S="${WORKDIR}/UniFi"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Linux, Mac and Windows
+	rm -r lib/native/Linux/{aarch64,armv7} lib/native/{Mac,Windows} || die
+	if ! use systemd; then
+		rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r bin dl lib webapps
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	newinitd "${FILESDIR}"/unifi.initd-r1 unifi
+	systemd_dounit "${FILESDIR}"/unifi.service
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c3474c1e129f..eaf9bb5fbaa9 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/arm64/package.mask b/profiles/arch/arm64/package.mask
new file mode 100644
index 000000000000..b39613ac4979
--- /dev/null
+++ b/profiles/arch/arm64/package.mask
@@ -0,0 +1,7 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Sam James <sam@gentoo.org> (2020-07-16)
+# Failed build on arm64
+# bug #674346
+net-libs/osptoolkit
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 380f04de6f33..f426e82ea860 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Sam James <sam@gentoo.org> (2020-07-16)
+# Failed build on arm64
+# bug #674346
+net-misc/asterisk osplookup
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2020-07-11)
 # net-libs/libslirp is not yet keyworded on arm64, bug #732144
 app-emulation/qemu slirp
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 6755b394f15b..617e2bce775e 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,10 +1,6 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Sergei Trofimovich <slyfox@gentoo.org> (2020-07-11)
-# net-libs/libslirp is not yet keyworded on ppc64, bug #732144
-app-emulation/qemu slirp
-
 # Sergei Trofimovich <slyfox@gentoo.org> (2018-03-27)
 # dev-ruby/capybara depends on www-client/firefox which has no keywords
 dev-ruby/capybara test
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 363294f3b927..7a56a6afd676 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -725,7 +725,9 @@ app-eselect/eselect-php:fpm - Enable the FastCGI Process Manager SAPI
 app-forensics/afflib:fuse - Enable extra fuse thingies
 app-forensics/afflib:qemu - Enable qemu stuff
 app-forensics/afflib:s3 - Enable support for Amazon S3
+app-forensics/aide:curl - Use curl for http,https and ftp backends
 app-forensics/aide:e2fs - Enable support for checking file attributes on ext2/ext3/ext4 filesystems
+app-forensics/aide:postgres - Use postgresql library for storing databases
 app-forensics/aide:prelink - Bypass prelinking when calculating checksums
 app-forensics/chkrootkit:cron - Install cron script for weekly rootkit scans
 app-forensics/libewf:bfio - Enables libbfio for chaining file in file handling
@@ -2176,7 +2178,6 @@ dev-libs/libevent:debug - Support for running in debug mode
 dev-libs/libevent:malloc-replacement - Support for replacing the memory management functions
 dev-libs/libevent:verbose-debug - Support for verbose debug logging
 dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
-dev-libs/libffi:test-bhaible - Run extended regression tests (very slow).
 dev-libs/libffi-compat:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
 dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
@@ -7167,6 +7168,7 @@ sci-astronomy/predict:xplanet - Project predict data onto world maps generated b
 sci-astronomy/psfex:plplot - Build with sci-libs/plplot to allow diagnostic plots during processing
 sci-astronomy/scamp:plplot - Build with sci-libs/plplot to allow diagnostic plots during processing
 sci-astronomy/sextractor:modelfit - Enable profile model fitting, needs sci-libs/atlas and sci-libs/fftw
+sci-astronomy/stellarium:deep-sky - Install extra deep sky objects catalog (may affect performance)
 sci-astronomy/stellarium:media - Enable sound and video support
 sci-astronomy/stellarium:stars - Install extra star catalogs
 sci-astronomy/wcslib:fits - Enable support for the FITS format through sci-libs/cfitsio
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 70c89af3de17..0060733551a9 100644
Binary files a/ros-meta/Manifest.gz and b/ros-meta/Manifest.gz differ
diff --git a/ros-meta/audio_common/Manifest b/ros-meta/audio_common/Manifest
index eb4afa811849..f7b67df51f3e 100644
--- a/ros-meta/audio_common/Manifest
+++ b/ros-meta/audio_common/Manifest
@@ -1,8 +1,10 @@
 DIST audio_common-0.3.1.tar.gz 184749 BLAKE2B 3404c419962dc6bf22f63a36bf43cb8d7509244f84a2a3407717ee31f1be56e22e352e714310d69b9ee280d0aa1d13df3cdbcbb0a42a47f3d3408cb42e3ddfa5 SHA512 3accd7d0ff91ce70c643747ae0b4db4c11bbd6b93dda02c1934d23a900b6bf286e72461e296fe1e0d49ebadd99c3ca1b042db8feddc9cca2ae70a0caccea7147
 DIST audio_common-0.3.2.tar.gz 187214 BLAKE2B 12708d58c9ba28477f5f42866310aedaba66f647b20064b41675befe63f095a08b077e6082ec7969db7c626eb7576ac108c4a1f492083b3554b93ac0c56a6415 SHA512 bdd28e05f45b177c22e64bba168a722ff9b7bdf72f9b11a86bcc08ba7f9edfed83793f87aa5479354dff10a5834f13363f6986a63f60c0af965006b837df1508
 DIST audio_common-0.3.3.tar.gz 187239 BLAKE2B 2a7172a68d2a0561c4aa20923f3ed5682d41f6e09c1b7b7cedfd9c7ebf0f03302749355a6c36fdd6dd8c6cad5994e2fe0530e16a6514b6ca33269da5be907a73 SHA512 8cfd17ac065ce6379085183b07ca85299d7e2dc17077d41d1b690e72b707ce076d88e84b1fdf639e0290309f3ea19a7d8a1e185113c081f32a2372e1874b7036
+DIST audio_common-0.3.6.tar.gz 189612 BLAKE2B 536192cdbab9c205c17eb4b1f7ccb1864c2fcaa6b47747664a1fa7c077e747d6b7e01be1119a02333e1581bd865baffbd02b4e43569727645bd28f2f3ac36a22 SHA512 e36f7c52c4c9dcf382e65fe6de0b72729e76bca85230074e5cf3f0a74d7ec7e95c1aee14cfd7ee0d6075439efab04d66db946115919be664e8e94df91652e96c
 EBUILD audio_common-0.3.1.ebuild 481 BLAKE2B 0dfaf579db49de187b2674287fef12d87743d38a19c3af758b8e0b1f99cf4b5c05d6356b862f02df89c8f9e3ec180b5f5b17dfeed9c40487fdddec21c41d1507 SHA512 64d4687ca607063be973f2180e54fb41c4eee8bec6d6bac41d72f5c192e600e542223b012016a2143cd33741f7529293c613fca2ac6ad7b8ea6869d1017e5626
 EBUILD audio_common-0.3.2.ebuild 481 BLAKE2B 0dfaf579db49de187b2674287fef12d87743d38a19c3af758b8e0b1f99cf4b5c05d6356b862f02df89c8f9e3ec180b5f5b17dfeed9c40487fdddec21c41d1507 SHA512 64d4687ca607063be973f2180e54fb41c4eee8bec6d6bac41d72f5c192e600e542223b012016a2143cd33741f7529293c613fca2ac6ad7b8ea6869d1017e5626
 EBUILD audio_common-0.3.3.ebuild 481 BLAKE2B 0dfaf579db49de187b2674287fef12d87743d38a19c3af758b8e0b1f99cf4b5c05d6356b862f02df89c8f9e3ec180b5f5b17dfeed9c40487fdddec21c41d1507 SHA512 64d4687ca607063be973f2180e54fb41c4eee8bec6d6bac41d72f5c192e600e542223b012016a2143cd33741f7529293c613fca2ac6ad7b8ea6869d1017e5626
+EBUILD audio_common-0.3.6.ebuild 481 BLAKE2B eebd601b75b10c87008ae28681d37f4a9e9de0e03b0b668858bcd113aabdc259edcbae06f2eb067bab52e87dac42e527e9e3fcc41ef8207911a6e5026b5ec772 SHA512 d2cd51ebbcee3b13017daf1dcea20353683335bcf327cccf4b3c361c4e0c5de373928fa43cb703565efc63eb8d9bca4c14df6e8042701c9978454be0bf476bd1
 EBUILD audio_common-9999.ebuild 481 BLAKE2B 0dfaf579db49de187b2674287fef12d87743d38a19c3af758b8e0b1f99cf4b5c05d6356b862f02df89c8f9e3ec180b5f5b17dfeed9c40487fdddec21c41d1507 SHA512 64d4687ca607063be973f2180e54fb41c4eee8bec6d6bac41d72f5c192e600e542223b012016a2143cd33741f7529293c613fca2ac6ad7b8ea6869d1017e5626
 MISC metadata.xml 338 BLAKE2B 8dc3e58c3c56a7cc0d39ca8ac7c62cf4a315a6f3fc9ad8c1d36596fd7bde5f09f7baf8b6ff36de20b460d7049d792451dae7cc7ce22e5dc3da64b442918d9a35 SHA512 40fedee9626fb1f621315a3e0c25f469eb98b67a391cfbabcafd5971079b33f4c8d1bc61523b8c2e914d7d7b7a6ddb50d1071beff80f30d263fec27586c9c1a5
diff --git a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild b/ros-meta/audio_common/audio_common-0.3.6.ebuild
similarity index 59%
rename from dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild
rename to ros-meta/audio_common/audio_common-0.3.6.ebuild
index 55090b9ba792..7b4a06c34e43 100644
--- a/dev-ros/audio_common_msgs/audio_common_msgs-0.3.2.ebuild
+++ b/ros-meta/audio_common/audio_common-0.3.6.ebuild
@@ -5,15 +5,20 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros-drivers/audio_common"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin
 
-DESCRIPTION="Messages for transmitting audio via ROS"
+DESCRIPTION="Common code for working with audio in ROS"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND=""
+RDEPEND="
+	dev-ros/audio_capture
+	dev-ros/audio_common_msgs
+	dev-ros/audio_play
+"
+#	dev-ros/sound_play
+# https://bugs.gentoo.org/612980#c14
+
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/gazebo_ros_pkgs/Manifest b/ros-meta/gazebo_ros_pkgs/Manifest
index f5309efbd2b1..5b5c2c8b6703 100644
--- a/ros-meta/gazebo_ros_pkgs/Manifest
+++ b/ros-meta/gazebo_ros_pkgs/Manifest
@@ -5,6 +5,7 @@ DIST gazebo_ros_pkgs-2.7.4.tar.gz 1839281 BLAKE2B 3a8342465e69c6b7d986b6a9f04b42
 DIST gazebo_ros_pkgs-2.8.4.tar.gz 1853755 BLAKE2B 4551557629cb43e651714b2e1a6aca3b127cd769bad47144b1fb769138f5c15cee45ab012a6e695559f42dbd7b0989984a2c979abc8779f63f815f909ec4a411 SHA512 6595e06b1269e2cdf8850a040f40e59a9169cc0790e7b646ba025767a72fc4eabcacd069d1cd3f82b1ca66ff47811df117134323a10e409aa2fe8b9c1f812525
 DIST gazebo_ros_pkgs-2.8.5.tar.gz 1854305 BLAKE2B f82021144b788b5fe19269ad28e1970a5f932ec91f7afdc0e45c4870125138b51cfadd794c08b52836f21e9d07c026cda80656794201b606b11b344ae73847e8 SHA512 124af0cff7933ce61127fd3ea61261e94b154954586af420c78775a6e4c69a741402aa563cb8d12a6b0f8a794a3948533c0a01555b00546c7c89742e43b25666
 DIST gazebo_ros_pkgs-2.8.7.tar.gz 1860830 BLAKE2B 2d0bf4774b1eff0bc658baf101d3450e5d94bcf8603a6e012b8a62422eb6a6b32e3c00c82f2854182ff990cf5017c23dac02d645c6a634d9fdb34403870ffd20 SHA512 3326c88dd7145a5beeaa0bd9c19f6abc2fb5483cfff1748b01c8f137c7223ffef80ff0df5cd0a2cb255006eaa44eef60cc878b362eed4a1d9a43a1a09ad24eaa
+DIST gazebo_ros_pkgs-2.9.1.tar.gz 1861740 BLAKE2B 56569e73184c767abeea0ac6add8aa19bb70e66f3a41fe9fc5278e540759de945467372c7a0130acdb665924ab803defa22e148a36a624d08c39835dc110e208 SHA512 47510f97060d5434619948899b416a8136545b79cd112051543212abe8ce34a30c1f868c633a3f3288fd6c0ea775162daf2eea15ca539a352c9bdb55ee336b20
 EBUILD gazebo_ros_pkgs-2.6.1.ebuild 457 BLAKE2B f62b4dc6e86a8c1f6d0459da68d398663e954fc6508cdf4f876ef450bbe9da9dea5189a7f287c0a011ed6f29bb02311ffc243016c780352a710db0ee73e81e5e SHA512 b24783ce061b9089ad545dbf9b2f3b7c02be105afa65f6c252b8714020f6788847f3ab45bb57a1ba6a5ba79a3782b3f0033e5424ede03bf61f872b3c287cd711
 EBUILD gazebo_ros_pkgs-2.6.2.ebuild 457 BLAKE2B 0574045871c0d8611d2a8267b358cac6f8c16c4c6fd6b941747f052d56e089c52f6a202cb7106eb38525f8f6269389d367409fddd0f7cf1a273166c1e130352b SHA512 147db9137c88a3576f1c8177ee21aa0e2f85e882a8bd98dfaaefa82a382dd87eb817303263f1654f6dcd7bb033c83e20ddc47c4ed7d7e54ee0eeb7ca1f6a1980
 EBUILD gazebo_ros_pkgs-2.7.3.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
@@ -12,5 +13,6 @@ EBUILD gazebo_ros_pkgs-2.7.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5
 EBUILD gazebo_ros_pkgs-2.8.4.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 EBUILD gazebo_ros_pkgs-2.8.5.ebuild 474 BLAKE2B 1fb90d3daab12c908c09a5544904cda7e2dd286ca0a709e7e72767f87ef3e7865e95bada7b7731dcbb4ca885c70f2692ee0c1f6de4aca0b355a89679b4e3d23b SHA512 5f26eccebf978283b9041125d9c537bcab243309de4553625fee562af738367a27a797e9b1384864ed4863ba068225adf8265d8abce147781850ee1e40c1c386
 EBUILD gazebo_ros_pkgs-2.8.7.ebuild 474 BLAKE2B 80560ddcfb260376645180b552d88c75b453a9a213f04b46064ab267e901a170886363e1e3b04b65e84911e71f6ac065101109d84b69f710729b370a0ffc7554 SHA512 45232b40918af3620a2a558c9657dae11b94b1e140c0bd548e613ec1d755a01f500b3de3e79b2154e6800a36b1f4f5cd4ec0697a4938f7f710f94701f115c452
+EBUILD gazebo_ros_pkgs-2.9.1.ebuild 474 BLAKE2B 80560ddcfb260376645180b552d88c75b453a9a213f04b46064ab267e901a170886363e1e3b04b65e84911e71f6ac065101109d84b69f710729b370a0ffc7554 SHA512 45232b40918af3620a2a558c9657dae11b94b1e140c0bd548e613ec1d755a01f500b3de3e79b2154e6800a36b1f4f5cd4ec0697a4938f7f710f94701f115c452
 EBUILD gazebo_ros_pkgs-9999.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.8.4.ebuild b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.9.1.ebuild
similarity index 51%
rename from dev-ros/gazebo_dev/gazebo_dev-2.8.4.ebuild
rename to ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.9.1.ebuild
index b7ed4eb9139f..7e0af3ea0484 100644
--- a/dev-ros/gazebo_dev/gazebo_dev-2.8.4.ebuild
+++ b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,12 +8,16 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
-LICENSE="Apache-2.0"
+DESCRIPTION="Interface for using ROS with the gazebo simulator"
+LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
-	sci-electronics/gazebo
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs
+	dev-ros/gazebo_plugins
+	dev-ros/gazebo_ros
+	dev-ros/gazebo_ros_control
 "
 DEPEND="${RDEPEND}"
diff --git a/ros-meta/geographic_info/Manifest b/ros-meta/geographic_info/Manifest
index 574a5481f5d0..517aa3567b93 100644
--- a/ros-meta/geographic_info/Manifest
+++ b/ros-meta/geographic_info/Manifest
@@ -2,9 +2,11 @@ DIST geographic_info-0.4.0.tar.gz 26981 BLAKE2B fdc8f7335aa64cc50e33fc248bd1243d
 DIST geographic_info-0.5.0.tar.gz 27102 BLAKE2B 40d635f8fdd0fbb034649e03f8917f9f7be207a5e30ba3afb25bbbf3b24a83a23ec3d4a94ff9f91ececda46e8ea167c989552b414c87b3c448513f2ea72e4d40 SHA512 c6c4937a7c9873c071be9e3fc4fcdb99f831028dce93793e537f8819e2fb8633b995e7d46d7192ddc3457a3b79d27c54c3e0b6656af30e2daabf1f0e7dff9f05
 DIST geographic_info-0.5.2.tar.gz 27336 BLAKE2B f864d8b70b5b0d797cec81e25a25d0dd708bcc49c169f68216616d900b1d11918583f6f5ec4a919ad03b08ee86b2a36cde575c1054c58a93974d4c4faf6e2aae SHA512 8b512399ef61ebfb9816c613ed4fcde23ec52a9b4bbd1bb7268c8ec7fe03b1a157435fef17b8af72fdf88ce6ed0b9130473183402e0875a25eac0ac46df0d00d
 DIST geographic_info-0.5.3.tar.gz 27446 BLAKE2B 51463f872829224c618b1d37c3d07ba53ee00b4f3e48bbc202d9ab4abfe8db8148dbbfdb6780af5aaf36ab9e9a7dca973b603a22139a192a96f6bcef87fa52a5 SHA512 681aad5ba62363cf96255351e884c8ba8d3110571e6e97c9340f8d15f38183900c2a04e109416b4113a0a042ebd9cdb8fe075c507200dac06052b444f4212ab3
+DIST geographic_info-0.5.5.tar.gz 27762 BLAKE2B 9235911d6a2b010e47722268f5aa14b2bd10dac73bf4445bcd6585c5094947e9ea43ee2ccb6d6a3b0ae788d149fcc546e6618f0097e4bde32d69ed9baacbf255 SHA512 a1699778cd85960603435e7b7d46831c7c5ac4b57f4a06e9f394933799151a5ebf95c59bc109ca05eeb9376763aae8c77bc9150081c81170f1778730145910ec
 EBUILD geographic_info-0.4.0.ebuild 438 BLAKE2B 45e8f881af0ed2db60bd00e3ae61e66247e2c8fac76e5d0b52f12766c546bf80a50aa824553a6f1ecdecf01fef63e7a0cee516f1e475d7e5e90746bfdaeb8a75 SHA512 34357ce7cd6f42874a7a4a5690eafe0825b2df519d1f9450f8008852e5914644cfa3b910f9415b62b703bfd186204a87ad0c07d144747176d5f8ccd2d626f9d2
 EBUILD geographic_info-0.5.0.ebuild 438 BLAKE2B 2c81a7a04138de9d31630a588d08af76d933b7f93a102f7bc1f0768fddb01089a3f10c57d182f75082536bb4a8822628d172fcad8a1bc0c235801b932f51b9c4 SHA512 aad47f278ae7a562017c24225ccbad09de9aa35ea29590b55334184be38aaa2e7bdc01a5b0d73d0ee8cba1bfd39b6d703e8817a9a6236f45c325e1b525a29c23
 EBUILD geographic_info-0.5.2.ebuild 414 BLAKE2B 92ac06e08b463c313de9617e3beb6c04f8eff0e6a9438627efa5787fed42895359e3c58b00a74eb959d3b3abe2cc5ca91f25d30a0a265aad9d3b7248d3ea5ff8 SHA512 8b55635057e03e665d9557ac5626a120da37f6fba5db430edcb42cb3d92b889762cca3f2417e623b6285550a882bbd48e5282797cfb20123ea04966a32a61426
 EBUILD geographic_info-0.5.3.ebuild 414 BLAKE2B b9c92b3f4664d4de26ec786182467d1d0937f6b86855d9dd80568ce2393924d0fc89d8acce048c77aca48cdbde6c5de368000653b8306456996c3c43f9b9ae04 SHA512 82e9879459099f4da7e02bccc02d1cad3b392a7ce469cc002844df6f3b0182177fbb781a8fe425bfb20fbda20f23681a68f49ce3fbafe3311b207bfeb082e4c8
-EBUILD geographic_info-9999.ebuild 414 BLAKE2B 92ac06e08b463c313de9617e3beb6c04f8eff0e6a9438627efa5787fed42895359e3c58b00a74eb959d3b3abe2cc5ca91f25d30a0a265aad9d3b7248d3ea5ff8 SHA512 8b55635057e03e665d9557ac5626a120da37f6fba5db430edcb42cb3d92b889762cca3f2417e623b6285550a882bbd48e5282797cfb20123ea04966a32a61426
+EBUILD geographic_info-0.5.5.ebuild 393 BLAKE2B 1461d04b9a6f463bcc0f530c17994c80ea7e8933a67454d5831cc6ba3ca8ca086e87e29dbf83dc3ccf2851d2fd6ef60fcdc16d5941a1388f005bac993c9c124d SHA512 05412192d57b0c36727a4a85da2285ca2316b4df7a29a9db8de859bb92c31bd58c4f8fbc1f01377d91f05e114f838837e258041fd0061ec6527a90645e8f8ea2
+EBUILD geographic_info-9999.ebuild 393 BLAKE2B 1461d04b9a6f463bcc0f530c17994c80ea7e8933a67454d5831cc6ba3ca8ca086e87e29dbf83dc3ccf2851d2fd6ef60fcdc16d5941a1388f005bac993c9c124d SHA512 05412192d57b0c36727a4a85da2285ca2316b4df7a29a9db8de859bb92c31bd58c4f8fbc1f01377d91f05e114f838837e258041fd0061ec6527a90645e8f8ea2
 MISC metadata.xml 349 BLAKE2B f945481736db4b708a82107474a58d9dd6e805eae69557ea08bb80c9bff8913446618bd610ef7cfb69e84a88e6477de9fe4c2c86a1b693c7515114b78820ae1e SHA512 453f7929a678908957bfde47ef0816a11162200a6b5541850320d874b3419155c4efebae51ef2d1b542f73bb4dcb319fdd93098817819cad2a9cb74adf008918
diff --git a/ros-meta/geographic_info/geographic_info-0.5.5.ebuild b/ros-meta/geographic_info/geographic_info-0.5.5.ebuild
new file mode 100644
index 000000000000..e302db9ec89b
--- /dev/null
+++ b/ros-meta/geographic_info/geographic_info-0.5.5.ebuild
@@ -0,0 +1,20 @@
+# 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-geographic-info/geographic_info"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Geographic information metapackage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geodesy
+	dev-ros/geographic_msgs
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/geographic_info/geographic_info-9999.ebuild b/ros-meta/geographic_info/geographic_info-9999.ebuild
index 5505b905381a..e302db9ec89b 100644
--- a/ros-meta/geographic_info/geographic_info-9999.ebuild
+++ b/ros-meta/geographic_info/geographic_info-9999.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-geographic-info/geographic_info"
-VER_PREFIX=${PN}-
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
 
diff --git a/ros-meta/hector_slam/Manifest b/ros-meta/hector_slam/Manifest
index 40c14cfe6ced..68d2bc224843 100644
--- a/ros-meta/hector_slam/Manifest
+++ b/ros-meta/hector_slam/Manifest
@@ -2,9 +2,11 @@ DIST hector_slam-0.3.3.tar.gz 64368 BLAKE2B 8e046c9b69103c325004139528c12cba6119
 DIST hector_slam-0.3.4.tar.gz 64569 BLAKE2B 17795b9ed735eee07aaa7069c84c1d055ce1f505743c6a33dc8c4bdf96ea7b65174a0b0eeea9c312541769199818d546617917b672f6e38b8cb6e90aa661d38b SHA512 c256ddf199f2b516241a612fb4bf7ab3d5531da20e89293465dd4ea948260c420f7b9c853ce44f9a3c9a18eee882f4e2c80ec18a8d1daf2bfc9d1accf358241a
 DIST hector_slam-0.3.5.tar.gz 66002 BLAKE2B 6e370fedf49b450cd3dec77eb7a197cc13796d787c41a72d5bdf918661728e96ff9e388ab1f2c5cf64c13ff6e94e058fc4c8ba176307b63cc51b892c0183dd54 SHA512 7f61c6b0607295b6b96fb9cadbaafc7531013a0d7cfaab19630c14ac52cde8920376a57041577d2c9945130200ce5912ba331dd1e3d0f41297a928a34a45dfa1
 DIST hector_slam-0.4.0.tar.gz 66634 BLAKE2B 7d4798d4c247268d01a51a8d796441807f9243d074ccd4584b759da91779d8a565de28f18bd0d7d59b71e2710c71b39d7fafd4de5de8c6fbd8d3ca453788998b SHA512 1951a31fa02b042ce167367d94ab8a8f7481dc1eb3f6dc1c0f248f552ae8cf312af1ba9519eeefd3b24bed9b593a60b0734a23de9214ca35c48f7cc33ab5d437
+DIST hector_slam-0.4.1.tar.gz 66772 BLAKE2B ad6f5596ea1fca2ed68017534280a4d622179de8df4c039e95f3e87a0e591212944d65e4d507194eb33584f7f55cba4fe398b19f5a22bfb3afce1b2406d1635d SHA512 bd0932971114f13c41c6e346756f2c95cc0a9a011d11202792a6f837757a144355e05c3e7ed1afa574b743166a78f1a7855c5693b0c57378611e50c386c2483e
 EBUILD hector_slam-0.3.3.ebuild 700 BLAKE2B 3efa807828343a5834fc47362faa2b4c1f3cc01b85f9ccb4ef00c1d1183834e8a9ab506721a263e580071b475e3713045276dbed811394c4602599f96fde386b SHA512 3c4ffb1f767dab5ae7fd10be1101c8e112c104cbada5cd1a63fdcd500965369453b530f2350c4d85705ef73316c21f89a128b18bf2156b613fb4e6051b1c161f
 EBUILD hector_slam-0.3.4.ebuild 700 BLAKE2B 3efa807828343a5834fc47362faa2b4c1f3cc01b85f9ccb4ef00c1d1183834e8a9ab506721a263e580071b475e3713045276dbed811394c4602599f96fde386b SHA512 3c4ffb1f767dab5ae7fd10be1101c8e112c104cbada5cd1a63fdcd500965369453b530f2350c4d85705ef73316c21f89a128b18bf2156b613fb4e6051b1c161f
 EBUILD hector_slam-0.3.5.ebuild 700 BLAKE2B 852abe958ff85f3b3a7192e2fbaac518d07bf3d060d573c246da8f37b087bb59bf5616af225b9b441699ff9a60d1ad438b69695104b01192cf8dd38de1e3d85e SHA512 0d63c6c2db3c125ab69283ef7c8a7e3e840675ff78c4b0b499d3ae78eb3560fb17cd82bfe3d95a01386e76970f30927793ef2f043dcb052af63ccb6080c4e14e
 EBUILD hector_slam-0.4.0.ebuild 697 BLAKE2B 72d4e7a6b434e97203f022aa51428280e5d7988994bec1e10ea4ce2d700e6f07ecc8a882ca688bfb1ad3564e91ad51fc7860fa71c2c9e4f458583c2b88cab213 SHA512 24a4103e1a23f2dc7f24cd02ef38986da3db452b859b2e1d218f40b987241dbe035ccaa84d527b09afdbb9cfae7a0f0ba699ad25e3980db870c177f95429c654
+EBUILD hector_slam-0.4.1.ebuild 697 BLAKE2B b9c0353ef638456eb6648c1dcdce556dc4728bf24499e9b65be0a5680489ec5a0eb16c28462f0cbd3f2c5af631b52f8f02e21a6bde83c9d1ddcac18bc1ec9e40 SHA512 ae964bb32777ae9c841d647a7a80c4aec83b5a0f4f5f5b69a74612157c621cda870acf73447a2d3c1e3cf34df48b426d33565be586a7450ace2233b9e7c8fa6b
 EBUILD hector_slam-9999.ebuild 700 BLAKE2B 3efa807828343a5834fc47362faa2b4c1f3cc01b85f9ccb4ef00c1d1183834e8a9ab506721a263e580071b475e3713045276dbed811394c4602599f96fde386b SHA512 3c4ffb1f767dab5ae7fd10be1101c8e112c104cbada5cd1a63fdcd500965369453b530f2350c4d85705ef73316c21f89a128b18bf2156b613fb4e6051b1c161f
 MISC metadata.xml 346 BLAKE2B 2c19759ef75680fbdf13a2782c7ab61ce35df604fdc577f03e538cf599ab5bdd8c18c3abb14411c19148d96b086efd7f1ce4c851243085ecf5a429c20d0eca88 SHA512 7e8f72ba74709122f67811e4d0945757dd30c8bc266d95198293260631d0d0eb2063d19996e6dffa4e0184f5bda1e3bd44b6bee6956b58dcebc6919ff64199bb
diff --git a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild b/ros-meta/hector_slam/hector_slam-0.4.1.ebuild
similarity index 57%
rename from dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild
rename to ros-meta/hector_slam/hector_slam-0.4.1.ebuild
index 192819a66ee2..05427f438ab6 100644
--- a/dev-ros/hector_slam_launch/hector_slam_launch-0.3.5.ebuild
+++ b/ros-meta/hector_slam/hector_slam-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,16 +8,23 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Launch files for launching hector_slam with different robot systems/setups/postprocessing scenarios"
+DESCRIPTION="hector_mapping and related packages"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-DEPEND=""
 RDEPEND="
-	dev-ros/hector_mapping
+	dev-ros/hector_compressed_map_transport
+	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_imu_tools
 	dev-ros/hector_map_server
+	dev-ros/hector_marker_drawing
 	dev-ros/hector_trajectory_server
 	dev-ros/hector_geotiff
-	dev-ros/hector_geotiff_plugins
+	dev-ros/hector_imu_attitude_to_tf
+	dev-ros/hector_mapping
+	dev-ros/hector_map_tools
+	dev-ros/hector_nav_msgs
+	dev-ros/hector_slam_launch
 "
+DEPEND=""
diff --git a/ros-meta/image_common/Manifest b/ros-meta/image_common/Manifest
index 8dbda69fae0f..be02bab6551c 100644
--- a/ros-meta/image_common/Manifest
+++ b/ros-meta/image_common/Manifest
@@ -1,6 +1,8 @@
 DIST image_common-1.11.12.tar.gz 53920 BLAKE2B 296601a14b0e18e6685924ae4557ead446a95ac91ddffb791f9b0b4d643b8f9e40c17f8ace1a705bb5193647bb07444ac81513c888864b0cdd9b45464c14916c SHA512 cd64edd658092c88060a99bbf2cd501cd27441123c34914fc4c8d8c8a8a1fe6d4a929211e71d813b6eb72e1d844842ee3e12567bc40d32981db9ee430e61fb10
 DIST image_common-1.11.13.tar.gz 54731 BLAKE2B 24c05d7da79ec4edc1713eb86efe9d570b8a9d55def1b0cdf7959275c4a0692af28d48d37d73361f3972c0f4ded5332ee02b535f1841473007eb8e61287b7826 SHA512 154a1acfc3ee1be83828f7b86de8a5e02d7613d724f734409c5b93b1505bcf911b95f20fe43435932f49e03e286ed7055e2b7abeb1c5292f540a2299dd424bfa
+DIST image_common-1.12.0.tar.gz 56174 BLAKE2B c364c060f4ba025b8811514602df934c028f39e22089c3dbaa71be3db891d7a769ecbe0c58c683128d1111ff377530aa6de8c48ede35f8b39301717ce581526c SHA512 bdd382b676673459ee28bd63ca695db893099796e8b025dd9519c7e07061a7dc0f62cd76f72b0d73aebec063c512c03fd420ab5f3982a7496409863826a2aeb0
 EBUILD image_common-1.11.12.ebuild 472 BLAKE2B 5bcf14fe7eba10b5374330a41b98c9b4c0611f6aa7fc5733bc15ab96c637c8b33fd5a6a250f5327090516d0a72a8ae3ecd190e256dd332953a0e43f5eb043816 SHA512 80ca91f848331615a4ecf9e6f29c433028a41685cebdf24b825601cd00fdaab9b13d20db421ba55c62ed06d778f2ad9e5d8280c10b783a8123487a5334ec4fc8
 EBUILD image_common-1.11.13.ebuild 472 BLAKE2B 5bcf14fe7eba10b5374330a41b98c9b4c0611f6aa7fc5733bc15ab96c637c8b33fd5a6a250f5327090516d0a72a8ae3ecd190e256dd332953a0e43f5eb043816 SHA512 80ca91f848331615a4ecf9e6f29c433028a41685cebdf24b825601cd00fdaab9b13d20db421ba55c62ed06d778f2ad9e5d8280c10b783a8123487a5334ec4fc8
+EBUILD image_common-1.12.0.ebuild 469 BLAKE2B faa4b157847ce421882aa87294a45bb22b591d8e529e1628e418dbad5d8708aab22acdd1cd0bad4413c39bb6f3e2a0034f0270a98880ca4b64a4ec123abb4ad5 SHA512 b555acf8009a5c880e99a152f95e07128696eae6240d842cf2c0cfb38df2a2c082a1dba31fe0e8d3de1731a189bb8041c1330ec9596c619d3a6ea1eb37f35dfb
 EBUILD image_common-9999.ebuild 472 BLAKE2B ded50681d4814aacc97a0b4c5b851f44e3a83a56ee082b2f4f29c168f0b62023b996fbeacceef4dd882fa113f32b6be50c71c5cadf316fb316e2590b45c43184 SHA512 0e6c4b53301754fa45961d92fd5df39b077ae2d608006d0db10020e2a45380b567d1fd97eea3004a6c7f0d771c11ce6bf2593a839c2865006a947f7f0b5c7340
 MISC metadata.xml 341 BLAKE2B 73f546b8575b2b9855e3ed642d08ea3a9eb37be2e5b1b33b797ec4df9ad248d82681d857794fec592081101c0e285b8a9d2bfa1343ceed1ae336c2960c471eb5 SHA512 a7d57b99968b03ed5fbad1030f9dfde65d31c3b33fd3203c9bfd004f331e35b6f576f9dde7e3694360204d27c02fe95879743191cb8d96d491827708a61b1e69
diff --git a/dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild b/ros-meta/image_common/image_common-1.12.0.ebuild
similarity index 54%
rename from dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild
rename to ros-meta/image_common/image_common-1.12.0.ebuild
index 5aab9a74a94e..f2b62f109fad 100644
--- a/dev-ros/camera_info_manager/camera_info_manager-1.11.11.ebuild
+++ b/ros-meta/image_common/image_common-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,17 +8,15 @@ ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="C++ interface for camera calibration information"
+DESCRIPTION="Common code for working with images in ROS"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
 RDEPEND="
 	dev-ros/camera_calibration_parsers
+	dev-ros/camera_info_manager
 	dev-ros/image_transport
-	dev-ros/roscpp
-	dev-ros/roslib
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=
+	dev-ros/polled_camera
 "
-DEPEND="${RDEPEND} test? ( dev-ros/rostest )"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/Manifest b/ros-meta/imu_pipeline/Manifest
index 126c7bcae4b4..6ee19d2b9775 100644
--- a/ros-meta/imu_pipeline/Manifest
+++ b/ros-meta/imu_pipeline/Manifest
@@ -1,8 +1,4 @@
-DIST imu_pipeline-0.2.1.tar.gz 7962 BLAKE2B 4af64db84fe96d70d2c61f8c16375bb28faac9c5630f3cad8c94ef9f87c5b17e302313a2511442b8c810e2ac589a733d6b333b2111b579c06559befaa5e9e1c6 SHA512 43c990e3b5a813661111f15bbaf6101794480de0f5bd9af663ce48ebbcf75ee79fa388cf228216427e7ffcbc575a317f3b0ee3ae5b8e6cca2cc0cab736c139e4
-DIST imu_pipeline-0.2.2.tar.gz 8080 BLAKE2B cdeeb7b95cca23aa7c30902b3be3daa34af222ff660058c1e57cf02b75008d4840b82cb52dbf7fa9a2968b2e41244fe7f1833429bd04280fdf68fb7fff2d240d SHA512 95913f3edec9af4d981d6034beb8932bba2e8a4d05a72c70c1bf2bcd5b85a9afa490e2916b6e4178e35b6a1967208999bfb697f5925ce12cae7e57fad2721f3f
-DIST imu_pipeline-0.2.3.tar.gz 8143 BLAKE2B 0ec49f17dc3058b5cb70c293d3c36c7f7de4866b8e0b9fe421f90da86f9645fcdf9736f88aef32a982228e1dddce1f968af297beb7386b89e02e134ca3ff1c82 SHA512 db58c71bac9d85b7e3ec5268545dd0281307f012cc9e8a6383d187f4e378395c6f4290e392d97b6fc61464c29e4c4e2d00dc8cbfb659461a1a771fe8f59de575
-EBUILD imu_pipeline-0.2.1.ebuild 454 BLAKE2B 2520d3081d294da816aa95d90b6e39eef7ca284eefb9e152167e5e5f912e856ed6a6d3c8dc261ed05892982379fa45969f8c709534f1bf94afd6b3870f2d2664 SHA512 84fc531db2ed5642b26cf881248e5acd19d962d2a2cbd602bc0fbf7af448e5440e2a3834c67f773be9e01a4f754edf4df75afeba1942c503b69ede35e835b4e0
-EBUILD imu_pipeline-0.2.2.ebuild 454 BLAKE2B c123fbbe741cb439269df420bde6b8d163f58e8badf1e28393a5e6b2d86594dac5ff9d9a5c7381aa0a5b36d0b65418538bc45f301769ff7d350f8694703eb0b2 SHA512 e114c827c107f7c115937bd78e7f01f01a467534b6c9ad75ccacc205d51341b0172f4ac707fbcec5055c5929942997c49c86196046d48d2982841192419eb6d5
-EBUILD imu_pipeline-0.2.3.ebuild 451 BLAKE2B 53c5094b9dcf6f90b33f1e5a51cdaf368d687327e42ba803fcbcfb8da6949a2da2ea4c69cadbf36ffb0f6f9506b6ad0dc540e5c90f9fb18c5c6b2641592b520c SHA512 9dc24a26b9f7f64172d48ff23bc48787c3a24cce9e124b21f88743a533af4d49ce26e203ec1e2602b526fd0cd1fd6d0a871f4d00a5370d672f32b34096067ccc
-EBUILD imu_pipeline-9999.ebuild 454 BLAKE2B 2520d3081d294da816aa95d90b6e39eef7ca284eefb9e152167e5e5f912e856ed6a6d3c8dc261ed05892982379fa45969f8c709534f1bf94afd6b3870f2d2664 SHA512 84fc531db2ed5642b26cf881248e5acd19d962d2a2cbd602bc0fbf7af448e5440e2a3834c67f773be9e01a4f754edf4df75afeba1942c503b69ede35e835b4e0
+DIST imu_pipeline-0.3.0.tar.gz 8162 BLAKE2B 09bfcb10bc49691418e23fbde26203769857b9c6b0631beaa51c09b5abc599c7988a0c582908a392b12cffaf3a488c0863450922aea18c68906fc0c3da46119c SHA512 b6b18c559fa859b5c1534bef96d1d4cd15c34c9866045dc2e32f82981189515c003ac90e197a1ba85c785870e34865318481bb7941a82f643a08266213026b4b
+EBUILD imu_pipeline-0.3.0.ebuild 432 BLAKE2B b217c21f2ca2e457247e3a13e2b10dfd6676fbc9fc30f9ac966e472f3ded8ab9a0f1f5f4cdfa081f87bb50c696880111292116939a9202b7cb0411f1bec77990 SHA512 86890744c9408e51b614ec8a15f184c4a02798f6d46013ec5c38a56a7cd10fbcf99325751d92c80f5991a257855d7a7bd04d3834de29bf2b9519d0ad64656a86
+EBUILD imu_pipeline-9999.ebuild 432 BLAKE2B b217c21f2ca2e457247e3a13e2b10dfd6676fbc9fc30f9ac966e472f3ded8ab9a0f1f5f4cdfa081f87bb50c696880111292116939a9202b7cb0411f1bec77990 SHA512 86890744c9408e51b614ec8a15f184c4a02798f6d46013ec5c38a56a7cd10fbcf99325751d92c80f5991a257855d7a7bd04d3834de29bf2b9519d0ad64656a86
 MISC metadata.xml 341 BLAKE2B 25a24a32562bee0499af4b1e1a59341a7087ae303f179dc1f83b7b67c16f6fb6d9c835eafeaf6cd006e5ff9bae9d6ccc661ea2319656532436e4b6b093231f20 SHA512 37ef287b9a99e47b966f647c2ec1690bc6339f2f82047a1cefecd138ffe388ac2900c744999385c86dd9819c2664ac89b36ab64dcded0d2358aa703b16115761
diff --git a/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild b/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
deleted file mode 100644
index 5ba8ef323c11..000000000000
--- a/ros-meta/imu_pipeline/imu_pipeline-0.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/imu_processors
-	dev-ros/imu_transformer
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/imu_pipeline-0.2.2.ebuild b/ros-meta/imu_pipeline/imu_pipeline-0.2.2.ebuild
deleted file mode 100644
index 985ec5ed92d0..000000000000
--- a/ros-meta/imu_pipeline/imu_pipeline-0.2.2.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/imu_processors
-	dev-ros/imu_transformer
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/imu_pipeline/imu_pipeline-0.2.3.ebuild b/ros-meta/imu_pipeline/imu_pipeline-0.3.0.ebuild
similarity index 67%
rename from ros-meta/imu_pipeline/imu_pipeline-0.2.3.ebuild
rename to ros-meta/imu_pipeline/imu_pipeline-0.3.0.ebuild
index fd664943697e..1441847f0e98 100644
--- a/ros-meta/imu_pipeline/imu_pipeline-0.2.3.ebuild
+++ b/ros-meta/imu_pipeline/imu_pipeline-0.3.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
+DESCRIPTION="Tools for processing IMU messages for easier use by later subscribers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild b/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
index 5ba8ef323c11..1441847f0e98 100644
--- a/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
+++ b/ros-meta/imu_pipeline/imu_pipeline-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/ros-perception/imu_pipeline"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
 
-DESCRIPTION="Tools for processing and pre-processing IMU messages for easier use by later subscribers"
+DESCRIPTION="Tools for processing IMU messages for easier use by later subscribers"
 LICENSE="BSD"
 SLOT="0"
 IUSE=""
diff --git a/ros-meta/mavros/Manifest b/ros-meta/mavros/Manifest
index 4d53d2c4987b..2de6b1dc97e9 100644
--- a/ros-meta/mavros/Manifest
+++ b/ros-meta/mavros/Manifest
@@ -1,4 +1,5 @@
 EBUILD mavros-0.18.7.ebuild 399 BLAKE2B 2b9791130a58cdbceba7bc50417717b80bf44180ef1940e084b1383e01ec9f1aa9d423524efa0da389f64ac74f6153cdfa263faab5326c37ff2ca04ddde06866 SHA512 040f87347f89294dc3ec58df8760535ced171a508903d2377a27744f3882ac366220e598f60cad8a0d74f2e3177a3d945da8cb8b90272c1478cb0f2ea081d22b
 EBUILD mavros-0.19.0.ebuild 399 BLAKE2B 2b9791130a58cdbceba7bc50417717b80bf44180ef1940e084b1383e01ec9f1aa9d423524efa0da389f64ac74f6153cdfa263faab5326c37ff2ca04ddde06866 SHA512 040f87347f89294dc3ec58df8760535ced171a508903d2377a27744f3882ac366220e598f60cad8a0d74f2e3177a3d945da8cb8b90272c1478cb0f2ea081d22b
+EBUILD mavros-1.2.0.ebuild 396 BLAKE2B e78c7f8015d982b3c8be3926df44e8da546f951da984d85270c8f891e5f2d58d2525b9f0ab2da42bcce95a3c8ce36e0437ca72831d492dd80beeb795592918ac SHA512 e37f4f24b24cdc7972ec7e7d44de89ed7969d656d620a06c2c76f30019dbfc339c34a6469c6c11ad7b88647ff35f9f0d1ed03819997e895cb11488047cbc978a
 EBUILD mavros-9999.ebuild 399 BLAKE2B ec9646a918df59a5106e4e1705f52140104b282b78ff5da460d66c45c99e516f7dcf64d2c7a1acd95a440a5d1f4b40c8c84b36c6a15789dad5fee32c591cb71d SHA512 59922bed84ca47a7af5e48de42966fde2d1890984c0fead907eb89b6d0ceaa4561a142ebe5844247a2e2dc8190f4ed82b1a8242ca6e2209d2dd877414a4ec5ae
 MISC metadata.xml 249 BLAKE2B 05e1e70021900498f37045733d9cf72175655cc72ef45d5cc5593c6fe6c04bf8a1895a6b40470e31ba15254dbf2c0e71dca9da3e1a7e7a0c76ffea90ca518f82 SHA512 f6c1880cb315572548c1cea0233124f8dfb99091c9dff06484f02847e4a6ab4bbecd627f2d561ef3d666c99c240195031294d170024fd2549dec228b7058bb71
diff --git a/ros-meta/mavros/mavros-1.2.0.ebuild b/ros-meta/mavros/mavros-1.2.0.ebuild
new file mode 100644
index 000000000000..1d01e705dfd5
--- /dev/null
+++ b/ros-meta/mavros/mavros-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DESCRIPTION="Metapackage for mavros packages"
+LICENSE="metapackage"
+SLOT="0"
+IUSE=""
+HOMEPAGE="http://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"
diff --git a/ros-meta/pr2_common/Manifest b/ros-meta/pr2_common/Manifest
index c50b221d5b4b..cd5b7a44e480 100644
--- a/ros-meta/pr2_common/Manifest
+++ b/ros-meta/pr2_common/Manifest
@@ -1,22 +1,4 @@
-DIST pr2_common-1.11.10.tar.gz 33338874 BLAKE2B 8f504aaf9ba2fc3d2d07f3e93b30c54e22fc68f8702f3f214fb52e5ad137add256a2e991c86cd1d140bb0f8e98613fdfaf93998d093c0e1a2185cfa82d544f60 SHA512 64288085fe0ebd02941c6da4f3cdf02f65e84f2ef99a6748d9b614d7aaf2a692229f67a175e81a1954dc42e6cb3e430cdc23c54df81934ad6698f019a3cf3748
-DIST pr2_common-1.11.11.tar.gz 33597551 BLAKE2B 87667f3011e3cf8a786fb1c045647cb5f454832ccc8bad22cadc33eaf67c7b5d7562e653b1d42ae5344521118f85857c3afb0603f250e3ee9588e1ba583ab673 SHA512 fd1fdfc142ff3013c41f406bcd65001daa8a1fde30bbdcd825e88d6c624850cc8893a6cfbfd6c4d77cfa8ec3716fc851ddb326fe1ed0625a28f2bd57fc92c42b
-DIST pr2_common-1.11.13.tar.gz 33598596 BLAKE2B 19aab42e80f1bd18f337d935c4e496cd566b8bd70eee3134b5a28bae8eb93d101bc388c0d01066572a532562b06a05661f2e1f2da205414e772ccdbfef76a5f4 SHA512 4366b6893c262c54e5ad5fee967698e6a335f1ba2a48a0196e8b6f2907058d0fad929bd9c4d6b5f20aa4669980c02067c81cf402dcf42ab98d67b35205373987
-DIST pr2_common-1.11.14.tar.gz 33598683 BLAKE2B b5658b42fabe0a3fa506f740610f0977f6b386f2b79789eb595985e27079e0e06668e21b582b88c4e9f9d2364ff176b4f9f2ec2b30ecbfb43224f9888ced3645 SHA512 c34a82f72aa0c64c7c2abe36af5ec02c73e4bff161e105d3f8cfd65a460688b4fbd3e4529109546bf525c4703706054f522f74a9c9b352939c5582f064bbf2bf
-DIST pr2_common-1.11.9.tar.gz 33337556 BLAKE2B b743f4fcde9b3688d3630ce42e5f194fd3a4aef40262aa8da61cb6337b50770d50e10ca4097f5f14104dbc99555b815ecd9ff14daa9ba7878cfc2e26bb85c8ac SHA512 44eb4f802a7b6983b621ca5b2c1c0e2516f16992f35902c2fb4afbdc9ffc8e63c1ed647f4ef09fd4cbeef747aba133a55172cec64c3cf9d759d2c83f7ec8a213
-DIST pr2_common-1.12.0.tar.gz 33598910 BLAKE2B 3c44fe6ba6214d0c35ca674f5433a89bb6ba703bf5522615bd67912cb077f7ebf1eb9239fa8f076dc4bd813f89fa341617301ac873166ddbd43243d8e5001661 SHA512 da933ff9521a9337198a890e0ba10281510b861b4bff3023e7d251251f7ef7f8579f86b2992238975329c5c63ecdf00b17e895f1e0dec4e180336860fdd0c921
-DIST pr2_common-1.12.1.tar.gz 33597926 BLAKE2B eef3676b2ad029514aef09c09b4e463246397c2fd605b60bdba355e54ce44b1248efe6eef02e0303fd347f8c9b6b8965abafccee07b1f77e70f6e7db4a12a5e5 SHA512 e74be6f0507b1a7ae0fa385a06ff0a960661c5f0ec723bd7ac6d4782d4a61e3b4a95fda5cd09b37ed62ecf72be7c9c55132d3967644211c957c224717bc15485
-DIST pr2_common-1.12.2.tar.gz 33598279 BLAKE2B e381e14b965d675a7cbf14a652f633514dfe72a4bf1d7b8808164da79c7cba63b47b405c8b57482a20a3b6284f0f5f957df1f97ea4699a4c0888936d2d4930a5 SHA512 29794f7ea5aaff0082ec9496f1b29bc7a1ea71694993a03832b039c655f3ba29cd322db3665401b2a1b5715d0d6793d19a7ab93f7fe5e891369ead5fbefed95a
-DIST pr2_common-1.12.3.tar.gz 33597275 BLAKE2B fbbfa933bea8ecd18b988e5bce1c31365718a97ddbfcb698bb901066eff1191293e377d97a3174b501b07ff5f3011b00d19c0843a63e5777a2b5fb6ee4b559cb SHA512 423eb73634a0c2ab9b4f89a902a7dbb8e416f80815e591ad8fd24de4b92c8b7ea0312196ad0697d181fa6157603b082645590d0cdb7216186e4c5cba27fb68da
 DIST pr2_common-1.12.4.tar.gz 33597360 BLAKE2B 0591c2842720015b6a1ecbbe4fd01b4b0a4d9e2cc07641dabe024b998772f6c963c1bfa73b90d63520da425c9833e49a5c3d58785bf569d86819408616b3c3d0 SHA512 35bd91fdb296b3704f026a1e65d5bf014ce040819b0258210922898348bb8e18d5acacc59a947cadcc7266b7c83a7852f57e12a799a788cc790e434c5192f011
-EBUILD pr2_common-1.11.10.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
-EBUILD pr2_common-1.11.11.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
-EBUILD pr2_common-1.11.13.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
-EBUILD pr2_common-1.11.14.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
-EBUILD pr2_common-1.11.9.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
-EBUILD pr2_common-1.12.0.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
-EBUILD pr2_common-1.12.1.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
-EBUILD pr2_common-1.12.2.ebuild 464 BLAKE2B 294148d725203f8daa604d596c2daa10f0dad8f11bfc1fa602c45784df7f7d68c2120b8d97a2ee8ba5fb18732815576ab1c8c793fcf683a8e77621538bfef2a4 SHA512 42972118902b27a1f5ebd183cad5721ee2eba6a833cfaae3c919cc892909fb2ef0ebf402f4cdd4d0b4166d73d32458e98570daec31fee9512caa4fa90941e6d4
-EBUILD pr2_common-1.12.3.ebuild 461 BLAKE2B 23105ca80af40f9f9d3c0f7cd28e1953f9b5a770430d80d8505af20a22d5458186eb8c1cc7d749b2f2adf9036aff37e25cbf50207f6b780858ef6a1fa5aa847d SHA512 a79d5fca98df427fceead6643132e118c75d7d1bc2236d5f08ae387bf34c7e626d49ed3b051ac8004d3a39a820a7b2a8f0cec34898edf26290335e02623b793d
-EBUILD pr2_common-1.12.4.ebuild 461 BLAKE2B 2d7aa7c21e5662c0e75fffd0d7527462702f59838cd5ebe2d7860c6add22add5a09f0dd86a4081bf89b20734ecf88541de0cd88efa1c1f4d6e1594e4784ed9d9 SHA512 48e923779bc59c5cc4e0b151e65976842731281475de448d4eedf2834fa3017f8666fddb74bad063a8d983bede3d2582a111fbb632dab53a8fd04a433f8d6ea3
-EBUILD pr2_common-9999.ebuild 464 BLAKE2B b88782b2d79c3d00b9f2d980a7535f447670f001448ca2236f403239aa57e8e235407428786618934eade09d9f99d3859652aba7a946cba2cbde6353808feaaf SHA512 b48a1b893a214a50d8c7517fc178abb6f443a0f32118b1018e70b4e9a7e507713435eafcc13dfd5895f8fd86df1df0471963726f9eaeac90bf131186351a44ab
+EBUILD pr2_common-1.12.4.ebuild 461 BLAKE2B aa1aee2dd0c0860a0496e9f4c6d09ada8bcf2fa82ce06720b5e0ded0a11993a8dbaad23120b73641577a7de9a07000403fe8a25fd15a6d4493ba89f30a376dea SHA512 b8c7a02657171f3409e324acbadd53828effc444482ba5d670849a4a59d1ba9a35dcc41531dbf692c20004beaf911bdcf2480f486b2be6eb259dd8dd5c57f3e5
+EBUILD pr2_common-9999.ebuild 461 BLAKE2B aa1aee2dd0c0860a0496e9f4c6d09ada8bcf2fa82ce06720b5e0ded0a11993a8dbaad23120b73641577a7de9a07000403fe8a25fd15a6d4493ba89f30a376dea SHA512 b8c7a02657171f3409e324acbadd53828effc444482ba5d670849a4a59d1ba9a35dcc41531dbf692c20004beaf911bdcf2480f486b2be6eb259dd8dd5c57f3e5
 MISC metadata.xml 328 BLAKE2B 2d51f6fac18e20274b308b8de5aeb2ad80a4b118697ca1c93dc5c0350e8a7ae2e7c14d7a84692d0b7fb5da114e4fb7ad39d93d7d5831c5a09589add99aa5f6da SHA512 2f52806adfce77e7d54809d57a0b8b59b26f25da96f50f10672ed76ce8bda8e4555f1531af953e61cd1cfa82d46d46a3760b12b537ffcc191407125604abcbbc
diff --git a/ros-meta/pr2_common/pr2_common-1.11.10.ebuild b/ros-meta/pr2_common/pr2_common-1.11.10.ebuild
deleted file mode 100644
index 0dea22ccc2dc..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.11.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.11.11.ebuild b/ros-meta/pr2_common/pr2_common-1.11.11.ebuild
deleted file mode 100644
index 0dea22ccc2dc..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.11.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.11.13.ebuild b/ros-meta/pr2_common/pr2_common-1.11.13.ebuild
deleted file mode 100644
index 0dea22ccc2dc..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.11.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.11.14.ebuild b/ros-meta/pr2_common/pr2_common-1.11.14.ebuild
deleted file mode 100644
index 0dea22ccc2dc..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.11.14.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.11.9.ebuild b/ros-meta/pr2_common/pr2_common-1.11.9.ebuild
deleted file mode 100644
index 0dea22ccc2dc..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.11.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.12.0.ebuild b/ros-meta/pr2_common/pr2_common-1.12.0.ebuild
deleted file mode 100644
index 0dea22ccc2dc..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.12.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.12.1.ebuild b/ros-meta/pr2_common/pr2_common-1.12.1.ebuild
deleted file mode 100644
index 6fb5878a99e7..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.12.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.12.2.ebuild b/ros-meta/pr2_common/pr2_common-1.12.2.ebuild
deleted file mode 100644
index 6fb5878a99e7..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.12.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.12.3.ebuild b/ros-meta/pr2_common/pr2_common-1.12.3.ebuild
deleted file mode 100644
index 435b325d5dd6..000000000000
--- a/ros-meta/pr2_common/pr2_common-1.12.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/pr2/pr2_common"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="URDF description and 3D models of robot components of the PR2 robot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/pr2_msgs
-	dev-ros/pr2_dashboard_aggregator
-	dev-ros/pr2_description
-	dev-ros/pr2_machine
-"
-DEPEND="${RDEPEND}"
diff --git a/ros-meta/pr2_common/pr2_common-1.12.4.ebuild b/ros-meta/pr2_common/pr2_common-1.12.4.ebuild
index 3d40e56c016a..d232737e2c1e 100644
--- a/ros-meta/pr2_common/pr2_common-1.12.4.ebuild
+++ b/ros-meta/pr2_common/pr2_common-1.12.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/ros-meta/pr2_common/pr2_common-9999.ebuild b/ros-meta/pr2_common/pr2_common-9999.ebuild
index 0dea22ccc2dc..d232737e2c1e 100644
--- a/ros-meta/pr2_common/pr2_common-9999.ebuild
+++ b/ros-meta/pr2_common/pr2_common-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 ROS_REPO_URI="https://github.com/pr2/pr2_common"
 KEYWORDS="~amd64"
 ROS_SUBDIR=${PN}
diff --git a/ros-meta/vision_opencv/Manifest b/ros-meta/vision_opencv/Manifest
index c829db78e750..4d1204e77e8b 100644
--- a/ros-meta/vision_opencv/Manifest
+++ b/ros-meta/vision_opencv/Manifest
@@ -3,10 +3,12 @@ DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836b
 DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
 DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
 DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
+DIST vision_opencv-1.15.0.tar.gz 82281 BLAKE2B 6e86cf67bb9fbf07ca36dbe0bb3fb32611a4e216cea209048bfe34b71622a56954063f2e7ff466275810f36c62d016a1d04e987383dde35f0bb85abf0e74350f SHA512 b6331b00aac18f96eb40ef57b2b4fe55da956007390549762818eab7ad36fcf192549448f2edcc6b4e550273f80320bf15eb6a60900d155be680ec8682fd17ba
 EBUILD vision_opencv-1.12.4.ebuild 436 BLAKE2B 590bd444dad902d93cc4ff69ef33c2a4851617336cfaa1efa655b0a17fba4a4dd3363b1e4c34b599702f18a7e55508d12b3cea870a5ca0bb8bf4e3e1c58d226b SHA512 f41c65160b2dcb8795c8c0d9bd9a1173a43be54546c79c84d2dea93ae5da17b321e2a7ab8fdf7aa7fbb33b869bc0884194154960e3b01872aa338fe7efbbfd89
 EBUILD vision_opencv-1.12.5.ebuild 436 BLAKE2B 590bd444dad902d93cc4ff69ef33c2a4851617336cfaa1efa655b0a17fba4a4dd3363b1e4c34b599702f18a7e55508d12b3cea870a5ca0bb8bf4e3e1c58d226b SHA512 f41c65160b2dcb8795c8c0d9bd9a1173a43be54546c79c84d2dea93ae5da17b321e2a7ab8fdf7aa7fbb33b869bc0884194154960e3b01872aa338fe7efbbfd89
 EBUILD vision_opencv-1.12.7.ebuild 436 BLAKE2B 590bd444dad902d93cc4ff69ef33c2a4851617336cfaa1efa655b0a17fba4a4dd3363b1e4c34b599702f18a7e55508d12b3cea870a5ca0bb8bf4e3e1c58d226b SHA512 f41c65160b2dcb8795c8c0d9bd9a1173a43be54546c79c84d2dea93ae5da17b321e2a7ab8fdf7aa7fbb33b869bc0884194154960e3b01872aa338fe7efbbfd89
 EBUILD vision_opencv-1.12.8.ebuild 436 BLAKE2B 5d7e1ef1602bd4e78f9b56178027d9f468190d6dda1e4c691770b5ab66b92ac8bd964a7300bf3295873ffe48008ad7a5c015c5b7ab35955ce21976135459c72a SHA512 078236647370ad97f37406071f6f2259e2bddeb222e5ebc6268083d3e3fd183cd5b65945abba551fc9f7c16549e6b04486df690eb060e61ebb70a970daa2a83a
 EBUILD vision_opencv-1.13.0.ebuild 436 BLAKE2B 5d7e1ef1602bd4e78f9b56178027d9f468190d6dda1e4c691770b5ab66b92ac8bd964a7300bf3295873ffe48008ad7a5c015c5b7ab35955ce21976135459c72a SHA512 078236647370ad97f37406071f6f2259e2bddeb222e5ebc6268083d3e3fd183cd5b65945abba551fc9f7c16549e6b04486df690eb060e61ebb70a970daa2a83a
+EBUILD vision_opencv-1.15.0.ebuild 433 BLAKE2B 35712891cc21cf42ab1d0429a87c4253a7b9093059c963a06e1181b1b32d5f0004a50c381bece4a0da945b12dbac3181c458879e3be5e857dae413d1c9ff961c SHA512 535e71ff21beefb2551e09d7fe2c55697a7bfeb78cda2ea25d97f2d5834e3f80393ad623e4c2fd418ddff7e2bd4d854aff2c2bd12c5847725bcda1c7728be7cb
 EBUILD vision_opencv-9999.ebuild 436 BLAKE2B 2db92c28d14147bdf9c7bad981e63254b67f9fb1071abb5387046f7ad30430b12ea359e085c93fbd6c5fc7d5aef258502ca7aad78516b2ea9beae820c24ea1eb SHA512 2252646af841c499f15bad0461db95ffab030988e0dc73cebbc42890690bff9c9855c0d87716fa5a682aa10e9bdc12811a1c3e92191db2a938fec109fbfc689b
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/ros-meta/vision_opencv/vision_opencv-1.15.0.ebuild b/ros-meta/vision_opencv/vision_opencv-1.15.0.ebuild
new file mode 100644
index 000000000000..0fc25adc338c
--- /dev/null
+++ b/ros-meta/vision_opencv/vision_opencv-1.15.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS Image messages and OpenCV images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/image_geometry
+	dev-ros/opencv_tests
+"
+DEPEND="${RDEPEND}"
diff --git a/sci-astronomy/Manifest.gz b/sci-astronomy/Manifest.gz
index 9ee8434ad921..f5fcc2ab4a47 100644
Binary files a/sci-astronomy/Manifest.gz and b/sci-astronomy/Manifest.gz differ
diff --git a/sci-astronomy/stellarium/Manifest b/sci-astronomy/stellarium/Manifest
index 4ffd101004aa..714220d9a92e 100644
--- a/sci-astronomy/stellarium/Manifest
+++ b/sci-astronomy/stellarium/Manifest
@@ -5,6 +5,9 @@ DIST stars_7_2v0_1.cat 305710678 BLAKE2B 1cc9b4a6bc35a9339e495f7e0da4f7e90a0e92b
 DIST stars_8_2v0_1.cat 559068934 BLAKE2B c040a369cdf6885759998e1315b554d21a5e2b9b149a67967a8af45606aebf57bec407fab5ce1904978af0dc529aa6bddd267331ca45f58617bbf56d5ca99dee SHA512 06d4fa298b9dff8452f550377df99fcaa5e7107cfc7b75c9a4769b3cb6d97a822a54213c706102c1d7ef2dabc16df32a85f46b2f6d6c6f76a4e919353b739de4
 DIST stellarium-0.19.3.tar.gz 326218851 BLAKE2B 286d2559a2152f030640ed88778f57f1213d0d8b9e990d0aa1ad5138396fe9641083ec76554e1296dc79d914955e289d23046af42299df6217bbfbaca76b2f18 SHA512 c2948603a3b84fd2b7002cbd9993a2432ca0908d9236aca03c03ff0cf0706728a407218096e94da2b2a623b5434c109906d94ee5069a2d57a8e35af7c8455ff7
 DIST stellarium-0.20.1.tar.gz 343991703 BLAKE2B 59580dd2bca885893bfc68faaf966a727e3d7c0774f59726e23cec132cbfca4ae518983db2e52d4d3d3f1ec96c7ce876168bb23959178ebf212ee6bb357299b3 SHA512 685a306391dc681cc21834a226e35c769e11909f625ff7461d7e896ba412ad595871e93c69981b342099f46829f9f3ef3e276be867dc5ea5523fa60a99cc21d1
+DIST stellarium-0.20.2.tar.gz 344319520 BLAKE2B 0a64cfc6d5a43bf811609caa9104458768e234bad8fabd2aa88a38d860c22573d076f677f7523c95e1fc1770e73dc1e73b2e94d544cb099c7cd9a21ac79f6bdb SHA512 34f1ad5891dde84b53324046bdf1514df858335ba8f0954bb72350b057ff6dc4091a2d7bf89083489e0d8d1c750c5fb8ba8e1e241f9287a740121b377f0e510c
+DIST stellarium-dso-catalog-3.10.dat 28297970 BLAKE2B 69d8f9756986c872cde0190ae3e5f225de30d8fabd5ba3e007176c8ffc4234e964ccc3beb58f75fc4579c75cee620661728a7c6c1d6960d5cb1be027828ba127 SHA512 22068d9ebca592db214f9831765701c52d07e71616705faaf6f5827d51a65af805947bd1f84553e5768f3e82f9e1a0e81eb36943713afb924d604a4676711b1f
 EBUILD stellarium-0.19.3.ebuild 2232 BLAKE2B c1361b4194d0f838fa3b46f79854ec77ab415fad392c6b0ad19c77f9a7bf8f965101c2526c8b88e72d9b5c4cdc8f4795b588ea025887f0ad0f6444d1d33cabe5 SHA512 469ed98be0cd3637c5b77b22e81db860cfe503c03b60c414e7ee9ca63bf9ca2fa63d6eac68163052b13b2cbedede72ac9c85ed5f09c4ed0d02e4bc8a339022af
 EBUILD stellarium-0.20.1.ebuild 2233 BLAKE2B 9e5228c4a7ef23f2382ba71d02bac61fbbe995f07f49a26d4621ed0cfad22271289a05811c4662cb1a35e38aa047e9186143396e1c472652031aa4b4720b8564 SHA512 911ad306134ec38383580d9e677faae00cfca79824f98d3db046cee9bd84339d5fed0cebf969e7efd6d00e0c18fd6803db96f233f76621760ac5f01ab2404ba5
-MISC metadata.xml 1004 BLAKE2B f5e3c9d2641b2cededfb9ac848a72acbe0949d5fec6bba73dcce51fcfb2f83e711e5036d2d7a4be6dad6bd357e2a243776ba185c572e655e6c0fc00321d16453 SHA512 9da973b4a8b3ca85c19b9f0a07f21b625f28ce242de061a2ef2c14c8f36f7ce58b335abc82ac9e639fba1b72c6a513bc886df42ed961c8a711f7205d5333c05d
+EBUILD stellarium-0.20.2.ebuild 2567 BLAKE2B 9b969d8444d2af4180cd71b4f5a1344fbbe715ec36667ee5b04ea1b6eaca43bb8beb14b101a89a5c2fd3c464d330065fcb3501cf72a9ddda5c3304b982626d9c SHA512 5ad4577374080a646d4c2bdda6f9899a949897d09a4e121ff6edcc35c8be4644a57ddab6a39176a84d459666a280aee53500ef02512927ed5cc72da1467bf0b6
+MISC metadata.xml 1101 BLAKE2B acb5d8968e42487806e9df0d300c8070f8df139855a0caf0324504cd5e49c9ee5e4446b6e029a88ad3e38320179adac30d414aa96a569e327bf6cb391ed10e6c SHA512 14e3d4b82b5f7c5f4c28078df0b4295fd305813c045c1f6c7262fe30181911fca5fae728d822048ba154fd7ed8f92b9c1965a8d10e75d51da825ff4e2db3cbb9
diff --git a/sci-astronomy/stellarium/metadata.xml b/sci-astronomy/stellarium/metadata.xml
index 2e00add2cfd9..53378dcf2286 100644
--- a/sci-astronomy/stellarium/metadata.xml
+++ b/sci-astronomy/stellarium/metadata.xml
@@ -20,6 +20,7 @@
   projectors.
 </longdescription>
   <use>
+    <flag name="deep-sky">Install extra deep sky objects catalog (may affect performance)</flag>
     <flag name="media">Enable sound and video support</flag>
     <flag name="stars">Install extra star catalogs</flag>
   </use>
diff --git a/sci-astronomy/stellarium/stellarium-0.20.2.ebuild b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
new file mode 100644
index 000000000000..b9d232ba2566
--- /dev/null
+++ b/sci-astronomy/stellarium/stellarium-0.20.2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop flag-o-matic xdg virtualx
+
+DESCRIPTION="3D photo-realistic skies in real time"
+HOMEPAGE="https://stellarium.org/"
+MY_DSO_VERSION="3.10"
+SRC_URI="
+	https://github.com/Stellarium/stellarium/releases/download/v${PV}/${P}.tar.gz
+	deep-sky? (
+		https://github.com/Stellarium/stellarium-data/releases/download/dso-${MY_DSO_VERSION}/catalog.dat -> ${PN}-dso-catalog-${MY_DSO_VERSION}.dat
+	)
+	stars? (
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat
+		https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat
+	)"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug deep-sky gps media nls stars test"
+
+BDEPEND="
+	nls? ( dev-qt/linguist-tools:5 )
+"
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtopengl:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtscript:5
+	dev-qt/qtserialport:5
+	dev-qt/qtwidgets:5
+	media-fonts/dejavu
+	sys-libs/zlib
+	virtual/opengl
+	gps? ( dev-qt/qtpositioning:5 )
+	media? ( dev-qt/qtmultimedia:5[widgets] )
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+	test? ( dev-qt/qttest:5 )
+"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	cmake_src_prepare
+	use debug || append-cppflags -DQT_NO_DEBUG #415769
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GPS="$(usex gps)"
+		-DENABLE_MEDIA="$(usex media)"
+		-DENABLE_NLS="$(usex nls)"
+		-DENABLE_TESTING="$(usex test)"
+	)
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	# use the more up-to-date system fonts
+	rm "${ED}"/usr/share/stellarium/data/DejaVuSans{Mono,}.ttf || die
+	dosym ../../fonts/dejavu/DejaVuSans.ttf /usr/share/stellarium/data/DejaVuSans.ttf
+	dosym ../../fonts/dejavu/DejaVuSansMono.ttf /usr/share/stellarium/data/DejaVuSansMono.ttf
+
+	if use stars ; then
+		insinto /usr/share/${PN}/stars/default
+		doins "${DISTDIR}"/stars_4_1v0_2.cat
+		doins "${DISTDIR}"/stars_{5,6,7,8}_2v0_1.cat
+	fi
+	if use deep-sky ; then
+		insinto /usr/share/${PN}/nebulae/default
+		newins "${DISTDIR}/${PN}-dso-catalog-${MY_DSO_VERSION}.dat" catalog.dat
+	fi
+	newicon doc/images/stellarium-logo.png ${PN}.png
+}
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index e2ffbd57c029..db744f60461e 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/clustalw/Manifest b/sci-biology/clustalw/Manifest
index 7ef31f389a4c..120c149b9b00 100644
--- a/sci-biology/clustalw/Manifest
+++ b/sci-biology/clustalw/Manifest
@@ -2,5 +2,5 @@ AUX 1.83-as-needed.patch 388 BLAKE2B 8da98e05dcdc74ee41ff7a3d75b11590507bc769df0
 DIST clustalw-2.1.tar.gz 350761 BLAKE2B 479acb42ec0b0adee8e04e99132a782c947a1261f48e674c6a11e4f38e44e5709d03f0c864f0cd3cf7eb4faf76a36b6121c3e3d3573c86ee3895971df07f1a58 SHA512 659cfe0121015dd2b84578b1a0a7f016fc944de155686b9bdef31122200a21e792203f3a6ab93a31676a50ffb70858b506ceb7ac27d921189a8381dbe0887921
 DIST clustalw1.83.UNIX.tar.gz 166863 BLAKE2B a3b1eabad8bc736cde4655f13fa8544759b7b5c50ea97fd45ee0be45ac6c361db5ced8ad21622ac2530b57c37c77dfd67657afd2c411acbfb7ff2a3ba014637e SHA512 c0cc9ebf4c8869be819065546b499b547990342c87425fae8f921a141704343f2a518ecfc2b8bfd527061902825fc5befcb2cd080c83ba887390e48338c9dc1a
 EBUILD clustalw-1.83-r4.ebuild 815 BLAKE2B 9a887de5a2a1e96652d260963e13c9aca786b684ee2a9b0c02adba0b2fbfcf0f500f5edabaf4469b2e5ff13b3cf445245d59010b5f8a50e9d830d636f0f76699 SHA512 c884a8fb3029e7834299217c6db91da4f3430c738ba346dc7c3431695c235852c830151452ec534f1c1e59aaff5fbd4bb2d1030ed7779f30a675cbb30d76c218
-EBUILD clustalw-2.1-r1.ebuild 477 BLAKE2B f7a835b23f6c7907e739579429808bde6f7ae298f68ae08eafd9ed727303ccfc2242c6578ed3ef97fa12dd892aef9621be6e8b7a79d27047284953b661f362ba SHA512 e980f77edd95a9020350434935a6b61084cc4b86ddc2b752b4412dc5849ad048b577b3a6585d9c18cddaf9c02fad8e6540fb4341909b59684a63559b43a0f2cd
+EBUILD clustalw-2.1-r1.ebuild 482 BLAKE2B 4957249989b126c546dd581bcc19c2cb1b3f28a6a42b14648b1c2268d122a5dd717b1496e6939b747446039745beadb2bb553fcf826087adc345c6298c1d6a23 SHA512 d6407ce39c005c9f3fc677c9501f1d14984c45092fa6872e7e47ddfa687e72aeded4356f0452c13ac000a45e88988b48b1072ceb1bdeb06da96ed13dadd61456
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/clustalw/clustalw-2.1-r1.ebuild b/sci-biology/clustalw/clustalw-2.1-r1.ebuild
index aecb3a2ca822..033b3794e812 100644
--- a/sci-biology/clustalw/clustalw-2.1-r1.ebuild
+++ b/sci-biology/clustalw/clustalw-2.1-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.clustal.org/download/current/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 src_install() {
diff --git a/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild b/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
new file mode 100644
index 000000000000..65db138fee55
--- /dev/null
+++ b/sci-geosciences/GeographicLib/GeographicLib-1.50.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ classes for performing conversions between geographic coordinates"
+HOMEPAGE="https://geographiclib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/geographiclib/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/19"
+KEYWORDS="~amd64 ~arm"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+BDEPEND="
+	doc? ( >=app-doc/doxygen-1.8.7 )
+"
+
+src_configure() {
+	econf \
+		--disable-static
+	# Automagic deps..
+	sed -e "s/SUBDIRS =.*$/SUBDIRS = src man tools $(usex doc doc "") include cmake/" -i Makefile || die
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sci-geosciences/GeographicLib/Manifest b/sci-geosciences/GeographicLib/Manifest
new file mode 100644
index 000000000000..e7577b69b4b4
--- /dev/null
+++ b/sci-geosciences/GeographicLib/Manifest
@@ -0,0 +1,3 @@
+DIST GeographicLib-1.50.1.tar.gz 2463854 BLAKE2B bed7d003dee92e794af993d8fef6cbf1233f9e3f37f53dd6026f16a237dba46bb4d4e2db7adea7931b632bb419288c9731c79cf65f15a4f35e95e8ada34a8f42 SHA512 1db874f30957a0edb8a1df3eee6db73cc993629e3005fe912e317a4ba908e7d7580ce483bb0054c4b46370b8edaec989609fb7e4eb6ba00c80182db43db436f1
+EBUILD GeographicLib-1.50.1.ebuild 681 BLAKE2B baf824caf5142d9491de3aec3c6d04b6f6d9ba8e0d3a432f693b2d5b456bc3871d71556bdc18168453443807a740b0cd4eabd884606b804e64723c721065c36d SHA512 da5adf122a846ad28c0890163048d728ce8e14b261c002165888e84282ae40b6cf2d478d80ab793792795907eb24a71e38bb1df1b4fa175dd366affc2955a46e
+MISC metadata.xml 249 BLAKE2B 05e1e70021900498f37045733d9cf72175655cc72ef45d5cc5593c6fe6c04bf8a1895a6b40470e31ba15254dbf2c0e71dca9da3e1a7e7a0c76ffea90ca518f82 SHA512 f6c1880cb315572548c1cea0233124f8dfb99091c9dff06484f02847e4a6ab4bbecd627f2d561ef3d666c99c240195031294d170024fd2549dec228b7058bb71
diff --git a/sci-geosciences/GeographicLib/metadata.xml b/sci-geosciences/GeographicLib/metadata.xml
new file mode 100644
index 000000000000..74ced8bea005
--- /dev/null
+++ b/sci-geosciences/GeographicLib/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index a385f8a86900..062292181431 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 038e0dc4c91f..66c50e5acd8f 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/proj/Manifest b/sci-libs/proj/Manifest
index 2b4f034efa61..fd44159aa82b 100644
--- a/sci-libs/proj/Manifest
+++ b/sci-libs/proj/Manifest
@@ -7,5 +7,5 @@ DIST proj-datumgrid-europe-1.5.tar.gz 187195036 BLAKE2B 0f88922435793930e21ace84
 DIST proj-datumgrid-europe-1.6.tar.gz 189057258 BLAKE2B 66daf2341b05d8d5f929f6d67e1913656c2380a3663b4359cb97576ff5954dbea5890862869bb1077f6cde760dada4d9f13201c5b2c29ef3458a8b43089e459c SHA512 463d2575d5ce6f5984e69897c34ef80ec31a77f5ba00a07a5f55e97c3033dbae40b7d17891e5495bc47e6faf917968b1cdb7b3be9b2a4838e3b093b74753c2a8
 EBUILD proj-6.2.1.ebuild 1118 BLAKE2B efc31b3a18898c9fbf064d556a51b660bfabb2db0d08352d01367a2f1c88376d993dfeeee67556d5d65b57e22997e150a9ab80b90d497bf7d2a65487ea8b1108 SHA512 88101056c9660c8c088fc05592fbcb7c258c837aaad55971f4d7939c1ae79b51bb5069b963b8c6cfbedbfb4a54a0b9ce7324c6b056a8f4883e01e273b5bddde4
 EBUILD proj-6.3.0.ebuild 1123 BLAKE2B 27a3e1372aa2c62063b16caf2d9479d8d67092f9a6e3a0f7a1a3f7f2b52bb08694a358567d36fb96c8c4a5e1fca3ef24f8eded6834f3a0f9c787bb8ba3d204f1 SHA512 7f4a6c73f17a96e95848a81be7c3821deae554719db75ae02649b2430bb5b3e73b1c27e80cf66841820c59de825a9caed11d39c707c29d988641554db7787872
-EBUILD proj-7.0.1.ebuild 1224 BLAKE2B a34b37a7e721cf1711f294ff91ed351d727d0325fc6f3aa348f16196700ca423ed34a4d8c762278f4918b41d1b1d412d1bfc6e509ff7941ec91a5316ece3cb80 SHA512 665874582615997300f6b28312149b922ecbdbd3cac6ee9cffb8d878b231e303578c637c206d7bfdf1cdc732f4f7599f51424940bb2896d63759b3dd6e6f965d
+EBUILD proj-7.0.1.ebuild 1223 BLAKE2B edeed3ff75922aec6db998385225f3bbd02544e5459459b5d77fd94e6d7ce492a4b0f2a9cf5918922076db76e0cadec634fc9042f8a3c5adba55b15566f7bd35 SHA512 f98ad366b42526069a29177a1ae3b3695a8e57f0fa624ad71f5a6edeb5ac4b1084570d0147b982e6f3ab983a45129b6045ba7b381245ba17f13a9f72046af803
 MISC metadata.xml 513 BLAKE2B 4068b4ddcb4e95578df8da19650ab86b4dbfdba294a3d03f10ada37a578a2113b0d71720545c269b1c097d3a37dbc66ee0cdfe61889466171c109413088707fd SHA512 e841ea4fb30d3632fecca7d584121fce35dff2b23ad8a1feeb98a47f0a3b1d78f57a05b0d303aeff47f981f5b7feb831deb14644ab6615644c0a8593a6e321b3
diff --git a/sci-libs/proj/proj-7.0.1.ebuild b/sci-libs/proj/proj-7.0.1.ebuild
index 5a90105f20d9..c27e655b2747 100644
--- a/sci-libs/proj/proj-7.0.1.ebuild
+++ b/sci-libs/proj/proj-7.0.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0/19"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="curl europe static-libs test +tiff"
 REQUIRED_USE="test? ( !europe )"
 
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 8a28c49d03f8..2bd65f9b467a 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 9c5fefe5d250..f0f51534629f 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -2,5 +2,5 @@ DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 EBUILD diffutils-3.6-r1.ebuild 1220 BLAKE2B 1d3dfa6fbeee65cd45cc0d7e49c508e6803ef8fd3fcba26f58b22ffece28a74d8847ab08faf2065f8ac5b3b73fb1099d7499c8b750bc0d57e1d27b3f32849f02 SHA512 5b6d7e50235b5d7329c13bddd1e08c7aa2704c98490f25ead15c211e6c0cba133ec29fc699e040ac52703e568be9e009424ca8dd39bb3f855b37dcac24bb1463
 EBUILD diffutils-3.7-r1.ebuild 1211 BLAKE2B 4a6067268d3e69f134778ab71dd8ce0da91e9b105d2fca2fa5feb178d72cf0fa6e7d638ed79eecbaa5b5a583c36aa1c6e784929c6acf9203df957d2241c4b681 SHA512 02f812b34699d509be4675630209bee7e48170fbcb389d0411edf96c7c410d56140ceaa258e9b81bcf3ccf4b64d9c93dc9bd0d4a65f632288708c25cb3dde79d
-EBUILD diffutils-3.7.ebuild 1222 BLAKE2B 40a13dae1e7f824c26d95e5ede3a33c6f2c681d594e00944b3488575e5140be3c088fdbf188daa71d82a8d96d8281531713cdb86bb517b9de2a6319051459454 SHA512 6a0236a9020fbb227f8cf7f1267498f1ba2286fc0abf1b9450990f8f57540f45d0982145e7eb7d81524462e3d900c401a68b73664fba2e16cea4029ca6ccd38a
+EBUILD diffutils-3.7.ebuild 1220 BLAKE2B 1d3dfa6fbeee65cd45cc0d7e49c508e6803ef8fd3fcba26f58b22ffece28a74d8847ab08faf2065f8ac5b3b73fb1099d7499c8b750bc0d57e1d27b3f32849f02 SHA512 5b6d7e50235b5d7329c13bddd1e08c7aa2704c98490f25ead15c211e6c0cba133ec29fc699e040ac52703e568be9e009424ca8dd39bb3f855b37dcac24bb1463
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild b/sys-apps/diffutils/diffutils-3.7.ebuild
index 714221e2a387..ad6055ecdcc8 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index a4e6267aa40c..58fb72293333 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -1,9 +1,11 @@
 AUX dstat-0.7.3-skip-non-sandbox-tests.patch 705 BLAKE2B 3a20e75fd1aaed47d02066b7c889c13b4e1d8a2f8fd9772973d99736eb7cdf1fa9b8c04126beace166a6ac65de5de8743b904e9fa20d60a3aeae706f7ca41d18 SHA512 efa1c6a807efc7fabf8566ec446be94922e1fe78191101648dc066f107474f1b89c4c8cac51d6d1ba7d4b1061ce0358abf317761ce52199479667da1684f0929
+AUX dstat-0.7.4-fix-csv-output.patch 888 BLAKE2B 6aa25d7b7c2fed6986be55bf5802692ca6fd9d982d9b0a819983fbff3745c5aaf12667bd0e5cd2e385c8f4583273feff2744ba015b04fe1c8545b388ab828dc4 SHA512 4e68c320983c5e1851dcf6e51d2d0e1de92e084310fb650f0bf7ddae68d6b923f9a013003ca91f98f513e9ae135c1800582f214d70f65f5e8b5809e9bda6600a
 AUX dstat-0.7.4-skip-non-sandbox-tests.patch 661 BLAKE2B 31f98e58c8f23e3b6322de86bdddb83afa22b0b8bed48164378c6c071348ac2a37350b789985634017c1e338ceb73d7f9221d99e0b8b4b4d550f10d7840bde76 SHA512 0087d7fa2ce9388440bacdac52038433c1a7f0c5fd885027a4b18895c8f450cc7cae7610e6232e26393749f1b165c4ade5ee2a0e453c7e2542450f5a3d3100ac
 AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6da523da24f9215dfd7c967dbfc2384ea16ab9b01489a7d69cd99d81ddb1222e75e6d070e40d435e1d12ad8ea2961e447721d9656bc SHA512 4164f61a1ef97f2a4962f84138305b68cdbc9fcc5c639fade7b580c9f9904d592af9e05982536cd2bea5581c30696a0308dedbe6f739f0094c319bc85d547fea
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0
 EBUILD dstat-0.7.4-r1.ebuild 1269 BLAKE2B bf9547eff38162ee495b8e8efe8c6180c8c983349d67452379ee32999d4daf5bc77f91db16ca6c2427ab995da6a8057fef81cc39a91ecb68931772dfeb8533f4 SHA512 90cfcbc53830b7b194992e81c81a1c5629111ab5619eb12645873284b8c0604c1dfc6023712ae15a0c9aedf9ac5f4d5bd47361a148d37609d66b419154456fe4
+EBUILD dstat-0.7.4-r2.ebuild 1259 BLAKE2B c839f4ae6c0dd3734a8954a40ee7b4bcf4d4f7c6508a86e97bfbd86f08c003d97ce524fe9a2ac28e9d7ecb9e8b2533875d3b855491db323358409557561e67d1 SHA512 29416045e5f7c956b5ef0bcca1736b8b35b74b32dfc28eaeb102ba8d13b0103f6b5d2761274844d002358872da5e20ccb80031b7fb7c257a98c8c346601d516b
 EBUILD dstat-0.7.4.ebuild 1160 BLAKE2B a2b25f7361ea74b2432efeaebeaf095e809c52c46b978d7fdca1c429c47e1ef5d2d77fcdbb19544d6524b2a8f349dc85882d1f323c62681794d15ffd4976a88e SHA512 ad500b7419422236bd4d09795eab2b13e524c0019a9dd11d340201dfa37f5edab781eb37bdf29f46ef734dcac489b467174eb9afc92f281f88a33714e3764f77
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.4-r2.ebuild b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
new file mode 100644
index 000000000000..6116fd501610
--- /dev/null
+++ b/sys-apps/dstat/dstat-0.7.4-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit python-r1
+
+DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
+HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+IUSE="doc examples"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch"
+	"${FILESDIR}/fix-collections-deprecation-warning.patch"
+	"${FILESDIR}/dstat-0.7.4-fix-csv-output.patch"
+)
+
+src_prepare() {
+
+	# bug fix: allow delay to be specified
+	# backport from: https://github.com/dagwieers/dstat/pull/167/files
+	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
+
+	default
+}
+
+src_install() {
+	python_foreach_impl python_doscript dstat
+
+	insinto /usr/share/dstat
+	newins dstat dstat.py
+	doins plugins/dstat_*.py
+
+	doman docs/dstat.1
+
+	einstalldocs
+
+	if use examples; then
+		dodoc examples/{mstat,read}.py
+	fi
+	if use doc; then
+		dodoc docs/*.html
+	fi
+}
diff --git a/sys-apps/dstat/files/dstat-0.7.4-fix-csv-output.patch b/sys-apps/dstat/files/dstat-0.7.4-fix-csv-output.patch
new file mode 100644
index 000000000000..e44125b0e469
--- /dev/null
+++ b/sys-apps/dstat/files/dstat-0.7.4-fix-csv-output.patch
@@ -0,0 +1,21 @@
+https://serverfault.com/questions/996996/dstat-fails-to-start-trying-to-load-python3s-csv
+
+diff --git a/dstat b/dstat
+index 9359965..1682fb5 100755
+--- a/dstat
++++ b/dstat
+@@ -541,12 +541,12 @@ class dstat:
+ 
+         line = ''
+         for i, name in enumerate(self.vars):
+-            if isinstance(self.val[name], types.ListType) or isinstance(self.val[name], types.TupleType):
++            if isinstance(self.val[name], (tuple, list)):
+                 for j, val in enumerate(self.val[name]):
+                     line = line + printcsv(val)
+                     if j + 1 != len(self.val[name]):
+                         line = line + char['sep']
+-            elif isinstance(self.val[name], types.StringType):
++            elif isinstance(self.val[name], str):
+                 line = line + self.val[name]
+             else:
+                 line = line + printcsv(self.val[name])
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 9396b9cb4603..a3320ff2c4a1 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,6 @@
 DIST pkgcore-0.10.12.tar.gz 646922 BLAKE2B f3251b1a0d773e83d60f15598c2c5679a48a1e1dd81b82956ffb26ef72c25296903d64deeb0e91d95ae26832d0e08e3cdfcb68b95bbcd87acf8ed448a4f4ae56 SHA512 f6f900fc7f77a683c398c874c51eddb387f9aed572d5fce38f4856faa71f4f8e870b1bc276a87f15967733fa6ec7c8345f2d6b777897694537fa1e9165b1433c
 DIST pkgcore-0.10.13.tar.gz 647320 BLAKE2B ef80320a0a8d35ed68b1d77d52a3cfb2ffbadae2fe9f11efe3f42c68f55388074b5c4b2857f265f1add4cfe479cba9716d45afaf141d113b0874d409955269c7 SHA512 acc5ee2cc6fd0f897129f311e0484e28a1c8f374c5a2e56a29d228fee74b7be0cb6059171b743e0db35544b5b5779d35efcda21e46e65285653ba4155205281f
-EBUILD pkgcore-0.10.12.ebuild 1088 BLAKE2B ae69dfbb5d0ec441eaaf37ecbf2511a4a1a33ba139953cb6fac29cbacd7fa1200b27791e67a2239384bd2e2a75110819e71f5b27c18ce67b4b2c335feba19263 SHA512 b2d54f7aaac61a6fb1d71755de1460efddd758b4cd8ddb7f7030ab3e31aa16f4808acc58248cb71c013391c6615d4507f84332d220a6072b9252dfa7533cc887
+EBUILD pkgcore-0.10.12.ebuild 1087 BLAKE2B 26681f82be0b812d29256283224c2724e75c87f7276065925751ea2bec9214b8c8e6d2051a56c5bd902a786296547d3c64541ea263ba542f4ed5c2700cf71e6c SHA512 c539820725887d1e07656d226f0362b1bc00a050ea9e78e498ad64f2d891ac22c52896d0ce9f66073d75b15f90851e2053b32c50f0911b8573d86ae7cc651978
 EBUILD pkgcore-0.10.13.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
 EBUILD pkgcore-9999.ebuild 1091 BLAKE2B 0ec2dc4f6c16cbaf1994caa3b3db77578a95a972d719f7694b443d5b15d0f3b9a69897bd1dae8fa448e0f4083b8eb5d8906aed43c1136ebceb46242e96a0332b SHA512 108771ffbb3001b6f22b0d033b2391688c8afbc5ee5a7ce3114a9324f021998d0043089de4f7536f8fad0c89a9dd5a25f078ba8ca66a0ce2e9ce442d81bab459
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
index cfe734cda922..f9dfb8c228af 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 430dda41f3ff..f078db163633 100644
Binary files a/sys-block/Manifest.gz and b/sys-block/Manifest.gz differ
diff --git a/sys-block/libzbc/Manifest b/sys-block/libzbc/Manifest
index 399b965beeff..360e78044a89 100644
--- a/sys-block/libzbc/Manifest
+++ b/sys-block/libzbc/Manifest
@@ -1,5 +1,5 @@
 AUX libzbc-5.5.1-gcc-10.patch 2745 BLAKE2B d652144129c02bad8fa39b1587d54726e36c892b124c69084844737aa7604e16a00574569e95e6a0913f43002c4ff7240cbff017440b76842e013fdf25de6172 SHA512 d51a926e6db51df874f6cfdb73a7e85a4dd9a837fef62e6727f5e32b31fde8b9e1a2df0c06cdec0b5a9b53ab275761331566bf73f57811cbf39ebd91ee571212
 AUX libzbc-no-automagic-gtk-dep.patch 976 BLAKE2B 211a33a5eac0239526f050de30187b3392e953a257457de88c47eab39b9db518b2f9f7ea3110f6fd294ed2f54270f9a2cd25cdc38620ce7a62f2e3e68af088a6 SHA512 b1278b7d91bfabb577488016749a69714958601219a47a31794af4a22361a8f2621bdb1a964beaf78d7c73d00f934647a66e90681853abbcb5f8c7e969d981c7
 DIST libzbc-5.5.1.tar.gz 128638 BLAKE2B 3cb636f29ff29bb87c86bd800231a1b45f517822e5785af599a6385705dffa1e90574e4bd2c1b310d5a0dab094cf6e878fc80b6178ea4eb028d5d1d174e7559a SHA512 cb060d06839ea207ed2e32e940348176dd0eff2279cbdb72f565bef177eb4a195feea67c4d1ed5f455e3839475e0f4557a45774129e3d9e009ea38f9134ae159
-EBUILD libzbc-5.5.1.ebuild 703 BLAKE2B 00161d2736bdad5667d762c97fcf1973721b69592cf97b669f7c22beb93addda5889353de6a3e96d0d4af9848485a01a1036c6648d6e6b54f5e66ad608a3440f SHA512 d0a14937c42be457b5636f2301b65808d992c05b55fb0a3ea5366783a53644c1a3db232e871bb25f3b77d71f780c3b5cc35d67974dafd011b60689cca7387b6b
+EBUILD libzbc-5.5.1.ebuild 708 BLAKE2B c842ae5e3128499e11159a560f584d5799e3b297395b39c5acb528863b440f3f1bb13267bebfca9bb05a9b83d6ccd06d892066860f9ad7c2f5e99b11cec8d277 SHA512 2dae1278857df691d8205cd4fb38eaa5b65e30c15a9998d89ca2621cdca56ff4083d696d0cd20b7b13cd61c27a9cae6e840cd7fa9035f49d6e7ac9a8759fa108
 MISC metadata.xml 836 BLAKE2B 360b17822ed9256339bb8a81993814aebd63925acc8b600d75851a2a1834ac6714f84f036882617f789362e06b5b58beec89e2ae5a5b01a88c67b7122311972f SHA512 6a53f78f3fb53d3ac0a97eac47710d5fcdf23db95c98f58ee1c296eef7bbbd218f79cd151eed6424a917ae69775bf2eb42916c7a51c7ac82dffd4e8e5b9ef451
diff --git a/sys-block/libzbc/libzbc-5.5.1.ebuild b/sys-block/libzbc/libzbc-5.5.1.ebuild
index aa7724a292f8..df4ed34ffdbf 100644
--- a/sys-block/libzbc/libzbc-5.5.1.ebuild
+++ b/sys-block/libzbc/libzbc-5.5.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hgst/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index a2aceb4996ed..fb83661821fd 100644
Binary files a/sys-cluster/Manifest.gz and b/sys-cluster/Manifest.gz differ
diff --git a/sys-cluster/spark-bin/Manifest b/sys-cluster/spark-bin/Manifest
index 15a470932c7d..3e78ce6cd5bb 100644
--- a/sys-cluster/spark-bin/Manifest
+++ b/sys-cluster/spark-bin/Manifest
@@ -1,6 +1,4 @@
 AUX 99spark 26 BLAKE2B c25fe3d379a16c8a51764ea5b4c27d8f34869687c882141f0428d102d921eb65fea8ac253e407fe07fd4cce1232dd513728b1340bc0bcd21bd19ce0aed0c2420 SHA512 6d64d751f1504bea332b16078804abcaf21c8ea9c69f94fef3a8929b6d6cb1107ec899a5dc49770997243cbfda61edbcfa4d505da29220a71f5be38c1008f4f0
-DIST spark-bin-2.3.1.tgz 225883783 BLAKE2B d89e83a54aaabd39c5fa0d9c51a1bb5635f60ded4869672a387d13d87fffbb48385d4fbf67b55a96e709f27348f73a089624a0563c98eaba31f93d74bf4548ee SHA512 dc3a97f3d99791d363e4f70a622b84d6e313bd852f6fdbc777d31eab44cbc112ceeaa20f7bf835492fb654f48ae57e9969f93d3b0e6ec92076d1c5e1b40b4696
-DIST spark-bin-2.4.5.tgz 232530699 BLAKE2B e67d728af9e40417afb09e342d515021146bebef9a27df12cab2b64f1eb3ed134bbb8eecd731b2e30c9c4c6042f6fb9d076da5ac5c654c9066d2f9c3ecd0c24c SHA512 2426a20c548bdfc07df288cd1d18d1da6b3189d0b78dee76fa034c52a4e02895f0ad460720c526f163ba63a17efae4764c46a1cd8f9b04c60f9937a554db85d2
-EBUILD spark-bin-2.3.1-r1.ebuild 1345 BLAKE2B 8e981f59a0cf2b62f38115b866aab1b31cc280accd02cc2e2c24342b3531302b3a38185a66894231589e0303afa11374919bae72c7ff9e357785b1e9b3566920 SHA512 36dcac657747a7b05f2048b7fe298d78425782d15c3d443cc5caec61785f2cb4eaf3aef82e1c5aa270b1ed6b7e283626b6e8180b2d99ccf8a3a34e8a1c0af04d
-EBUILD spark-bin-2.4.5.ebuild 1345 BLAKE2B add185c93644dab828fa9a9a63f2773eafe1a4f571f4ebbd0cb1246038d08e186fbc5ce4a47f0c73da4741c2a6f4d33124c650c095d00a20d6df8e6e8168a34a SHA512 ef52fd7edd4246e56cea4a69b014c0991026b64a2a012c3d3b34a14d2a0deda034dfa0f616a360cc0c0689a5387cd7f35585d1633fedf304bc5ff85d174f7abf
+DIST spark-bin-2.4.6.tgz 233215067 BLAKE2B f2208a59822c98d90be3df95ffb7593ffe4faa74e233771b467732bfc3e01c65866488c74ee5f14c341790308537153f895f14f56beb0194a088a68b52f4fda1 SHA512 3a9f401eda9b5749cdafd246b1d14219229c26387017791c345a23a65782fb8b25a302bf4ac1ed7c16a1fe83108e94e55dad9639a51c751d81c8c0534a4a9641
+EBUILD spark-bin-2.4.6.ebuild 1345 BLAKE2B add185c93644dab828fa9a9a63f2773eafe1a4f571f4ebbd0cb1246038d08e186fbc5ce4a47f0c73da4741c2a6f4d33124c650c095d00a20d6df8e6e8168a34a SHA512 ef52fd7edd4246e56cea4a69b014c0991026b64a2a012c3d3b34a14d2a0deda034dfa0f616a360cc0c0689a5387cd7f35585d1633fedf304bc5ff85d174f7abf
 MISC metadata.xml 499 BLAKE2B 7116e88708f7dafb75197e46237ea5d405bc703feadece0bb65766537f64bd2f7ea2b34cf4a4c94d4f25d74f040b6cf5eb0b0072a20600a9d206087b38f63831 SHA512 273279c1235d9888e5b30073044687584699f7f26fd696f019c5b11545f32095319b6bfe52196ed6846cf74c8ffaa2c7f6c9f3a29749fa3315f18adba917094c
diff --git a/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild b/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
deleted file mode 100644
index b459784e9977..000000000000
--- a/sys-cluster/spark-bin/spark-bin-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit java-pkg-2
-
-DESCRIPTION="Lightning-fast unified analytics engine"
-HOMEPAGE="https://spark.apache.org"
-SRC_URI="mirror://apache/spark/spark-${PV}/spark-${PV}-bin-hadoop2.7.tgz -> ${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=virtual/jre-1.8"
-
-DEPEND="
-	>=virtual/jdk-1.8"
-
-S="${WORKDIR}/spark-${PV}-bin-hadoop2.7"
-
-DOCS=( LICENSE NOTICE README.md RELEASE )
-
-# Nothing to compile here.
-src_compile() { :; }
-
-src_install() {
-	dodir usr/lib/spark
-	into usr/lib/spark
-
-	dobin bin/beeline \
-		bin/find-spark-home \
-		bin/pyspark \
-		bin/spark-class \
-		bin/spark-shell \
-		bin/spark-sql \
-		bin/spark-submit
-
-	insinto usr/lib/spark/bin
-	doins bin/load-spark-env.sh
-
-	insinto usr/lib/spark
-	doins -r conf
-	doins -r jars
-	doins -r python
-	doins -r sbin
-	doins -r yarn
-
-	dosym ../lib/spark/bin/beeline /usr/bin/beeline
-	dosym ../lib/spark/bin/find-spark-home /usr/bin/find-spark-home
-	dosym ../lib/spark/bin/pyspark /usr/bin/pyspark
-	dosym ../lib/spark/bin/spark-class /usr/bin/spark-class
-	dosym ../lib/spark/bin/spark-shell /usr/bin/spark-shell
-	dosym ../lib/spark/bin/spark-sql /usr/bin/spark-sql
-	dosym ../lib/spark/bin/spark-submit /usr/bin/spark-submit
-
-	doenvd "${FILESDIR}"/99spark
-	einstalldocs
-}
diff --git a/sys-cluster/spark-bin/spark-bin-2.4.5.ebuild b/sys-cluster/spark-bin/spark-bin-2.4.6.ebuild
similarity index 100%
rename from sys-cluster/spark-bin/spark-bin-2.4.5.ebuild
rename to sys-cluster/spark-bin/spark-bin-2.4.6.ebuild
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 269aff15fe14..26eb5804655e 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/binutils-config/Manifest b/sys-devel/binutils-config/Manifest
index 243517b1f382..2d95b4eb54df 100644
--- a/sys-devel/binutils-config/Manifest
+++ b/sys-devel/binutils-config/Manifest
@@ -4,7 +4,7 @@ AUX binutils.eselect 810 BLAKE2B 2da92ce32b79691b84e33ba83a5621e4cc6001cb6990ecf
 DIST binutils-config-5.3.1.tar.xz 6688 BLAKE2B 3bc1b96a96b0c30e425f4ffd42f86a09e2a80cc3ad1dcf77d4b5d2d9eb3d6bc607f78dfff1ae888fe8abfe44405a1e4d1ab325aa92fc5889c18aa3187a506647 SHA512 c6d188b70935604a8a519c036dda210c20e5b6e916fab33e5026bd5c78adfff0a1aa85003759b751275576ff33471b25c920beb6b1c088115f28918389e09ce2
 DIST binutils-config-5.3.2.tar.xz 6840 BLAKE2B 4f02b8d1f3f8d4adca811772edba6167fc0e739f8ff1e895f30745eca45b559da6622bb76a0cac6016d6e864fe7ad6c921c64c7ec1c18c130b3a64a1dd7b9cbc SHA512 03dfecf46fee941b7b9fc35b63ffd22c795ab54f0444f16fc00ed44d27c81f6baaca33170fb700cfc4d767be469f305890882839536363bc466ad200d28d2228
 EBUILD binutils-config-5.2.ebuild 1092 BLAKE2B 453ed9f4ce103a56c0880fe2d08594b1734081ec933415d8d54d2376a0015d4e32e8555f5dd63356bb99ee917ea982ebfb75e92e9c58dfadf9c545fdbf82e863 SHA512 74fc1bafd272f17f94a1e5b6b27bfaa5fabc1cd45bcc5886bbc0856e304396afaed8a4f942f6ab578dca782ad62eb98c8852a21f39f9c6379e3a1b43b9df52a7
-EBUILD binutils-config-5.3.1.ebuild 1119 BLAKE2B 2be96df26f78c9468dd9bc2d1cf49b729edccd11af8b963529ad8eb166d0079fa02f3e6b760a316433cf35281caaf937cf99a92bc61c1a5ec1bf436298602686 SHA512 5c654ca23706ae482f23265487cef81d6bd691a727a5d3a1253f25a4ebab8556028054500ada387b09b34d7a9842cca274db25084556efb516eaebd2b4312a70
+EBUILD binutils-config-5.3.1.ebuild 1118 BLAKE2B 0d65e41631a4ddc28b2b6a446eba79f6e6e0b48706276d3dd057d300f0d097109ac637683343ea2e7a348b4c9768dbafa1343189a7a6c880b13afd296c7605c6 SHA512 2207b216e9c0a6ffd6bae19ad7f3c68d870882e4a69b0c1284a87ceb0368c086bc1dd4a682dc18d64da9a60824815d4c384f89f022bd3cd6d34e2182d986fceb
 EBUILD binutils-config-5.3.2.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
 EBUILD binutils-config-9999.ebuild 1127 BLAKE2B 2f2705f36212ed61dd65e00e917ba9504019705926abe988faf42c0a56f26ed83615b1ebd815c93d01ddfad1983f65f159833b65361a650afa727dd4e7b43090 SHA512 ec5e718e518591c1df1937efab6424e436cd4e632c7e73bb8a346ab19c34e1cbc1048b15849157e3a230b098a189dbb9084aa7a0eb68a029883fcb98912147ae
 MISC metadata.xml 416 BLAKE2B 5ea7d7b0b0ca3767c8393d3ff5c7c51d190503d6dfea9f2146b7f8bdf1f6a91237e918e6b6b178d07a3de8affc936fbde215825ec33c5b334d67d36f66c30566 SHA512 256a0c0ec2d57c3ba75a27e7a810ec70d06cecdefc20f2f58cfcbb1ddbd195c2115661c4960ab6316d88b6db21210416a4eb5855488ddd5918888365a3a9d00b
diff --git a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
index feb25428408e..2a949b4fb174 100644
--- a/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
+++ b/sys-devel/binutils-config/binutils-config-5.3.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Utility to change the binutils version being used"
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 70690dc330a5..b84ae6968875 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-common-10.0.0.ebuild 587 BLAKE2B f31cff645726ac241661ce8d8f4208a65e6cba4e2ea55fff7969004989e9946f3a55c816019d5cc4b9a23b1a49ab376ecc6f0c50f41d5de63157808bd1cc384b SHA512 562724261d387b18db74899a76cb92b519110972196d3e9ff73ffe2e0dfe70c66c8af56b460056e79639087ea58310e10efcf170ba7f4aeb7631ad2de27f941a
+EBUILD clang-common-10.0.0.ebuild 586 BLAKE2B 0798cb7967840995fdb7b3412c0f5d904b69b1b09551e12083249ed8f394b79e1f5c6f15fcb77834190c83ae2f3ffdce82ef79f419e709a9740b549bbdf558d6 SHA512 d684c1a71f4c8f952dc49611a95560bf576f08836381be724ff7deeb260b7f812614ff3c52fa27f552d65b760c6fb6eb1929714209ab0557b4fe368deaaf72a3
 EBUILD clang-common-10.0.1.9999.ebuild 513 BLAKE2B 3ca10da9963052dfcd89bfbc0399f9839325caba42a63e916ccb3ab5f10c0b1f1089cf2b932ce1f166e0dc60ae2d605003e345354eed6310eebc29a40275405d SHA512 18c55050f97348880eaa7676dcf4bde318f2db16c9014713ca32b17c2c02997e68034ed20dc8737a1f1c5d51de88da321dd68bfe83068008dc7f92857d782997
 EBUILD clang-common-10.0.1_rc1.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
 EBUILD clang-common-10.0.1_rc2.ebuild 513 BLAKE2B 990eee9292990a4fa1fa12eda4963c78a838108bc7d56833d6696af03eded240fd01f095335020eca81832f5e64c496c129bdecff7dc4c4de86c38e95ec99dd7 SHA512 dc472092d704ca242e0370f580f506e83a17f3147cff31cf37fb3573e37ad0824960a6da576c8310f6ca43d64e7fffa0c65c9815344d40252b0ca0f8b5e3eefd
diff --git a/sys-devel/clang-common/clang-common-10.0.0.ebuild b/sys-devel/clang-common/clang-common-10.0.0.ebuild
index 9e94b0b2894d..1b542b67400a 100644
--- a/sys-devel/clang-common/clang-common-10.0.0.ebuild
+++ b/sys-devel/clang-common/clang-common-10.0.0.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/clang/utils
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 PDEPEND="sys-devel/clang:*"
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 5b697a45fd62..31403dc640ef 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,4 +1,4 @@
-EBUILD clang-runtime-10.0.0.ebuild 699 BLAKE2B c23eeaf05b474bea3d41d874f88d6d828ae2000bee7ac944a1ec229d24971eb14e83ae5800c6a9f9f9b8a5f60bbfb79d40624587853c4d795c3a0a860c2bd2c7 SHA512 8bf71083a73bee82579af9afc8be69d819e78ccb120a105e15a04d8b4026e8b4a10f1768465d6c1bf0904e2f1e44037cfe8e385be3a494330b7a70df84e3e999
+EBUILD clang-runtime-10.0.0.ebuild 698 BLAKE2B a5a882bad1bc01220f18bf710c458db22fe75221c7d6b09a10a6d2e7600bddf4bed76146d3c31438844f5529ced3a31f4dcca8c7befe47eb90f358b47b246027 SHA512 25a9f6fea6cce244c61f7718e814819cc74ab5019dd70f80e1306b1438f84ea448c6b744a11b62bb601ef85a9f7fe6ead7d3d468eeebdd6f63c17fcedf1ed81f
 EBUILD clang-runtime-10.0.1.9999.ebuild 643 BLAKE2B d513da18fea612d5908924aedc4ccc2a01e25a66b306b1229e9d7c6ad5a8508a3be51b551246f64eba90f406c47c4f384d5fa69545d581aaeb55e6b2116895c2 SHA512 8f9cdfe5312cccfe2b7b5f7929d9aa3ffd8e9e007ddded8284a391bfbfe9f4e11462164336679fdfa40bb1d3b5449498d28a25fa97af2a3fbd5b978bb450b822
 EBUILD clang-runtime-10.0.1_rc1.ebuild 625 BLAKE2B 8db7bfa75ca928562b60b1bcc5f64ab85b3bd4c81f48f78488edbf80507bfa99c411ad32e5893d8f620d020bd2f21c996ad1c744e6881851d20fd5b504ee2010 SHA512 0a979a27e36ce410909e42e03ca2eb6f204059b24f654123646c17950e0a1db23b1cdd6668aef94f0623e74cf780a8b2fddb4dc1f58f1858498454650363414b
 EBUILD clang-runtime-10.0.1_rc2.ebuild 625 BLAKE2B 8db7bfa75ca928562b60b1bcc5f64ab85b3bd4c81f48f78488edbf80507bfa99c411ad32e5893d8f620d020bd2f21c996ad1c744e6881851d20fd5b504ee2010 SHA512 0a979a27e36ce410909e42e03ca2eb6f204059b24f654123646c17950e0a1db23b1cdd6668aef94f0623e74cf780a8b2fddb4dc1f58f1858498454650363414b
diff --git a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
index f6af4e7ad45d..b2f488fa86b1 100644
--- a/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-10.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 56b0cf8c06e6..b776099d321f 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -13,7 +13,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-10.0.0.ebuild 10369 BLAKE2B fad871b329ecc1adb5ec5ea50ff2e30202d808b556689228b3d68da41abf4660fd5f0a95f79aceac5afc93395b52de3b98ffb1972a9c3c45c81315bdaa3dbc78 SHA512 d0f9cc7e722ffca8fddd94c1488b7171afff01f06442e46d28fa190d8fb9d36de9ba1128a4017dcf24777057470e1f497874da6dcd8529a399aa871f9f66c115
+EBUILD clang-10.0.0.ebuild 10368 BLAKE2B 1abb6dc8a317ec5c199a192cac2fbb2fff419726f9e75aca15eb555c7526468ba1bc5043dbd07a10ccd504f3fe313b6041dbe9925a0b007c0cd2f14864c5c928 SHA512 4361d0ea7c77c8549c59f456c75818e0eb69231ef897443c982ec7d607936c89dadb8a6318f26a5e4185194e9647334ac56f32f2269bee3ea9676488364efd17
 EBUILD clang-10.0.1.9999.ebuild 11272 BLAKE2B 617ff2ad0c033b0fc4495e29c96ad1d371b9f4f461bcce71c1adfae4c459bcb954c9198bb34c3bb614b9bb0fe0496c667852fe2c804b087015d8cec63d4749e9 SHA512 737e90ab58404c9486d8db8f5ff904aff835443ac29cd3093def063e055562e4344f6e8b7fe1f5389bdb31e0efdcd934dfa4f7a1fd3c42278521a9ee90997bb8
 EBUILD clang-10.0.1_rc1.ebuild 11269 BLAKE2B ecff83f8246764a5c59b60786db0cb9ef13611b22d5e1c1561372a148633ba1301297aa25e69b198ed970301a2cee8611e430eb667238b6edd8489b9cd1872fd SHA512 1c0e7f5568a4d4d921a3790cf31a14f0cc87a7c56eb39d2d9dd4cea3e8d24b9476b80e83ffdd6620c55e20c36be4e484d061ae44b29d338bd4585eb2a4aeb2af
 EBUILD clang-10.0.1_rc2.ebuild 11269 BLAKE2B ecff83f8246764a5c59b60786db0cb9ef13611b22d5e1c1561372a148633ba1301297aa25e69b198ed970301a2cee8611e430eb667238b6edd8489b9cd1872fd SHA512 1c0e7f5568a4d4d921a3790cf31a14f0cc87a7c56eb39d2d9dd4cea3e8d24b9476b80e83ffdd6620c55e20c36be4e484d061ae44b29d338bd4585eb2a4aeb2af
diff --git a/sys-devel/clang/clang-10.0.0.ebuild b/sys-devel/clang/clang-10.0.0.ebuild
index b78920ece94a..38a954c9167b 100644
--- a/sys-devel/clang/clang-10.0.0.ebuild
+++ b/sys-devel/clang/clang-10.0.0.ebuild
@@ -34,7 +34,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux"
 IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
 	test xml kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index fb5dd01b63ec..a5ef279c9ee2 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -52,10 +52,10 @@ EBUILD gcc-6.5.0-r2.ebuild 439 BLAKE2B 25944ab4a6a429f985b2902e16c2c3699b4d93e17
 EBUILD gcc-6.5.0-r3.ebuild 445 BLAKE2B b226bc57bf68b0914921b2a57af0fe07bb1468517e6c4f11c1d413dc9fab6ef332bf8737d94d87e311ee8126be4025c1630b5dfca6ca103dbf7ef8621b0740c1 SHA512 90663ca1e8d3f840e14a315ad8d58116e394ea622f8b7458ce9ddc7f96fc000ba3cd9ac2527feb2eea980e52e444641c0dee31201e9b9cc45a84af7587e6edff
 EBUILD gcc-7.5.0-r1.ebuild 449 BLAKE2B a110d2ce2019ec04309206f75af077cab35a9637cee0944a9416332fce1e4f8f838bcd122d8618b5eb731f90c427af73b435e329d777d1ffaf833b65d0990e51 SHA512 c94afa5431afb0847847b2300fec4f047b1be45cca3300b639a7d1df52df26abc0663e2b93ccef29c82e1d9929638d1d4624dd916311fc437e2b42f488a20a32
 EBUILD gcc-7.5.0.ebuild 447 BLAKE2B e9c72e8743ec650fd79244b81e7855bcd1ff1b4a13d8fe245f92e0ae2fd37c15609aa951429afcd2eecd4ac2d3f45786e5e2d8a72fac439aaf7cd7a525f3c4e9 SHA512 3b0e22f868d6ff1ec47b21196354873da4d01f21350aea79d1a86c218d4245237a9e5462ae3cb5486ba48736edf6fd1550729a0b49fb22cd87d0f4d99c4eb68d
-EBUILD gcc-8.4.0-r1.ebuild 445 BLAKE2B 6390c8efc5e374469a7eec885b3d5f477ff1cdf9a2265793123f42fdb08bb2389f4755d211e3c6e47aa264dcdc85eb58e8c04f53179389d1eafba2bbde0655e6 SHA512 0f752ec5f6b08fc784ea172a46098175a072230c19944f91e03f00268165e239d1544c428ebddaa170cbe75f48f04a0f417a1b4a69249cac8cd1e3aa6beb3116
+EBUILD gcc-8.4.0-r1.ebuild 444 BLAKE2B ea6cd0618f8e9a9de4b6e52e9597bb41427ab6b763eb52efbe99cabe02584d33e920fe4563cc1a85b47241ede3c24b0839dac8036f5868d47104cbe91ffeb2a8 SHA512 a238831c8db63c73c5edbd19121652cb0165220546811c9a2c82f08df54a1b1a6413592e5cc5d9d24ea771121721673881aae9a03f7757d95484c300b8fe78e8
 EBUILD gcc-8.4.0.ebuild 443 BLAKE2B 0b37d1fa2fd83c95142b122a0fcc4bcd01f8278c80397f3aaffb0943af6578952a242de8fe0312b3c4c4d533f5fdebdcc63b67b29b17a6fc67b5b052f71cdf25 SHA512 c03adf50767371fef49b800bd0bd364eecf42e3e90033727bfecbd862757c43f1010f9230730506d09bbc96c747cb015fa7aa6342c5d475a3310a129cf0ec5f3
 EBUILD gcc-9.2.0-r2.ebuild 539 BLAKE2B d48f3dd9a33734a1db5546b6223bbb68ddb1f5831c92aa435fe6536af843f3754a688e728055b56999dd836a82e2bbc0f7dd9a4644d66d1c64ab127bba1af3a3 SHA512 a0b565c5a9c54f419c572a760f9b0b310e7008ca0d701a890bee224f7491c265e978215714d12a9565f4924f37c389bfd7fb1512d43e325e715d40ad3ec85f38
 EBUILD gcc-9.2.0-r4.ebuild 452 BLAKE2B 5b1ced4bebbe5558068cde5d495e04a978292cdccb118f199642484a6cb4fdde844c31fcd99347271addaafa7c23e6d8dbbd13d1d54a08bbe9fbc470566817d3 SHA512 65ae72ce9e55b2c8a86375ffe8188d9e05fd82a077d8b5abac5b5971f152efb7610fce553af12f1746ec6f6bcf881fafe3db76a5098d99c9e56fdd3cc3091096
-EBUILD gcc-9.3.0-r1.ebuild 445 BLAKE2B 11ff095a0277ed8e86b340c84d5179c3a7cda4e080e95107ad6965fa9dafa0145c2a50fc1854990df224cd21d675c9c788d4312cb1271037ec964abec2648b04 SHA512 bb9be75e14f5bc66dccef5c23f2ef40eaac2e46f82c7712aa63c37d1f565e7ebf5d14bd476361fb26810a3d915394794b7e091def1ca9fbdf8afe9c2f406722f
+EBUILD gcc-9.3.0-r1.ebuild 444 BLAKE2B 6c044d203f7033c68d67ede9db727368931619468c0d3df0aa447982e0b7320b0f240d5f063c8aa212e4ba6c499e53fa0f0d30b7261bf47f2421eb6401b4f1db SHA512 b3db01310c05623e59af34b456efaba5eb07991b91859b6f35b06aecedf1f64826aca39953b120b5fb082fbac19ceec674330f9f68f20b6683883b3f4677b4ed
 EBUILD gcc-9.3.0.ebuild 444 BLAKE2B ea6cd0618f8e9a9de4b6e52e9597bb41427ab6b763eb52efbe99cabe02584d33e920fe4563cc1a85b47241ede3c24b0839dac8036f5868d47104cbe91ffeb2a8 SHA512 a238831c8db63c73c5edbd19121652cb0165220546811c9a2c82f08df54a1b1a6413592e5cc5d9d24ea771121721673881aae9a03f7757d95484c300b8fe78e8
 MISC metadata.xml 2848 BLAKE2B c1c7a91c7a636c4478cdc43daa110d0a3e5830ac632ac6ebfc3867a66f1efdad13d4efe69e91ba3fa1cf26b5dc774926a86e2d8fce933b45c11396d30776e005 SHA512 a7be1673fbae0972c7c9937b6de533f5263d7796e413a2055196c722a2d1f6a79f2b8730f7d7fde5264e4b924f497453efecec09fccf8b7a037c7aa4c54fda7a
diff --git a/sys-devel/gcc/gcc-8.4.0-r1.ebuild b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
index d00b2fba68b9..1da6db9eb470 100644
--- a/sys-devel/gcc/gcc-8.4.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-8.4.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="2"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/gcc/gcc-9.3.0-r1.ebuild b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
index 98c83e45b1ef..e93a1469917a 100644
--- a/sys-devel/gcc/gcc-9.3.0-r1.ebuild
+++ b/sys-devel/gcc/gcc-9.3.0-r1.ebuild
@@ -7,7 +7,7 @@ PATCH_VER="3"
 
 inherit toolchain
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 28d6e71d0638..9dd769ac153d 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -6,7 +6,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lld-10.0.0.ebuild 1481 BLAKE2B 7bcf1f550c84d796a7a23203675619d013aa25b07dd005cd8d5d4ca3442776d0e504662a9071622207af5b037ee10bc93edce0c3cbacd85fa4456e523a9da8fb SHA512 77972467b1694346eb55a1ee67d9e7e47160e8323a8755e51570b420a30f9836efa92ebcfe8bc52ce19cbbfd442d028992b9bdcb33a0baf6aa39f5c3d1260619
+EBUILD lld-10.0.0.ebuild 1480 BLAKE2B ff2a6885ad89b62e42cbc2e484c11b278344a895ca0bd7ca52513777ac7e17d132e6b3641d3260ea981de23fd3ff65311614f7917cdcf0d86329f672f07c4cc0 SHA512 bef6abfdece90f9ce3c5d22c8c4bef5fc66b3de0d4055aed161a1c470b1ff4dd348f23e3f745ca9dd1614aa769e3264974ad2e4654842bcb2dfb9d13bcdb1aee
 EBUILD lld-10.0.1.9999.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
 EBUILD lld-10.0.1_rc1.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
 EBUILD lld-10.0.1_rc2.ebuild 1302 BLAKE2B 281b468babbfd01037253f479a0fe50b67fa5643f514a20f6a77acaacc21324f7e9efd85e8a4dd2e7bc9534fcd290a0392241c17d23b3c1417485c0ef553ef01 SHA512 18d7cb6d3fd2d5d7798e96edcf3cdddd8f40768b12d02f3d2d1946e39c72d94a2da028e3740650dcf8c827e1423a49060940c062fad8f668401530281db18c31
diff --git a/sys-devel/lld/lld-10.0.0.ebuild b/sys-devel/lld/lld-10.0.0.ebuild
index 945078282529..cc44c95c0379 100644
--- a/sys-devel/lld/lld-10.0.0.ebuild
+++ b/sys-devel/lld/lld-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index aa75bbe3e2ec..3e9763ba90d4 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-common-10.0.0.ebuild 602 BLAKE2B c55eb5a2e77d8918ad52911eba97e410fa4183190eeb2f5a6e5af1e73ae73a3c770e894a85d735ef6fa19b8973a3047a35c70a33eb5a48a7a97d103bfc098ffc SHA512 dacea725973ca1b502533f4e5749c4bd0a4922ab1a9bc269d8c6357f966d39ad8fcd14033b571fe320bc789008541d7852e57e9a8590263b96839ea779235902
+EBUILD llvm-common-10.0.0.ebuild 601 BLAKE2B ad3146304657883774266a675695c8ce4fc31c2e29ba20a380e604a528d2e6e6a966f0ecdcfadc37e10f275c1b7de60c73fec8861b5808c16b1ae89725d93f83 SHA512 1a697dbee3f3f9a7fd80f74516aaa262e8a374fa4697c921c0d90bc742baa268cb3f1cf27e617cbf25394798b47f5bca6af54065b1bbfe68cc010192a1dd0a0d
 EBUILD llvm-common-10.0.1.9999.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-10.0.1_rc1.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
 EBUILD llvm-common-10.0.1_rc2.ebuild 528 BLAKE2B ac8c427ce977f480f46c33abe30cf92be1fc0f3787c619c5e4b57a3f2fd465e846b37924940413252cb178c857720e9953594cabd009253d4ab798e7fc85e854 SHA512 630d92131856eae97de7b7d448d2bd32cfa89e2ef9c7818f25b6696c3618a1931c14f424e73f7f57cc6183bf8f908e4e92d3c1b64a09e6840aab4c75ada629f9
diff --git a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
index 9fdd16050a82..f76035e25328 100644
--- a/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
+++ b/sys-devel/llvm-common/llvm-common-10.0.0.ebuild
@@ -12,7 +12,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!sys-devel/llvm:0"
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 65d0edd08e9e..26331e523f00 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -12,7 +12,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD llvm-10.0.0.ebuild 10754 BLAKE2B 86a376bd2d57db14e1dfe35023908e85eb1303fac61b29afdb6b1f6e2a80f7673c4c49aa44245cfbcae7499c4b99258ae2a47b8ca55bc0b388957ae7886fb0e2 SHA512 a4b72352c8133c4f7b6bb84977bfd9fc45766d30087161f685de2fcbf917efbe76d77dbc7667dd323e2b035007d62e98244a8071cf0623c625843ab2d72d0da9
+EBUILD llvm-10.0.0.ebuild 10753 BLAKE2B 42193b53a5a979d81fe1a87c76b1a0d025199775f82a7f9d4eb63e9d705a1dcdf6e02446c2ca5d9c7840ac523a8e9dcd5597f6ffc33920888488f8bdaadb5f9e SHA512 2cb50cb25f4ed4c7db2db4819dd14287dc3be36fcf74cf1aaf979b1288456bc117c1e04759b727ec6f3a8ab6da5ca504cae31629d1eab4cc0803eda93598fa75
 EBUILD llvm-10.0.1.9999.ebuild 12625 BLAKE2B b3a38bdaf43ff15935f928cf75b664f80b038f5bfaf8e3a87c417fa73ec0098b03b341d0dbb757333b9bd692f23708bf74dcf2ee0861062181dd88015389b655 SHA512 5fc03257797fdc6b0ec3a254a4ca51ac9ac3df1abd777a5b37c8eb44189d37d51def4c243824ccee878f73efc64e43d5d2a9e651cf3b764a3ba786e620a4dacc
 EBUILD llvm-10.0.1_rc1.ebuild 11632 BLAKE2B f335286bf86b9c18b7d219a65b3ed54d47676939323fda1b420943da2deab141bc43d80bed9d83aea48824eaec15438d07854964a5a7db3ac41e4034b079623e SHA512 e9dede97e3d9d755fd518cf6bb7296bacd738a85e23abcadc4487abeb3ab4f7e380187c27114e0c64c4c0934f0414ca47e9c17e3cd9f317cae0d505ef858f4d0
 EBUILD llvm-10.0.1_rc2.ebuild 11632 BLAKE2B f335286bf86b9c18b7d219a65b3ed54d47676939323fda1b420943da2deab141bc43d80bed9d83aea48824eaec15438d07854964a5a7db3ac41e4034b079623e SHA512 e9dede97e3d9d755fd518cf6bb7296bacd738a85e23abcadc4487abeb3ab4f7e380187c27114e0c64c4c0934f0414ca47e9c17e3cd9f317cae0d505ef858f4d0
diff --git a/sys-devel/llvm/llvm-10.0.0.ebuild b/sys-devel/llvm/llvm-10.0.0.ebuild
index 9c41909ee8fc..cac329d5ba7a 100644
--- a/sys-devel/llvm/llvm-10.0.0.ebuild
+++ b/sys-devel/llvm/llvm-10.0.0.ebuild
@@ -31,7 +31,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc exegesis gold libedit +libffi ncurses test xar xml z3
 	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index e659a40fe4f3..9b42faa235f4 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,4 +1,4 @@
-EBUILD llvmgold-10.ebuild 567 BLAKE2B 956b02b8a13c61eaad7c6ac8bc4bd51db0bfa5970840a7b9d57ae7e2c6d7b5e974d5ec4646ec53c0cc49d8f7bb27ff3f6debf0e944cf0f1ab099829c6fd6ab5f SHA512 979a3893c0b765ea20230da422fc8b286e84b33f2e47442e4263c4ef00aa391e4598d3345b91e425c736f59896b06616ff83a83fce8e382dd4e321752f4abf3b
+EBUILD llvmgold-10.ebuild 566 BLAKE2B 8814a8e4a0b1a7186d95fe90a9beae0c8a23d2a1ba900dfcc385433f928528ded112f1116669bfec8cb43dcf400f81ae5624ea03225c8a6fdba1567dc7a4ed30 SHA512 91e69c68fc49ffc6285c613f324a232717cab09ca70363c289cf51ba23aa09c10e528a58603ba6542be6cf624f9181de1b2aabfa07074fedc65b81933e21c201
 EBUILD llvmgold-11.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542
 EBUILD llvmgold-12.ebuild 544 BLAKE2B dbe6603bb3adbf33258ce70048409a46b6489f40d557e877df99fb918c42024d45abc38eccd340c534cad8944c9b24e5ac8b9abdc5d37e06397086d621aa44d7 SHA512 f49451513d6fc3e4e14f6b2948404a41a3fd12dc1d34eed0a6e6a00299538141ada7360b17f2d0a7c19ea4ddf584a0dbdd2a33cbfea3f7a0e6da1d12dd506542
 EBUILD llvmgold-8.ebuild 564 BLAKE2B abd86d1d1663390b778a27ef3298b0510256aaae792e63934a2d56da8ddf635d89212a2ebf719d92c686b533efe8b92dfcb6bc8c9dc20adc1319ba84ed5ea2df SHA512 6c083bdfdfd34321df21f070620c4ccc8325f133b458ae3382a40865082031b22f7782b4825c0af2c1f779355f32f19009f1fc1ff5c5a6dc5d9df76e58c7f293
diff --git a/sys-devel/llvmgold/llvmgold-10.ebuild b/sys-devel/llvmgold/llvmgold-10.ebuild
index 88ea7d2b4c5f..225041aada1c 100644
--- a/sys-devel/llvmgold/llvmgold-10.ebuild
+++ b/sys-devel/llvmgold/llvmgold-10.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RDEPEND="sys-devel/llvm:${PV}[gold]
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 957c1a3426cd..a8e9ef8d929f 100644
Binary files a/sys-kernel/Manifest.gz and b/sys-kernel/Manifest.gz differ
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index e4d0c1a8ddb4..b701f55fc5f8 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST gentoo-kernel-5.4.50-1.amd64.xpak 65035504 BLAKE2B 07448f4158ffa9c473a73837
 DIST gentoo-kernel-5.4.50-1.x86.xpak 56475105 BLAKE2B 56231df51e81e2ca76bec27efc32b117748141ed8fbb9ac69ba8f2c3a77d37bff63ffc0a54c7a6378a0aa4c5a44cfbc85e6f96abdbb7e8c940cafe53f9734633 SHA512 b74534c4d533c9023313b4527c4dd2920b0eebecbb5b981eb14b8ca0f70a3fa7cdd7dd4d3c272e628a5a240ac36af9c8edebcfb4afa00e592ad5d4bed9994af9
 DIST gentoo-kernel-5.4.51-1.amd64.xpak 65049554 BLAKE2B 754eeb0c19abb6dde03a7a826b90ddd36aa84961fd90f123cae02447a01c1a8a59a72972d72d4927d3ad9818a0de92b05e37e62a4f169a28c978fe09be244c59 SHA512 f2ad42f387f56b5b519313bce4514f5506052b23418601e9a8468bfa9abdb26aa1a2ff6282053bb97bcd1b77ab80034116a6e4768c4150d0c5afeacb50c3794a
 DIST gentoo-kernel-5.4.51-1.x86.xpak 56472145 BLAKE2B aa3285a96d2e9fcd4c3dd0909a102301faaaea6881ff197dc14308bbdf49bf01db922fde875bc76aef8c3a3bcffd4525a6d830a3fc3a8270625135f084d597e3 SHA512 abb8561c99e8ea3e4257af161d1bfac5da754e08036b4dd4d53c1bdeeb48246476ae537b1c51bcbbf11cae5ff0f0b27832fedd976a342610584b28daf80338da
+DIST gentoo-kernel-5.4.52-1.amd64.xpak 61394475 BLAKE2B d34ca15f828c8e99b441b45358c949be99bda859de2e8ffca10936bca52bf9dad579c305c6ebb329224b653d7368b1448f97837312afeaa260b09e9d24352dce SHA512 da8c3477c3f4a511f6875931e071d09562af18a9141af308d28c678a963e882255d29c7eed0fbebfaa298a0767cf5a452aecf8eda89fee6044ccd14ab4380b97
+DIST gentoo-kernel-5.4.52-1.x86.xpak 53172293 BLAKE2B d79c1af83246b09e45760c69e9871f1d4dd0c8da1b9a3c16e07ca000f87aae0710e4b84d64910549c2799fa784b33919f72d34f8a10938ee2344ba22823c62a3 SHA512 113ca4c9eb5704e975876f98804236fa07f32d6a66651e6f6b0f136f2e4511aceb599f04d09c519dfcb4f044db916a0cf361029918acbcc42b36fee02871c418
 DIST gentoo-kernel-5.6.18-1.amd64.xpak 66169658 BLAKE2B cb111eca2a88a6cde81e4eb80ab9a025ab5f66f780fdb6e04c16686f78ae80b6fac5ed5c511508411d24b5439503ba205f8bae287acfdde75aa6f7e609ef3a1e SHA512 ffb6aa3e0269bcb9fc159b9e8237f97c569b527ac2250722f342872b1a7d603309caef5a9a83ce4770838bcccfbbefa8bf77eea9b3e4680145aee1614cc86250
 DIST gentoo-kernel-5.6.18-1.x86.xpak 57553136 BLAKE2B 3a26cd459a99c42228bd942033b6abcc9d06ae77961a4591bbc27deecbadb895ac0344298877a9474dc3057cc854d5b3be495674f8b6c549f7d136417a568271 SHA512 36c10328587a784be5d5099b5a103a9603357a2e5228be2a3f24aeb325ee4cc7aafedb98eb9314ce3fd38e45dfc3034fbdc0776e4753642945421018e03e7371
 DIST gentoo-kernel-5.6.19-1.amd64.xpak 66175473 BLAKE2B 868b2b78a260be6cd98804fa93149a17898ea8d240bb1257da0ce5e0a63ea88051b470b581fae37b620e3ed5d5821527a2deb6ee9b04102f5b7c65e2b0345242 SHA512 26ba56467823824ceb91861726bf5b3c4bbcf70790740a3147cc5b1f767d5fd5bbb76d7f4983a6d4bbce0c24fdf2c4b759949aad2ae9525de039ceeb02351415
@@ -26,6 +28,8 @@ DIST gentoo-kernel-5.7.7-1.amd64.xpak 66703708 BLAKE2B 37b82b50661fe0489488b6d7f
 DIST gentoo-kernel-5.7.7-1.x86.xpak 57997459 BLAKE2B eea6e00fc39e4225f95c12bb135037f2f108fab21bb61f8af50c970dc52fcb4612e174b80cfebeb1228bd5a11b9772390625a6b539b6d8d4a4edd369bf56e8fb SHA512 e52e0f1019b4039cbba6f9a2f6f22d9619b5cf63e6ced732ebec8c5952af567c57e301e5ab93a7ee6ac455522a23a3de73314fca44a8ab8c43b7d0602bd5b0cd
 DIST gentoo-kernel-5.7.8-1.amd64.xpak 66679616 BLAKE2B 4900c7553a75d8b395082c2899752d3dad2c7ce98c687c10271ad6125abbc5069ff12ab844520b532fdb2c87905f2d3285384c6e726578637a51d9af52ab96a8 SHA512 52f9cf99ca68103c833d48609d2d5f2dddb6cb42a353eaf0b5bd84a33a98a10b4f5b7dea53919578a8b7d5d7a2616aabc7df24bf4f401ee4b619c628df7f9b75
 DIST gentoo-kernel-5.7.8-1.x86.xpak 57993428 BLAKE2B 6ad472eb8fedf82d9dd77bd19a2ebc8bede2174e29f94a390d9e42eab82fc4450efba1c813585eeb881603a8c0ef5304e3f5662e28e020c907193271161b8df7 SHA512 66d9fa00d994bae74d4bf5ed5b25c869bf6d790aa73fd109d9b0dd41c8ea22dc4ab1070bda9bd2cd4cb8347e16aa08a6d4b95556c531884c9719d6838dc58a33
+DIST gentoo-kernel-5.7.9-1.amd64.xpak 62944837 BLAKE2B a576420144965d39368b2d3fb22a2ecaf4a68d4f02738a2456544492bb08029aecaed23b917b65e6331c37c4e4ab334422a8eb606089d0ddb78598da2c407fe9 SHA512 9ddd96008583966d9a57c4d2e1f1b6a25dc55b4dae8d513637f8fcb80856416aba052294ccbb2d885e2ea980ffbedff88d64c3076c5ad67d07e04b965a86739a
+DIST gentoo-kernel-5.7.9-1.x86.xpak 54954474 BLAKE2B 2c482f124c84b80837828f1eb932af81dd4136a5a5ab9a9e426f86cdc69bb86f41b20f28d89cbe21ecb4062e7da62c2ddf07b227cb86bb13c3ff07c1962348ff SHA512 b6093bf7e1ccdf45445b7e820a5182fa0c6f647faeda959c73f0768abcb795b581a2daa1d5cd19bc7f5a1813b284e48acf4bebbed523e0b9951f5caf32c09174
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD gentoo-kernel-bin-5.4.40.ebuild 1048 BLAKE2B 72875d3d21ca44fe5ec1df461367363c1fe35f28e21c0c39d77f808feb5d63a8ecc24d2f0c2bee1e90b19a7c70333120fe4d85cfc7a83d2fa78d50afea10ccc0 SHA512 4e321a97221e8a9d3e98d23ffbc25404aaf4431c0eec956aacf57e23df271c7f26355da0cc2f3bca02c2a5788428cf354959d8c191a4df984e86327251a093c0
@@ -35,6 +39,7 @@ EBUILD gentoo-kernel-bin-5.4.48.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb
 EBUILD gentoo-kernel-bin-5.4.49.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.4.50.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.4.51.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.4.52.ebuild 1251 BLAKE2B fbbd00390461191decd1051b9bcd3018d5bb21c0518528c05a71e6e021eb3136e5f564e306f84fc0ce9d828abf3095ec9ea4ab910179c3062478b217df898947 SHA512 c9599be79f8d05aba875a1377fa30230a27278ee02bcd5b2c85cfa0d2ed8ba87fe18a8c9596ba89971d9d52a9552dd431906dbd93e39ce1c22a42e057c6d9998
 EBUILD gentoo-kernel-bin-5.6.18.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.6.19.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.7.4.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
@@ -42,4 +47,5 @@ EBUILD gentoo-kernel-bin-5.7.5.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0
 EBUILD gentoo-kernel-bin-5.7.6.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.7.7.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
 EBUILD gentoo-kernel-bin-5.7.8.ebuild 1050 BLAKE2B fbd51b60abbb87ff04ba6c03d1eb0f2d5c16b052ebad524cc2938ea8e15ecaf2412c8354cc4c9318d69c8800c505537a1d245dac84cdcf3e4cb019bc891cb52a SHA512 1fd7a2c0b90c3cb5f98878e496cb16c29f56aaa28a47509cb302e7c7029727300eb25ae6a38a04a908b14766a7ab59865f8ca8429904210c41db468e398ea3f1
+EBUILD gentoo-kernel-bin-5.7.9.ebuild 1250 BLAKE2B 3d3f0d807e983e9417b7e0bfa79601fba04450de0f4df0dff1b4816af586f4f5080cc86f6c4c77a25c813c4e8194e9c93ac1abdb9265ea7942d2d4d03b9455a3 SHA512 35e02ff8e5e4a2c0ec592f92f84acc6bd740bfee40e71834abf287c9708b904374dee37388bcb2a771e0dded46095cc93f3b4db39ed717d040a7eca26803ab03
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
new file mode 100644
index 000000000000..d6e61fa69369
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.52.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.9.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.9.ebuild
new file mode 100644
index 000000000000..dca6aedbd789
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.7.9.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install
+
+MY_P=${P/-bin/}-1
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+QA_PREBUILT='*'
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_test() {
+	kernel-install_test "${PV}" \
+		"${WORKDIR}/usr/src/linux-${PV}/$(kernel-install_get_image_path)" \
+		"lib/modules/${PV}"
+}
+
+src_install() {
+	mv * "${ED}" || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 8542582da503..da12533ae630 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -12,10 +12,14 @@ DIST genpatches-5.4-50.base.tar.xz 1732832 BLAKE2B 46f33ab709c16a59e8bcde3a561e8
 DIST genpatches-5.4-50.extras.tar.xz 1764 BLAKE2B c7c6e8c2ff97fc143802142f85f6b3447ba8cf30e9be5b307781ae216854e03000127899e66546883d34f3f8659ce636ceae677e85ab932a6a8184d5da4f8214 SHA512 e9fbd2bd8224e1e13f41ebd2af9f35f3896b9cba71c656848998ac53e4a824dd1e071a4e533e8e03fdb5a49ca70b533dcab6eab503f00394729e2216acba811c
 DIST genpatches-5.4-51.base.tar.xz 1747452 BLAKE2B f93a14ea424bc1256e7b8ff34b8aae19f81d4e084ef0e8058f6dc25d776e78705e5e983b45bd24288c1c30b2456a61e349a20ea3bd8275d4e5eeb0fee0a7553b SHA512 4d1ee62f2a8931e97d7be5abfcccfe08ca9687e27abb553148f03d7d8672a35c7c3b1541555e4976e7405ba4782f170acff60b0588a0dda356a2771fe2bc17e4
 DIST genpatches-5.4-51.extras.tar.xz 1768 BLAKE2B b464b9c9ac573b159211c51f9b131ee02f3a009dac6faa1a7f6d123a8070370074cdafe36e9b9e3dd7fbe66ebed290c0372088689425b49c687e79619641fd44 SHA512 5d77b35bfb5af8d0449c543b687a62139c4efdbaba1c75701a44a88c7446ae9a766babb3687d5a26cf8fde1e8b5b7c6f861631b1db9a81afc7dee8240345c7b0
+DIST genpatches-5.4-52.base.tar.xz 1777632 BLAKE2B 458c4599bcc1351963e7470d5841994ef844628b3175d842f0970d85c6902b33c4d3b94c3b5497b0fdd3ce8947d072ad44095c50bef482646db7308dfccbc1a0 SHA512 edf7babd43b42b8c21cb52c51a512cf4761e80e3e4e41f8e0067583957ac7e97adc3cae883f4b915d6a326c74c2ed9903322f533fff750f26d2bb558c7a45394
+DIST genpatches-5.4-52.extras.tar.xz 1764 BLAKE2B b81e9fec54b98cbd75483a814cbf1df30d754039e740fcd72fe9aa739e6c91e13b6107d54729b0e18acbde34f77f3bc00b4fa70e0754188dc2364e02b96a300e SHA512 e8f28f9993f79fa8dbda95b9b990d47da4a598bda0fab378c3ad478aa41558302b58f050716373341483a2eea3f9be7149fa38f2170a6eb620ab2c0def1b3b85
 DIST genpatches-5.6-22.base.tar.xz 499020 BLAKE2B c6a9977f776a79a3da7b61dd57fbf76af7cb91069bd87cbf7189cefd207befdbec044c7bd440aad194245b93ef4254dda949f15a19d1c82e7aac44bc306e14b6 SHA512 c40c15088b75dc325712cb95468d84a4eb87616d634f51a479ac6a34e9515329c90f8360a3f7d7876ab5bb335c4d435d308e37c1562507fa6c57c88f9ecd775c
 DIST genpatches-5.6-22.extras.tar.xz 1764 BLAKE2B 64a589b498dfa1cc41b525a90b77a1524926a4ff9a2f9c1e2e7bd3d3750c531df3545e4af68a04fc7e3e641b6c8985a627190407f6eb85657eac960261f98ef6 SHA512 d0c11d9d5d2966ad3bf2da898e89f99b83f179f5ffda28c8ff4c0c0d0eb7a0e2553d1773ced53557fa54a58a85486802acd51f372ec3026862af58c09049a0f4
 DIST genpatches-5.6-23.base.tar.xz 540292 BLAKE2B f22ce1772f5ab80c9a20e6447a3874c7c664dfe8c1934202706e6d2e84fc378068dc98719796d45809392e7e32d6c0a2233693617f3c3ce84f42dfab00dcdbe7 SHA512 f5db5e258efc2fd0d29e1a772f03838d232b11b9fc22e9cc78ecab70cfcae819a9bc7c24234fbaf94c2b30b559f4fb88e493643e4a6e58169e62eb665564ee9c
 DIST genpatches-5.6-23.extras.tar.xz 1764 BLAKE2B e9dc2a6c1a326782aa1b58f37ad416b39348d30bc24ef2c7af9bac1d734e8c8f058a33a43150eb9cdf7dcc7323a509066082e79eecc582977ad320c5e34fb4a9 SHA512 1c9455a8d52304bf930c1618b98bad7e1c3af47d4984fa8e65ca5723d8120b3ce8ac9106b9e3ecb5824a3220be2706febe1abcdae7c5022a02d7ed5fe07cdf2a
+DIST genpatches-5.7-10.base.tar.xz 471556 BLAKE2B 895b76bb27d9bb8ac06514e1dbb6cb16994b6e5f7357b01efce5ff27d4337975507b132f747bf4a4508de33afb65554aa87c704766f28866efe6d4edf21b9618 SHA512 6fa423283cce5ebf82a45a95965b449aabebf9a49dfceb6173552e7cc6dfe5bdbd54817c7a3a239602fe363993b0b08005e769a350b2e4263eeac9c1eac4b13d
+DIST genpatches-5.7-10.extras.tar.xz 1768 BLAKE2B f51851b7e4fa9eaeab537eb33f09ee19247f078d302167acce077f2804a1e4ea28012f9d9b1cbd9cd0997a6e6ae5785ecb40738c5bec2dc75574c301e047ab4a SHA512 05f9e6c87f736735fc004e9127f79ad820983e59147a79e11357e49b0ff45f924b82d6b5683ea7fe7807cf8b981a8c3e8fb4b731c0fd8d8dcee1e1856dab3ace
 DIST genpatches-5.7-5.base.tar.xz 68572 BLAKE2B a5f975ae2fd61e1e732da8ccb364b969930563752f78fe0e0632edeb486312ca7d9a09fc1e57b99bada394e90cb3a3b76eb41ef8218f93ea0a4dc4f1f23ce012 SHA512 ef5c254b03edf280f3e38ff49d17a856b1d3898bafb8018d1874c1fca3ead90edc88799bbba1cadca34b2a0b2a55b7e7905910ae941e665f783fc3e355274fc0
 DIST genpatches-5.7-5.extras.tar.xz 1764 BLAKE2B 381917b2f8844995edf7c86b9420457ea2d8d8904fc5af94c6ce26990943bd7a61467e3386ccedff42cb4d6c51a2b477ebb89a763edba964995a61ba46f5f4f5 SHA512 8e716f61f988951f2b80e1e667752228067606275392a6084a564e9e4e051d86823458084cf7a3c17a0e56ae58253aeb01065e2329d480995d15b646eb5be761
 DIST genpatches-5.7-6.base.tar.xz 182364 BLAKE2B facff9299c5913596be8bba1dcab4b06e2ae697d66df645ac7c0e8aecfbea7788b4c4574cee69d4db3cf9c8f97c18be4af17f42ef4ec1fc7380b4936ab63cfa9 SHA512 68d3e2e70ac6838ad98b179e9b0694ce96ec0fefec98b497ed0fc689958d413f502915101ee9f38fff1fb5fb6b57d9e79d12870e280bcd84836cf30cd682a654
@@ -26,6 +30,10 @@ DIST genpatches-5.7-8.base.tar.xz 388040 BLAKE2B c6c9a9d335793f3b6d87597d41c260e
 DIST genpatches-5.7-8.extras.tar.xz 1764 BLAKE2B 5502d8c06613ef52c202912b7459daa2c62bd4e937c367b82a0d6e0b50c50d29c8ea32828add17f4c90ac5bd6c994ee3e6229357ac186269a22389a481da9e52 SHA512 3c4087fed105ae8055e7db9f481518ad7f02d668a958a0c19a08e3ecf0ab3e517032e36ebdc2b2a4f747019036b89692cdbfcd379687eac8791f8d5a214c2fb3
 DIST genpatches-5.7-9.base.tar.xz 422996 BLAKE2B b642f97c554acfed1c360ed0a39e8dc926717bcae6d8544e6a8cffbcca892dd489709ef8490b409128a33612b74df7d57c35a10a8f4f6ed4a711bc26cac31293 SHA512 470d95d5964426fdc976f45ab66d03395f9597a5090b2f452607acce6baff5827dbfc385e033125429db4d8d4e32a7e356c3ccfac149c538c604cf331286c2f0
 DIST genpatches-5.7-9.extras.tar.xz 1764 BLAKE2B eb8d437e2761aa350548643ef39beaf73cd7935a0c2028b44edaf9d93c833b7050d11b66e540731708911df971f4bf4b947a89eeddcd9b49278fe1afceb16753 SHA512 4dc6cf6c181756aac4ea0bdffd571e64d787a592d5878d4c90f1f76e34beb3726e94d070b2138b68124ebd01de43b09595072c5f737eb6181d283edbc85d30e9
+DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e2520508bc70764b6363fc2c6bda1e5be46b70528616b26167150cba32f9e57fe17883c455fed34615a216b2398017d307971db SHA512 b90c6f2cdb55bcb115d7b92752a6efd8fdc09f68acbf365b08c9ff89732745f26d2644e18cb097ffd92d75cff07dbd98a9723179a35dc72ce01a732bdd632592
+DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
+DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
+DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.15-arch1.amd64.config 241498 BLAKE2B 2ba5eab2455c909878c36c6084718331042d0f6ab42127868ffb1522f4b53de38879e5707328968e943d1fa44cc504626af52b733829e943532931b49a612834 SHA512 582577bfe4139a8f50c5881cd5a9f24dc3da3124e464756f9efc3d39894eac378483d052e1142730585e40a45641166d309b5e1b5e379f4a5ea2d5ebb2d3314b
 DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c71f3be730a15775b7e1d89cec2d72d28f1921987c63d95fe7bea6778efe0012ece6186449f07f6aca35ccf86805186c0f4c SHA512 187d88bdde7325d46b4bfee8d59ace88ab7dc377606b411e1249f9deee2b571ec42bac52c29d26d67bfadece2e77aad6d5e0255a95a84c200757cb05c69160a1
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
@@ -46,6 +54,7 @@ EBUILD gentoo-kernel-5.4.48.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b80
 EBUILD gentoo-kernel-5.4.49.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
 EBUILD gentoo-kernel-5.4.50.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
 EBUILD gentoo-kernel-5.4.51.ebuild 2151 BLAKE2B 3d424cfae9d59bfe0aa9f6ecf2383b800b16a91ae0a9a28b068810089fb196860ee7832368d240dd363f75d62edd6924b88fe63a59f54e34b05f251b0c3032bf SHA512 2575b8c6c728d43f6641444ce98709d47b0a14f7a91a5fc62f7ea48f175e0f3a14ba5a02aeb5315fece449be4e35b1fc211a8ec6e29ec871fff4eafe4e8f029d
+EBUILD gentoo-kernel-5.4.52.ebuild 2179 BLAKE2B f1cb78565bbf68bf46c285c9b0552cd9c2cd47083b355aa80a7f155281726ecac4520aa8afa47b6534ce80d4f12c622a7de3abb90247d15d2dfdbfc24e8604c7 SHA512 ed2d77e7b0fc6c86f199a1395a6152e430726eaa52b605772127553db0ae71777768c4f928c42f16ed859644a78e074d105220abe0442a61351b1461c7a87c2a
 EBUILD gentoo-kernel-5.6.18.ebuild 2263 BLAKE2B 56496d43cdc9623288c949f9abb29eacb7a022ac3ef65b9eda05ad89bc0ba181e6eacdc16ff390a510ca37e5b7f78fc34b4288fbfba2d55bbe7f9e2d5a5d6bf1 SHA512 94897e50ac1955a6b3ecc169e5366e1956b078cda7244a21cf611089c40ada272efb3ad5b9e6682363ecf12e65c44785f5138197a8e72b4678fdb7b5cc5f0d95
 EBUILD gentoo-kernel-5.6.19.ebuild 2263 BLAKE2B 56496d43cdc9623288c949f9abb29eacb7a022ac3ef65b9eda05ad89bc0ba181e6eacdc16ff390a510ca37e5b7f78fc34b4288fbfba2d55bbe7f9e2d5a5d6bf1 SHA512 94897e50ac1955a6b3ecc169e5366e1956b078cda7244a21cf611089c40ada272efb3ad5b9e6682363ecf12e65c44785f5138197a8e72b4678fdb7b5cc5f0d95
 EBUILD gentoo-kernel-5.7.4.ebuild 2378 BLAKE2B 1e95cfb5ef4c66484f82ff0b43d007155ca63fa0bff689db2de4a2eb6bc6367f59a4362ed3e78bb6e64e797e9f81f8fa621f56cfba395154ac72a508f6fdc799 SHA512 fea3ffd84be4481513cdb2cb5f220a55fe315c3f49b310e4ef1ef4ea1f5254c32c9c248aa59d2d5b6dc1a8a6773667058804f718716e0fc85f7ff375dfdf9866
@@ -53,4 +62,5 @@ EBUILD gentoo-kernel-5.7.5.ebuild 2378 BLAKE2B 1e95cfb5ef4c66484f82ff0b43d007155
 EBUILD gentoo-kernel-5.7.6.ebuild 2378 BLAKE2B 4f9597c4fbdccef3d079856cc164587bcc49227587fd0c97d922d43bd5f31329f02524dfa23737230518dff16eb2ea582301ca3801e9903be96ea578a608af7c SHA512 3d58994b4d27cfd07f292a86b25881ea7186d9e10924e0018d6db311b284a77c7b66999ec1058b804df18b2a7c0eb9f60c2bf08b2d356caa06b4874e885a0966
 EBUILD gentoo-kernel-5.7.7.ebuild 2378 BLAKE2B 4f9597c4fbdccef3d079856cc164587bcc49227587fd0c97d922d43bd5f31329f02524dfa23737230518dff16eb2ea582301ca3801e9903be96ea578a608af7c SHA512 3d58994b4d27cfd07f292a86b25881ea7186d9e10924e0018d6db311b284a77c7b66999ec1058b804df18b2a7c0eb9f60c2bf08b2d356caa06b4874e885a0966
 EBUILD gentoo-kernel-5.7.8.ebuild 2378 BLAKE2B 6aa9e75c8018993791096d02509697607d157145e62effd86382b43ca66c2ab4ca54e13148cac7bce9d9b61ed810b6581dd86209c10f83470de08cc134c2e5c4 SHA512 bcfd877bbd390e48654650f83a6383aadd3e574620d6c75b9280e0b19dd908e245bc848f96f392853e571bd752cc980e79a9279c3dd8b933c587b6c29565ca13
+EBUILD gentoo-kernel-5.7.9.ebuild 2224 BLAKE2B e087182850bc019737d5f48ca742397c5be336227cdb63d202afd5ad388351b185f874027a483706c6a382fc85fc295151b66f960c591ae7f7f37a602686eb2b SHA512 9db5f0dd21da1a09b52a923f25a1ee401d02dad8f4c8be53f47e5a006ef741dc4fac7c532a9972cb1939a328bf9170b722a92205341550940fdd7595cdd77866
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
new file mode 100644
index 000000000000..2466b1e909fb
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.52.ebuild
@@ -0,0 +1,84 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.9.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.9.ebuild
new file mode 100644
index 000000000000..f0988ba69fb4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.7.9.ebuild
@@ -0,0 +1,85 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.7.8
+CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel:${SLOT}
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index d3737875b669..1d8c5cc70ebc 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -28,6 +28,9 @@ DIST genpatches-4.19-130.extras.tar.xz 17520 BLAKE2B ca93048b328f0691ee8cb38d979
 DIST genpatches-4.19-131.base.tar.xz 3659364 BLAKE2B 68cf92fef3cb41c4e842827803f7b50d17b08fae54b346b38e29b480353706cacfc4eb64ce17460fc6be1087db902ad844da0ecb544bcd10f6e579970c75cfbe SHA512 be1049a57b8c1cfcee9056820db34bc1889e46d4bc9c4ed9808a361fa16a141bb92e6b7a38c5019ae2926d4bba45aee63943f8277ac4203bdbd51430fa67b9f4
 DIST genpatches-4.19-131.experimental.tar.xz 6980 BLAKE2B f83eee055983b03de5881b12abde2221cc78f0044efd3d18ccc0994f0ab7a55b8b6b1622d9fc25197864ae17121fa188ce9722a0ef6402bdd75837b67cf765c2 SHA512 e772df10f65f5abd159e2d57005c8c3b621cc6d2b37ce9f6e822567b6349cb3bfac61fb56c21092f39d2e7c90db9f180715cb322c15d1a02ca86e7e5f0853021
 DIST genpatches-4.19-131.extras.tar.xz 17516 BLAKE2B 03197e06dded4459ba1b8d1cebe6c8dd97362a1bddcc2f414afcd2ff8dc78fe65cd8632fb6d35da67d986a684211df7894a442542adc07d09b1793a94857b5dc SHA512 a17a69c5078ff62f4ad2ab31da7eed8576399816f261c5f267791e7359739774e167a70c108342d8f29c3b35c2fcf13adf9378f1f68a2f9cf7c0b6a1c7f21bb0
+DIST genpatches-4.19-132.base.tar.xz 3672896 BLAKE2B a9d5d6016be144f2c37251b8cc55a682afcfeed116b4f0865080b4ba2e9f9d3b070d4ba0b9b61aa3ab3eddf1043c40f12b59761c3be1db1b99112758dc8e4456 SHA512 2aa73126717f146d0082ae6a6cb95ba4d63d65625b22122e4f328c76e17ca951263b13e7ef1bfc94e419dd9bd640b34909a24133ac047694992a66df0044a61d
+DIST genpatches-4.19-132.experimental.tar.xz 6984 BLAKE2B bfd0ef06ac133bd361bf58f70675edf6c18a0687887181129131d475f95dde164c145f84a8643edcd9b894fbbe9fb2233ca51e62d8a2b9337907c4f1bcdfdee1 SHA512 c0583e32835035e49ffec0d95198b63896d231a5d6484f60cd7dcb8829c03bac82be8b3fd88653e9dcf7719bdf7094a9385e53fb76b96785f75fd3ce95873c9e
+DIST genpatches-4.19-132.extras.tar.xz 17512 BLAKE2B a8a15ddb0481bcb9198f385c7bcdb133f8bfb96123dab188ea529b1bd1e0e149ad7e462549948fbbb86d8cd9ac5a032437837bb5b1423c109935195db8b6b412 SHA512 e0ca77588408aabb7a93caf9c66d3d8d1fed721f012c243a6cb8254e53a58d08328729edde258c92a3554bc57d5f355aac915934dba757e8abf2ec9565ca4b41
 DIST genpatches-4.4-222.base.tar.xz 3571800 BLAKE2B 4402f71d528f74ba4da4fab9e0209ca9f169f78ff3619f04b6c448bbd7a21613118d1f79a470f63785180e7080289fb9ab2a59673b9ef3b67838e5fe769e297b SHA512 d03f6b31adbf185918cb71a9a276cc09c500f2d6234c6d86e9d4341e487204b4b50ee3a0af48002bb529a0445ee50f7ce187ffabb9b76a69e789a7a930caf23a
 DIST genpatches-4.4-222.experimental.tar.xz 83348 BLAKE2B fbb8c234d060b3c54b0ecb3763ca0b36700556817d4bec51ceace60a68b82c7d93c673ab3372e9e0aecfc9e0cf688340c6122070b509096971f98e1bee86d71b SHA512 d8c39c415bcb5f40e1d3877f85e9ac649936af66108d9106f5c6732b2f75b37b6a18893889fc4ed6f8409ad47b0d5a2ba1e45a16bf31a0fa3b0e771789841d83
 DIST genpatches-4.4-222.extras.tar.xz 16496 BLAKE2B cc06659a35fed7d1bac1d7c8076f1199b5985b99202c64b6f09a8557361151b51be540189b1ffeb8acfe222cfb4908e401f74b5757e6ba65a2c16dd035fb831b SHA512 294bf913915ca2669475be17dcc91f2b65c5c48bf59964650a869f1d2773e2940a09b8caf51fa92db7933d3eafa3569df64699ff10bcf1b16bed1c722fef7581
@@ -67,9 +70,15 @@ DIST genpatches-5.4-50.extras.tar.xz 1764 BLAKE2B c7c6e8c2ff97fc143802142f85f6b3
 DIST genpatches-5.4-51.base.tar.xz 1747452 BLAKE2B f93a14ea424bc1256e7b8ff34b8aae19f81d4e084ef0e8058f6dc25d776e78705e5e983b45bd24288c1c30b2456a61e349a20ea3bd8275d4e5eeb0fee0a7553b SHA512 4d1ee62f2a8931e97d7be5abfcccfe08ca9687e27abb553148f03d7d8672a35c7c3b1541555e4976e7405ba4782f170acff60b0588a0dda356a2771fe2bc17e4
 DIST genpatches-5.4-51.experimental.tar.xz 6700 BLAKE2B 1233655d1e963de741102e34b5ed6cab6678bfc2f62113887fd5ad083d563526c28253e2a434146852111fef9f7584107943e14258c4bc9177ab6e824937c33c SHA512 755e7df09207690e1838bc6fd16e7e797023b452557d2bc72d569198a961f70831add03a8043c2da63ca4b363ad5be3f29cd28ac68c8496ee7c2b7c98cf0f941
 DIST genpatches-5.4-51.extras.tar.xz 1768 BLAKE2B b464b9c9ac573b159211c51f9b131ee02f3a009dac6faa1a7f6d123a8070370074cdafe36e9b9e3dd7fbe66ebed290c0372088689425b49c687e79619641fd44 SHA512 5d77b35bfb5af8d0449c543b687a62139c4efdbaba1c75701a44a88c7446ae9a766babb3687d5a26cf8fde1e8b5b7c6f861631b1db9a81afc7dee8240345c7b0
+DIST genpatches-5.4-52.base.tar.xz 1777632 BLAKE2B 458c4599bcc1351963e7470d5841994ef844628b3175d842f0970d85c6902b33c4d3b94c3b5497b0fdd3ce8947d072ad44095c50bef482646db7308dfccbc1a0 SHA512 edf7babd43b42b8c21cb52c51a512cf4761e80e3e4e41f8e0067583957ac7e97adc3cae883f4b915d6a326c74c2ed9903322f533fff750f26d2bb558c7a45394
+DIST genpatches-5.4-52.experimental.tar.xz 6692 BLAKE2B 221a4fdfad205e4f5856a5021d2152152d9ca298639e7405b21cc129e1134f440289a99a50ef4cce032bfbf19f87709850605306bb3b25c7110de9113c126802 SHA512 8f4dc55bcc4db4d24f26c60fa146b1cb7207552b193bbe62f645240f751e5770f18e4b25d63759d210d5fa5941d43a629567256d586c3bdb098ce93f915a56fe
+DIST genpatches-5.4-52.extras.tar.xz 1764 BLAKE2B b81e9fec54b98cbd75483a814cbf1df30d754039e740fcd72fe9aa739e6c91e13b6107d54729b0e18acbde34f77f3bc00b4fa70e0754188dc2364e02b96a300e SHA512 e8f28f9993f79fa8dbda95b9b990d47da4a598bda0fab378c3ad478aa41558302b58f050716373341483a2eea3f9be7149fa38f2170a6eb620ab2c0def1b3b85
 DIST genpatches-5.6-23.base.tar.xz 540292 BLAKE2B f22ce1772f5ab80c9a20e6447a3874c7c664dfe8c1934202706e6d2e84fc378068dc98719796d45809392e7e32d6c0a2233693617f3c3ce84f42dfab00dcdbe7 SHA512 f5db5e258efc2fd0d29e1a772f03838d232b11b9fc22e9cc78ecab70cfcae819a9bc7c24234fbaf94c2b30b559f4fb88e493643e4a6e58169e62eb665564ee9c
 DIST genpatches-5.6-23.experimental.tar.xz 13688 BLAKE2B b67102c744d95ed0bbc54bc4958b68ff55d1c447594f4c153c3417fac5e2521a78f157df27a7b479ccca6cbe3b7706a2a8b2053bf1376886be89e18c6cae9b1f SHA512 a2f2546748371a311b51063595b219dddabf72956c946ee7db76d1b8a32fc015143ce29c6fd8cfee6a834d334308a1c960267ecd42ae304926b186a5de86fe1b
 DIST genpatches-5.6-23.extras.tar.xz 1764 BLAKE2B e9dc2a6c1a326782aa1b58f37ad416b39348d30bc24ef2c7af9bac1d734e8c8f058a33a43150eb9cdf7dcc7323a509066082e79eecc582977ad320c5e34fb4a9 SHA512 1c9455a8d52304bf930c1618b98bad7e1c3af47d4984fa8e65ca5723d8120b3ce8ac9106b9e3ecb5824a3220be2706febe1abcdae7c5022a02d7ed5fe07cdf2a
+DIST genpatches-5.7-10.base.tar.xz 471556 BLAKE2B 895b76bb27d9bb8ac06514e1dbb6cb16994b6e5f7357b01efce5ff27d4337975507b132f747bf4a4508de33afb65554aa87c704766f28866efe6d4edf21b9618 SHA512 6fa423283cce5ebf82a45a95965b449aabebf9a49dfceb6173552e7cc6dfe5bdbd54817c7a3a239602fe363993b0b08005e769a350b2e4263eeac9c1eac4b13d
+DIST genpatches-5.7-10.experimental.tar.xz 14148 BLAKE2B 1a73711680c8fba7c27b567e6757faa08622fb4beef093791ea274c32be7a73ad102cbb4f278864b0badcc32edc216c4fd331fe2dbfbe4cba3606e4220bf6086 SHA512 96980f0e26f2f13d89c9e2721b8512deca50602d2fe4a60f43ffab4744d8f0c6ce5ea5baceb01da92f4ba10f676371ef2ed4ef79c8b0eb0cbc11f2614173e0ff
+DIST genpatches-5.7-10.extras.tar.xz 1768 BLAKE2B f51851b7e4fa9eaeab537eb33f09ee19247f078d302167acce077f2804a1e4ea28012f9d9b1cbd9cd0997a6e6ae5785ecb40738c5bec2dc75574c301e047ab4a SHA512 05f9e6c87f736735fc004e9127f79ad820983e59147a79e11357e49b0ff45f924b82d6b5683ea7fe7807cf8b981a8c3e8fb4b731c0fd8d8dcee1e1856dab3ace
 DIST genpatches-5.7-5.base.tar.xz 68572 BLAKE2B a5f975ae2fd61e1e732da8ccb364b969930563752f78fe0e0632edeb486312ca7d9a09fc1e57b99bada394e90cb3a3b76eb41ef8218f93ea0a4dc4f1f23ce012 SHA512 ef5c254b03edf280f3e38ff49d17a856b1d3898bafb8018d1874c1fca3ead90edc88799bbba1cadca34b2a0b2a55b7e7905910ae941e665f783fc3e355274fc0
 DIST genpatches-5.7-5.experimental.tar.xz 13708 BLAKE2B c511849c9f1c8e874b354624c99164af2322d9b3429cae5719224f0f60717a08235252abd6eeff672d07a3154bd63517a50478dec734109f9de69b2cd85c5139 SHA512 31b425772e0faaa7ba26bf1a423bd953e6c1a151874e6d0d89ac1983f45069ea95e0b230778b7f41811f87d2688509c8f3c622e51a4650008dc914dd6cfd54de
 DIST genpatches-5.7-5.extras.tar.xz 1764 BLAKE2B 381917b2f8844995edf7c86b9420457ea2d8d8904fc5af94c6ce26990943bd7a61467e3386ccedff42cb4d6c51a2b477ebb89a763edba964995a61ba46f5f4f5 SHA512 8e716f61f988951f2b80e1e667752228067606275392a6084a564e9e4e051d86823458084cf7a3c17a0e56ae58253aeb01065e2329d480995d15b646eb5be761
@@ -102,6 +111,7 @@ EBUILD gentoo-sources-4.19.129.ebuild 730 BLAKE2B cfb4dfcacfbd15945d4990c23342cc
 EBUILD gentoo-sources-4.19.130.ebuild 736 BLAKE2B 6c40eebf03bb5737c76f87b79da6a0536682f533b098a4ff117cf0a2fb2e9f53b5415b205598f1db1b41ecf04a9d83c91c01bd30087c6c92f1267c85b0edfccd SHA512 5e15875a0185e26ec263d8fe64ed01c0bf35dec66c1b6cf54643eec8aed0254b93460e7bd55ca52d9ee5fee3061b58cde54ce291d5050f1b56eb720954308635
 EBUILD gentoo-sources-4.19.131.ebuild 736 BLAKE2B 1d5e4dd89bf2b01f4344ed3a6d682af25387b74cae4c79c1c1007adea8c7881f6b82ec5af54b1be83635c5f417d03aaa7f3372e766683b6f4d107270a01fefa2 SHA512 61b6f81c057c6c0be1022005dc67600155653fbe11fef4b51556b72fe00d71ede33968f3b2452a50ce4104a36b3305b9909aed0f9fe5d8fad3cbc34aa358f0ba
 EBUILD gentoo-sources-4.19.132.ebuild 736 BLAKE2B df005d05fd70eac16f268aafa84d4896314c5f0ccc86975ff083f8000e029ed6b41229254fff18b4a1e0454ac62a56e1099a99f4f4355e9529aebf3c95e8afa6 SHA512 a5e0d0346d63b369d2e292d4e5ede6a6fffe38595749bab95e87493bb566476738ebe5e233b074e86061c08df0402b542c6f36bd3653ceb0facf871b4942d0ec
+EBUILD gentoo-sources-4.19.133.ebuild 736 BLAKE2B b34defb637bb5c7b284d6632051c43a4962e8f2159de0e4992e45bb9323180f92e1070b5e07b94d4d014f1ccb32e0873aaaf54695f70264f22d9cc4490ff43dd SHA512 45f9999bea7d37ce63da361a000cf0baeefbca272625894f4223d15784220b373f23cf32c4793337463b4b15901e8a13dd6433454c6ad36cadfc35073b2686d0
 EBUILD gentoo-sources-4.4.221.ebuild 729 BLAKE2B 6ca7a8f5c029ab35fe94e9cd49bca37f553cae98300ffd0a1ba2d2cd8aa34297c0de7508ff2d32ae0eb60b65257c0ca7e7897e9af34be4d37ee245a4daea8830 SHA512 01e9c43a850a92c9c5b5f5c0a74f838ee86d49fcfbe462c55ff42beb553788f15b962c7d6f64562c94a1a496e2df9666ff6b558e64722da8987b15855885325e
 EBUILD gentoo-sources-4.4.228.ebuild 730 BLAKE2B e0b5fd63d11f098ee2cd35f92b74c46eec12b5134825bb7c99f9e0a3c6082c34aac36ca40b172048e6c1c93a9ff1bba2abacbe2eb6cb86831c8883ad7e5de129 SHA512 ec14fde115db161fb72b445baaa98a53cc24235813c49990ec0726ec4f21923fa25112c6ea4f68c88c739256bf6a55058bdecdd11573441f476e78e05d1584f7
 EBUILD gentoo-sources-4.4.229.ebuild 736 BLAKE2B 098d95c43bb0cef02351d13f5f94c4e0a059e44937e1ec5dfa7b999d076695b5fabea1b9fac0ba56854480621ce84ff89a771bb5bcb21d23bdc1aa5513a22f80 SHA512 c113f6e8e3f192e9eba4f720f72addbcfd773f9f3ac02daa59d047f64ba79233094492faea634c02af50728d1ca9271996178da009dd165b00917691f17fc9d0
@@ -115,10 +125,12 @@ EBUILD gentoo-sources-5.4.48.ebuild 728 BLAKE2B a8d098b32c0b6ed06bee0fbbdc62e75f
 EBUILD gentoo-sources-5.4.49.ebuild 735 BLAKE2B ad58a2a8a0171e1ee878b8d0b005f6a1d4b66e2518b33e83fc1dc9d600ec9cac385b6058b06d2677a04eae436c634eb645d5cdf39fffb4fcd2296ef2ab9b9991 SHA512 441b89b51558050320818f85120e83f840252cd66a61f5d8ad109600462ee5e081a50dfce68b8c5845f21d68fb19fcd2b64447cdf03c8987ece23bb24d0f7d69
 EBUILD gentoo-sources-5.4.50.ebuild 735 BLAKE2B 90f8371e90027f3e757ebd4549fa8f6de2634867382fbe67f5f428995c8c7d43542aee346404a0226833741dd92e522204208fc5b45e1a0112369b9d04d62711 SHA512 db2e5b8b3b63b04ccf4dca704cebc3705d11d7eed6851d15309e181bf2672be76a53132d33844b6b09805aa2f35acfa852f7da393d80cacc9d488e7d3db50e96
 EBUILD gentoo-sources-5.4.51.ebuild 735 BLAKE2B 37f05fe00f3add52b04672647916e3de77ed527b350c12c1700818101a8feb3a91b8b538a383df19a877ff92cbe0fd42cb301e4abf73ad363ec45ddac44c388c SHA512 841984f432f5b1d8ee630cfcf40d3073ba663ee26286f0273be0f01f324603f1d23e9226f542464c49b0049d772f31c232ef91dfc628d02cd0839f2b02dcab0c
+EBUILD gentoo-sources-5.4.52.ebuild 735 BLAKE2B 7d90dc1c9036cb73b8c95ac0ed897bf4e66b5ab109a0549949841c2b27651cc1520c91c00c5fe329dab4954d9acdb69ecc5b6d876ae65c421fd6447358f3c4ca SHA512 2ef97344936166a41466b44167edd7abdd0ee22e62e54639d008b1d2adbf30838e44e8a2847b93c18166d7256e1b5fa732ca163c39dd4982fec4d1a171d34bf6
 EBUILD gentoo-sources-5.6.19.ebuild 735 BLAKE2B db588ac1c7512d6f5b0e7ece577cc4ccf7e926aa7218c076d6c21148123d86dd4c7428481e7540cc260d38fa67d88c47a13ede86a2a686a2dcec672360c42a7c SHA512 b83d8f3a961262bf84df42ac87b2001547d4a9cee9154664065880ea85c095d5c33020b3104c198a7576ab33853a643ca8ce9f4770a91c5211fdb3c60e2feab7
 EBUILD gentoo-sources-5.7.4.ebuild 734 BLAKE2B 394de3dd79025b61d51744bb8dd583aacaf9636f08eabad8e9f0565713af4368b9796c1f7c2cfc67b9c90a5ccd604ea3c964d2a1b85a6e5921e45ffb639863ef SHA512 510ec265a59a2398007bfec9e5e3a3be7638a7a2f8ab9500b98fc0ffdd26f940cdfa074445bc154410cd4d099057ece1351fcef66aaa12096999c17a84827817
 EBUILD gentoo-sources-5.7.5.ebuild 734 BLAKE2B 5a4981b9e187d92f0330cecb9ad95b17fb483a766ff61fb85dffa5440eff17616e6b09787e5822bb52587aacfe8933957da460a5227fa62b9e7a3ae4b38dd14b SHA512 f4d8ae5c569f6c19dd38fb4ac411ab8bc94592069a8149cf3e8baa03a0465b0e0a894b62da62711fe5ab3cd99580b32ef78db0ada1c5e582e725e456c1342c00
 EBUILD gentoo-sources-5.7.6.ebuild 734 BLAKE2B f602927c87bbc0fb4b099b47547aef2f752cf2135a9ef3ca58fe1b1d0b55dfc6d2d20565a85bfd8a742a78b4e7527468c167960e92adfe516ed9f5bf51a98856 SHA512 bb1e4df14aa0d8ac8f4f04c9c8bbc4c58584648e958be029af894ae30772dd06f3e1150618af2e32e25e7fa892e5d17df034bdac36a38e542522cecd57f6f381
 EBUILD gentoo-sources-5.7.7.ebuild 734 BLAKE2B 712eb91fe9e4c7c28eef7bb92e5c6db6937a1931f65ea38a23d4663a8505cd700a2c2bf5565e375a1c6e9232b0238538adc4e308b77162aa8b7f71a5afd70f0d SHA512 25c21b2a089efb26a394d7f7182154a19c82011b5236d29cea7ef8796accea460096badea8ace22fe1e1200eff19af78f34880f0cd76fe3fe598606f489b9648
 EBUILD gentoo-sources-5.7.8.ebuild 734 BLAKE2B a7ad4915d3a0c8ca61d2ffbbfa4609cc0c4c34c4caee6337e3f0264d6e12e2509b52d2c8df5364442970361f672789bf46e2da384366abb3af2a845f49e06c3e SHA512 64b716182622504fe4c5743ca3b036c3c4cfd6752eada73b9297a9bf1ba40dd363214ff0c61fef58a672b09ac3c1da7f75306dcafa292cc9a1f905abf20236cb
+EBUILD gentoo-sources-5.7.9.ebuild 735 BLAKE2B a4c81e4c51e567f272c4dc12e6311280480989115ffd545e64ce14a8d958f41b1537d42cfa9b619e349fde65595ea056b0111525f750145dfeb0e3afb11705e6 SHA512 95c165ed8521e66dbe01acf16b7b61ef3b88ea980ba5e64b60855d06a0bcdc1a4ad6c5d0bdbe230031ae7d421681b3cfdfd17046f1ca8379c4895efed13d80dc
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.133.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.133.ebuild
new file mode 100644
index 000000000000..97f908111c3e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.133.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="132"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.52.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.52.ebuild
new file mode 100644
index 000000000000..75ec09e1743e
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.52.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="52"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.7.9.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.7.9.ebuild
new file mode 100644
index 000000000000..dac94ff87df7
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.7.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="10"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 20fca63bcfd2..6050e001efdc 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,3 +1,7 @@
+DIST kernel-i686-fedora.config.5.7.8 191864 BLAKE2B 217857254ffd12e987a5bd573e2520508bc70764b6363fc2c6bda1e5be46b70528616b26167150cba32f9e57fe17883c455fed34615a216b2398017d307971db SHA512 b90c6f2cdb55bcb115d7b92752a6efd8fdc09f68acbf365b08c9ff89732745f26d2644e18cb097ffd92d75cff07dbd98a9723179a35dc72ce01a732bdd632592
+DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
+DIST kernel-x86_64-fedora.config.5.7.8 192882 BLAKE2B 23044bd3625d1ced686950c1322e91dd99eddb3128ab830c8862f5c949b66df67bc9ce38b810f4d54a35f9b9f11feb58d01450593ec513e132d789e3a50ac48b SHA512 b7770da1f608e8f0ec227dbeaf66491815e9fc4f8f08f01d2ad5877dd1946e73b315e8834f35cb5fc035fc3ac52ede8365107515d54b0792f326ad937d901625
+DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.4.15-arch1.amd64.config 241498 BLAKE2B 2ba5eab2455c909878c36c6084718331042d0f6ab42127868ffb1522f4b53de38879e5707328968e943d1fa44cc504626af52b733829e943532931b49a612834 SHA512 582577bfe4139a8f50c5881cd5a9f24dc3da3124e464756f9efc3d39894eac378483d052e1142730585e40a45641166d309b5e1b5e379f4a5ea2d5ebb2d3314b
 DIST linux-5.4.15-arch1.i686.config 241195 BLAKE2B d3332b83a3d57c450bb1d5e85d83c71f3be730a15775b7e1d89cec2d72d28f1921987c63d95fe7bea6778efe0012ece6186449f07f6aca35ccf86805186c0f4c SHA512 187d88bdde7325d46b4bfee8d59ace88ab7dc377606b411e1249f9deee2b571ec42bac52c29d26d67bfadece2e77aad6d5e0255a95a84c200757cb05c69160a1
 DIST linux-5.4.40.tar.xz 109535980 BLAKE2B 4857f032d5333f3c16f0947f51d6fe632527cfd78e6c556b62f5356848ef3280244eef7ffaaa136589b10e151aad3087593f3518fd0fc6958d4647b786401169 SHA512 c8785d30f7b88f3a6e565789974ecf1a055900ab4b66e358070547506aecab57b5d34afb77140cb2aeb803498c407d34f7fc11c29fbba00f6d4dedea8dd8788a
@@ -7,6 +11,7 @@ DIST linux-5.4.48.tar.xz 109547096 BLAKE2B b4780040ea1e619ce84055332c23a53ec52ad
 DIST linux-5.4.49.tar.xz 109559180 BLAKE2B 1e4c3dcc0f9826c2cf6211afb4fd17778abf14d50f1bd0acfe4fb675eecce9d2bc6260417edec4b11365974088ffcf9e316a0a292811c4d74bf3041371932225 SHA512 6ef787b4aa312929c3e0060f606be63fc430923b6f292d8961884f3ec3f8a34b0099e19eadafa9b246a79ea12a0655586616ddf765928d7f446528dbf9a74f30
 DIST linux-5.4.50.tar.xz 109558772 BLAKE2B 4773da0615fc6bea24daae4ef74e4be5c87c953147853a131150a77a23bfe5b8930202bfa9a1d4651cbb0b240bcce2085c8dc4127aa376df7f0b2e4302f6141d SHA512 c8af71c654a3026a19dd961594d61ea89cd8ecd533e9d3c2306c1b23932bcb4d5f20aaab4ef0e4a25375d5d41556f5e82f6e16b0e658ef828540521e9cef8376
 DIST linux-5.4.51.tar.xz 109562468 BLAKE2B 1a5e304168a3ff83b9addfa2743d5e5e2ad44440071f9dea1c86701c5ac456d9cc78b79cd2b951210dea2dc5c23136e79b2a6088bf7fbbf1631e2db993c91c4f SHA512 2cca21b8a9444eac408c8f931ba66090bdfa4447352dc1db5daa734ef7cfbf529b58642c679b683a544dbd453f6e5e842a51bc4038242ef568cbee26369b241c
+DIST linux-5.4.52.tar.xz 109563772 BLAKE2B 32995d32bfc9ee5d6a5669941897890fc765765f8a141740486f4ad6000fcdd4e4c7f3e9c8fdc7357fba70947cce99d493e8657321c0c836c4930075eacec7eb SHA512 ed0eac6cc07f9e3bc455c82f1594fb0a5310430d3abc3cc2058e1c75af7608aa1b6f70790573873d7e9e4fafdd17cd0bdd5624c6eed5d51dd1da12a873d78a8e
 DIST linux-5.6.18.tar.xz 111817124 BLAKE2B a8c01860ac9e55b33709c450fb663815205260b5e62cd2bed224a47ccf1e249d2b02515f945d2508b83f1f59727d9fed29937fe584d5cfe42c5d035c020f3407 SHA512 4cef44b489b51bc4f826aafb36d0b767fc33adeb471c69c088d5e5f8a779a580a6992bcc0769800ecf658e77434dd513ed436813cbffa39d3f98f24ea8fcf1f3
 DIST linux-5.6.19.tar.xz 111829024 BLAKE2B 7c0afa0e3d322314992022272614973311a8dfb85de5e0710dd4c929b0abc0a2389b49938f7df4256ea5719bf2a56a7d6eed2eebb51c337fd5fb277747a6620a SHA512 0b3c64ab4f63431c2da6786b4f85237f20c86f20a1faa79440d9cbc2aa6101118b0f18b6688ca7ad27dbcc4978d197fae52886fc23a3e2deb3c0a1d9c82c386b
 DIST linux-5.6.8-arch1.amd64.config 246166 BLAKE2B e749472cf4bcd1fae509bf524367106c07111f5d385b5cacf335fe03188c30c184e3535603de2b855f81538fa6fb09cedfec16ff02db5b5583a90e5cb150dba5 SHA512 873275e0ba75fb5670ac7f90abfb16ab912b1a94e5f8f39845283230763118d244c1b02e33f1b05b5d86fce90cd274c944725465dabf2dd0e79fa735fabe4d4f
@@ -20,6 +25,7 @@ DIST linux-5.7.6-arch1.i686.config 247724 BLAKE2B ac3dcd47ef34195b3f3c9d2a7c9836
 DIST linux-5.7.6.tar.xz 112711436 BLAKE2B 6f85bbef8ed4db5214c71fcc32e4793ee336f635ff385f5208a3eb8f45e5201b9acb40db2e0e51514a2d95269336208ab6156cf695c7f4ceb8df6b537dd0cab6 SHA512 83b6622634508caf02f782688c86138cca741daad7f7b5a87a55f1f33a59d0a93ba832da46a2cb36bafaf38c31be7c7420479cf2137da928c6ccf798428fbc36
 DIST linux-5.7.7.tar.xz 112714212 BLAKE2B 0bd13b75dba824231903ce5542936c911661b5fe54f565cfb3fc31cde96d1557d543367f232fac8c8ecec65a065dd843bd7a55fb67d9dd8abfae3074808520c7 SHA512 49db85a1ce14e00411215d5d5bfda6db3d24ed2e0f2bd8e6603c18b3226614f45040856b21b4d6b525c44bb4463ab08fb594a06de6deca109d512588389cc3fd
 DIST linux-5.7.8.tar.xz 112715608 BLAKE2B e586d51ea94a35a1f5f3801d478752a8b873a815bfcbb332eb36293ff101e88c8d10978f06831f12d5ca6df02e54368cca6f66ae9dcf7befc01358954fa8cb29 SHA512 2b64612db07d3f47a6fa1bc52f5b0c400142948621865ccc0000a40fcf7623719b5a32af435bc26ba2bcae72910e3bb752a809d2fbd089f05ecbbe9c6a1ebba2
+DIST linux-5.7.9.tar.xz 112720936 BLAKE2B c1a0202ecd9588741e743b3aa631c53cf32b0cade78483b8df0b3dbe8a62f2720e0f6c41fbe6b8e1a561d5ca2f555bca9c9f812013f49788cd7028d182266366 SHA512 dc96215a690b94d74bb81bd46e87b179a9acb82e0c4831581381c73402b933f7c47c019f8f454338c6714355d66124bdfe9a93aebe872f5e5ec71adc828f6e41
 DIST tinycorelinux-10.1-amd64.qcow2 16842752 BLAKE2B e013e76503c335739a9623c0901ca791937a0e6b177854535cadec1e2c2cd2df588283ed3128cf652595f32264fbfe5b3bd3a8c97665fd4da344e308535be366 SHA512 c3aeb20ff8769da9211694b7f701907cc7ae7582cdfad2c2fdc008d97ebcbd9dc08245b4e8f8450e1cb304bd705345a11fe79f901a47979fee91443841d55641
 DIST tinycorelinux-10.1-x86.qcow2 14876672 BLAKE2B 3c760eb7438b13261e52ecfaa33a53649ced95f1ab40aae52134b8cdc31a16d7aa0d6a6dd716e268ed148e9d77a10b7c700b141b61d70c82d271ffe88e8e2a3c SHA512 9964538dc42f232a11949f74b61d46422ea5da3bdc253a217119bd0b8a750c40fd2da0b07157067be9ac0226472614f210a1248114df0d331df390979867a895
 EBUILD vanilla-kernel-5.4.40.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
@@ -29,6 +35,7 @@ EBUILD vanilla-kernel-5.4.48.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd
 EBUILD vanilla-kernel-5.4.49.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
 EBUILD vanilla-kernel-5.4.50.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
 EBUILD vanilla-kernel-5.4.51.ebuild 1842 BLAKE2B 602e78ae2dde6491e22e190d3e156cd1683ea4c7e5b15d59e4644b24db2cc256f14f74d80bff40ba4aefa320cafebebe7c1e5b920e15e1bd5fd63a94f42c51f6 SHA512 b0bf845214b80b447bf5bec57fbf3df7a130f4d1a0d710cb212224705366b469b09eb2d8b669e5cee89ce8cd778f4297fca139beec6e9fc9d4985a22e3a9f4fa
+EBUILD vanilla-kernel-5.4.52.ebuild 1870 BLAKE2B 7cf840af250a2ed65c0dcfed9753b5f6825c963fbe38e95323bf3895083a90232904ecf5fa76b34f757a2931bc1a26e8891cdd9841b6aa537fe75d3efb5df10e SHA512 0cfe61e4da8892959c1a389ebf37c9bcdcabdfa7e424bbb84d98a8730b9bfd950f8049589f4915c7afbb2d9d348582497c1efa5ec2b95aa3182969f14401a036
 EBUILD vanilla-kernel-5.6.18.ebuild 1943 BLAKE2B cb0a35c29c61d5483b3d94996bc947f2821f3d13331f25f97ebf84fc68f272402b9066de9abfe1c2994246a7d8447540a454da3b0eb07636f46ba5d1947c8877 SHA512 942b7d041be0746be9023bb52be8f00c4cb33ed17e6b29670f860222bfc73ea0533ae2c1c0809799bc48ae4cc57cd2f480f35fb9ae7c1c67309eb13367cdfaf6
 EBUILD vanilla-kernel-5.6.19.ebuild 1943 BLAKE2B cb0a35c29c61d5483b3d94996bc947f2821f3d13331f25f97ebf84fc68f272402b9066de9abfe1c2994246a7d8447540a454da3b0eb07636f46ba5d1947c8877 SHA512 942b7d041be0746be9023bb52be8f00c4cb33ed17e6b29670f860222bfc73ea0533ae2c1c0809799bc48ae4cc57cd2f480f35fb9ae7c1c67309eb13367cdfaf6
 EBUILD vanilla-kernel-5.7.4.ebuild 2058 BLAKE2B 0fa275b67897324218670c5219c4fd4ba8fa01a3a0894223c610694c0a3a45dc70cd73cab6e55e6c901c091746ac607c9310b798a5ecae2add48c6380233af8b SHA512 e1811df16da00c550862de9eba31653acfb75722d85d4285793b52e7dee1448a1324bbace8a48cd6dac9b06a70b5a6ef724dc8ab663aff601bb37e3349d721dd
@@ -36,4 +43,5 @@ EBUILD vanilla-kernel-5.7.5.ebuild 2058 BLAKE2B 0fa275b67897324218670c5219c4fd4b
 EBUILD vanilla-kernel-5.7.6.ebuild 2058 BLAKE2B 7f7c3c55f64e35fd181f6c4aa2ba7bfa126cf7eb64e7415634bbfe5642012c95de142b1a0fc2538e9fd1a35979bbdf1805ca187c0719e4ed6c77f0f5a7d09a7f SHA512 4583f88bfc023c9c7495b02e51dd0e2be6837125d63fe777974db6dd056e9fec8cbb57d3c567678ebdc417b6326116d12fa4afcc221ee66c0edb38b20fd8e870
 EBUILD vanilla-kernel-5.7.7.ebuild 2058 BLAKE2B 7f7c3c55f64e35fd181f6c4aa2ba7bfa126cf7eb64e7415634bbfe5642012c95de142b1a0fc2538e9fd1a35979bbdf1805ca187c0719e4ed6c77f0f5a7d09a7f SHA512 4583f88bfc023c9c7495b02e51dd0e2be6837125d63fe777974db6dd056e9fec8cbb57d3c567678ebdc417b6326116d12fa4afcc221ee66c0edb38b20fd8e870
 EBUILD vanilla-kernel-5.7.8.ebuild 2058 BLAKE2B ca0cdab705165f010e7aa8451ae6dccdde42a1aa998a3b45aa6f289456d95e8521c814d01013fcfddcfe3b310561dc68dcb377202d4785d4e0bb9371d3a547f8 SHA512 7cd71393107ed488b23b2a35b780c7ae166101cdcb5e80b6dd3c925f8b01004a61885934f75b2d59f4a2120950268ecee722afde2bbc584785cee9d4d26ba661
+EBUILD vanilla-kernel-5.7.9.ebuild 1904 BLAKE2B c9b79828a629481941919526dfc01415360a769f7b62196f8636adccd8063abba0f9a168a1f7511975e9f4da22bd3d614175004155e1e6f86729aea1c1cf9926 SHA512 82ea44db216e918c552254a85fe2d45f7cad66d7381548ee2f4540c5dd87207cbf58985993f34adf2cebb5ed5d35b9c53e0541be7aa965469707e9d9c9afc921
 MISC metadata.xml 352 BLAKE2B d45c3f23945883bcb819c225e43715f5cfd86090f3e928dfb62b26a7b38b98421ee0c0d3b4fe9ebdb9de39c294cbc288c1731e9493f69436a6916034d8b834d9 SHA512 e3b9651b8f0fa3b07626b4cfb01456e4ecea1ae053ad9e9e1b3c925a5de601b35c9f3983535d62edae9ef49a40fe4c319e013542908839f30415f6ad85463e24
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild
new file mode 100644
index 000000000000..751244a438b1
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.52.ebuild
@@ -0,0 +1,76 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+			-> kernel-x86_64.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+			-> kernel-i686.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	[[ ${ARCH} == x86 ]] && config_tweaks+=(
+		# fix autoenabling 64bit
+		-e '2i\
+# CONFIG_64BIT is not set'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.9.ebuild
new file mode 100644
index 000000000000..079fc98c2af1
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.7.9.ebuild
@@ -0,0 +1,77 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.7.8
+CONFIG_HASH=14d239184a721485a823f30f5aede1c6190558ad
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="debug"
+REQUIRED_USE="
+	arm? ( savedconfig )
+	arm64? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+	debug? ( dev-util/dwarves )"
+
+pkg_pretend() {
+	ewarn "Starting with 5.7.9, Distribution Kernels are switching from Arch"
+	ewarn "Linux configs to Fedora.  Please keep a backup kernel just in case."
+
+	kernel-install_pkg_pretend
+}
+
+src_prepare() {
+	default
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm|arm64)
+			return
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local config_tweaks=(
+		# shove arch under the carpet!
+		-e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+		# we do support x32
+		-e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+		# disable signatures
+		-e '/CONFIG_MODULE_SIG/d'
+		-e '/CONFIG_SECURITY_LOCKDOWN/d'
+	)
+	use debug || config_tweaks+=(
+		-e '/CONFIG_DEBUG_INFO/d'
+	)
+	sed -i "${config_tweaks[@]}" .config || die
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index b2fb8630a7d0..1e80de3310e6 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -5,15 +5,15 @@ DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.7.tar.xz 112690468 BLAKE2B b2b71e231507429b178b6b89be546c4a3ee2757f5d2c58b6137d383f16034a587225a75a9dbca6a01a433056ebe078487132c224e909a2971c9634687e47b1d1 SHA512 45bde01593f6147c8c169b9e46b4b56eee998142552ae0ff82f1dd21b1fd54f3b32f6283f6bd77ea717d374672167849e468c157f235d2f12f7d7816e4623bf6
 DIST patch-4.14.188.xz 3751528 BLAKE2B 73b19963f06c9be0db22f2ab1688c2ce224b5859005df9cbe66daa9fd85c108bdb1ac259b323afdd1bc3c8dda9aa7dd5f6177b48094dcbae519808acbf32502c SHA512 21f3aee7f4816c1bd171025bf53558fc9da716cb842cd3f6b7bb7e0fedb4ec43ea7c6b629cfe5f331e3bf0eb934242ba09e31df1661cb44593f6633547125003
-DIST patch-4.19.132.xz 3221744 BLAKE2B a22d8eccf28f32f96b2dc991de45ecae0408113756a84c5f016f22b392777541e52b77c1e2d6a19a759655475f7c3d7db3df695eb4276618ed6c1fcc51b237b9 SHA512 5470c0e68b6e5d08343b6979891f51c761cd97d032645d76e0ea645618b2a739e6576689a9ccf6314c37c3f31ef10bc312f3de59dca61088fb564ae32e284817
+DIST patch-4.19.133.xz 3231728 BLAKE2B 3548913cd2d22a372ad8cddbac9a7f66e9b5882d4c0240f411004fc69a41c9d4d2fee148d2cd735cd304d4a169f9bc72786d4dd04409145a63636913188d72ca SHA512 83bfd122337139528cbd4f1a48e4622ac52f172e29191af488086a89f64c5c63f1698dde3bd4728f906f97d1a8e413b0f1852e49cfceb386dd6970373f6f54c4
 DIST patch-4.4.230.xz 3233496 BLAKE2B 10370ba5b4ade9f7abac4e04150b21a69916480189b342d916b0479098dc8a9bcc1fe3bc16acc413dc60094effc8e5e824086567c8133e6906d2b6e85a1f3df2 SHA512 56ad171938782d9ed198ceb81574ebd57212809b7e15000f6bd9217b8bdd374a35a91ade3536ef81be108829fc6463d9de9b4935a069ddb822ea646f1093252e
 DIST patch-4.9.230.xz 3557776 BLAKE2B aa70d422ae0b4a0d404d6e21dcba4390a83583a87821df327b177e47602cc456c29f0c5dfd02b63f93720f5e3822fc10330b1e3518af751ca39ef78b1f4316d1 SHA512 27dd1a35bccdb874f8a4b8a248932ce49f1dba47c532a8c8ad59d10f53830af14376e1d18980f9fc3bba78a6d59a78d1eb8c1c906190bff8093fd60249db1eb8
-DIST patch-5.4.51.xz 1636156 BLAKE2B 7ba9b782147e5fe7d7ef54807f6d6ba3fb0efca1f7a722e977a43cc05bdc1b01709e46b0ecb2edbd63bea0a1a9f09a427d91348300a120367a1e69e8b81f0989 SHA512 bfb653bc47eaf185d61210ce71cca58fd9aa1876d6d4f15954acad815cea63c76fabe4bd794d666066923a527143b7011e48003a4e23e6781ff905dd9a554655
-DIST patch-5.7.8.xz 411492 BLAKE2B 86fd40d77e91a3b8af36efaded2130cf3b9a95a32a3286dc5f96f7b08230c3f6673680e800e1524b537530d5efeaf749d019db9914ddde195ffa57d9c41868d3 SHA512 4820a45fba9fa299181a96598a96bbdbf6f5faaf1862173d9cca3cc5ea84c21d8e7d4baf0601697565fad3b7d3c76085f4ac86a726961b62c356d70968edc48f
+DIST patch-5.4.52.xz 1662280 BLAKE2B 2afc077e457850c1533246a119240a6fdc8d9a4c1d63ea9e1a6917ef67e365c30f85ce7af98cd035740aff04fa5ee93b1262733aeb6f6a2b1e41f4e7a71b875a SHA512 c4ac2e54a43b127ba37ca7675275981b25c029006a8d9b07ecb2b9458e148f202d4ba343de106e1322f8eac8b15c599c6337f540d7c3fd2da6da99ca93d5b9dd
+DIST patch-5.7.9.xz 457056 BLAKE2B 4026184a2f636af481710c39358e4c44b3118a9f235d95fb6e47ff75c3a9fedc3e8a11b6a0ac2a63f83be2165b297f8aa06d3f3eb2aca77eb815589a72523dfc SHA512 30eaa543ee1d371b5d05c7d8268e2e4fb55b5fee8f509070c677776744af47a743a36f655e5244e79d87a45a0ca7aae3eacdc9969e26d6b1d443a42db4bd5588
 EBUILD vanilla-sources-4.14.188.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-4.19.132.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-4.19.133.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.4.230.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 EBUILD vanilla-sources-4.9.230.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.4.51.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
-EBUILD vanilla-sources-5.7.8.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.4.52.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
+EBUILD vanilla-sources-5.7.9.ebuild 419 BLAKE2B 98e86284e47be387baac2442122c4be1baf118a9f93a9281dda1a45c59840ee4d19f4e576049623bef5aab894e14f764f157fefdd320752d5ba98045225c98a8 SHA512 7fd844d81bc2e18844827c4bb08cf4987bbf56efa4492be014fa29162b2384ad8025232132325068d226d20336f2a7f7d0659ed632f1c93cca49dd07b386afc5
 MISC metadata.xml 642 BLAKE2B 6aa41c5f612d15c0b53c6aed058b2dd01bf9d7dd1ef8abb188f85cad84b43be94b3279d7c7ba50b3ac1b112c385ce01a8a8bf77d3a85dfd8e18838d7def5031d SHA512 b7e1d4e4e6a4a75046ace025fa1b42a38068dcbdafddf2b468287e9280832173617202c036b1ad1fb42c2f2e16920c44f0580039e3844cbb73402143361f764e
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-4.19.132.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-4.19.133.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-4.19.132.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-4.19.133.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.4.51.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.4.52.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.4.51.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.4.52.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.7.8.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.7.9.ebuild
similarity index 100%
rename from sys-kernel/vanilla-sources/vanilla-sources-5.7.8.ebuild
rename to sys-kernel/vanilla-sources/vanilla-sources-5.7.9.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 0c8689473acd..e0003322fdbf 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 30c576297148..39f8b9bd322a 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -6,7 +6,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4555 BLAKE2B c1a0c0d17ef3a0b886314b41d09fb216bc0e8d12a1a8cd056c03b54ec0e3be8ac0c76ff82d63b515be9af83b9b22aebffcb23e63a77ccb1a0f62c1307a63ea5a SHA512 e16eb769ed7774532311dd462e0d990caa5c7945bfe61ea3ad3909ae2e17010be9e7151d7a1d73910f1c32726f05d611fc4ccc1b33e921b98b6ca80140151717
+EBUILD compiler-rt-sanitizers-10.0.0.ebuild 4554 BLAKE2B fe506f5eb30cc5fa78a3849ffc46b2b78ac07c8fad752dc8c76e9c0c05c3ee04580c2dedc664ebe8b35cc4c1f108fbe75b3750d4687521dd8ec936ab250a4b20 SHA512 ebf4caca415fb354d941f8ab8daa1afe8f72b8538d3641d77d4c129d9c965c1f904a924993327d980b5a1ae13668ea11e076df26569f616974a48264e2e131d9
 EBUILD compiler-rt-sanitizers-10.0.1.9999.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
 EBUILD compiler-rt-sanitizers-10.0.1_rc1.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
 EBUILD compiler-rt-sanitizers-10.0.1_rc2.ebuild 4333 BLAKE2B 598c5709a3a45a28620039fdf2d09bfec1aa85e8d638b9293d0df075b19785a7bcb5847849ff45d144cb76a9e01c8d15337c0ceef5f997de521413176ab92062 SHA512 b2e60762a15f75b722be170861477e416b27434162cd998b5d64936ba65b3fa93a71b905051e99cb7e83efa02fe80414c9892f45db84a5abbd6303b5a47a4e0d
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
index 50e2436d9cfe..cce46e2f8a0e 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang +libfuzzer +profile +sanitize test +xray elibc_glibc"
 # FIXME: libfuzzer does not enable all its necessary dependencies
 REQUIRED_USE="libfuzzer? ( || ( sanitize xray ) )"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index ddd9a6e8ed4d..8b6a4db370b4 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298
 DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb630a997ce56bcc33350a698d6d8e24877844b037735ec44abf80ac4c0a4d5a8682745afce4c44cb806bbe9e2a74d875da1 SHA512 ccb6a5bff336924381def11cdfa9c676351461e293b6250b15c1c6cd7694b99beb3e2f3834e8321a28586da091492cbde689213eb4108c9dbe86724e1ee66949
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD compiler-rt-10.0.0.ebuild 2921 BLAKE2B 587e1b2057c427c1c76c5bc9ca309c4bd746557ff2120f498c2399581d6b4636f471af72db1af6fa14f4cdf1a428ce8ee3ab9d8ace690c7fdae3841b34b75f2a SHA512 dfdd793e7c5f86c30da69e006aa3370165cb5cc4de7c616b0260b438dfbf1d351ba6a31bc985ebe4473e001385a661ef3dd51e5468a17cba02bc3d75e20ff869
+EBUILD compiler-rt-10.0.0.ebuild 2920 BLAKE2B 0b5ea24adb766ac39cc6130e123b8d54715ff66096528962b573a84e994dcf8c9bdf0ab31a6704b4f1a11b530c213b3a6861d03cc166e56dee4e8344407e9a63 SHA512 6a245d72fa8b3bff55e30796a0503e77d16ed2ec05b07b9870be3ebf4a3cbf6b89ac0252f8325b5b5e7eb2b8c5b295359bda1c12c7832a5498863be4549bb0e5
 EBUILD compiler-rt-10.0.1.9999.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-10.0.1_rc1.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
 EBUILD compiler-rt-10.0.1_rc2.ebuild 2699 BLAKE2B b088b4b6da3395803df39d57fec40f1427432b054a7a4d80c17b4a46f1c3c8399ed8198e8c98624f9e587fcb503dc36f06e40e758fa9759f82923b5956ba7e88 SHA512 75400dd3962689754c84323a2f5332acd0875683a0eef40055d80c54b6ed7abd9448364cb2a4de59efaefebbc1c5127173ef03614934a76f6314c31b0082ccdd
diff --git a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
index 5639be53726a..5f1fc1645b49 100644
--- a/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-10.0.0.ebuild
@@ -14,7 +14,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="+clang test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 74fb8910d933..f9c12151ea7a 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -5,7 +5,7 @@ DIST ldb-2.0.12.tar.gz 1680114 BLAKE2B 44d7b8f9ff0c1d2adc59378b9da814fb280043c8b
 DIST ldb-2.1.3.tar.gz 1673208 BLAKE2B 32723fb8cbf404258a1334589e08f1a1b1ee78a6260327e4793d338f73132ae89a5655f77ef4160a0c4b751f5e33e841420c2027034c78d371bf5fd7f3931a37 SHA512 3f5adf5ed6c98cefce56ba47c986c5d59619731def8fa66440957aba1483de19bcfdc4ec5498d34db70753312b1ad47b864020269df924d3d431c8d4d223af10
 DIST ldb-2.1.4.tar.gz 1673335 BLAKE2B 581ea127715d82d849f78c11fc66eb278e45f6c9ff9b379d5a3cfaa8c9c424004614a5a9c2120710d23feb1252294e2abd4983158a2a46e5d70180ad3c765dbd SHA512 7e0eecccc973881dde2390568dc71a2ffe7c7ed894daaa9cadf80c221e1b969fd9a8729f3c48a0f611a64b2941c295a2bc7bd8ba869881ba14f75b8bf331167e
 EBUILD ldb-2.0.10.ebuild 2688 BLAKE2B ecc1ec7275796e6de5af9be875671301aa38da49e2345408d5f9054657ed4775d21cd1456a474217def897ccbd02e44be18a14cad14dd58ccaa816d8be968a9f SHA512 9c3320b50fdbb0e7912b731d6c6905de97b065c2c049ec046e35f09e296f0b1f350120062c3d1e3b29ada3e4fbff90e5d8576bc96397dc89c9536882d2a770bb
-EBUILD ldb-2.0.12.ebuild 2691 BLAKE2B 4169be762ab47ebb7133f258eb522a310d69aaa797d09821d546f129cad8bb53d77353c2daebbf2e7594217e9d750d3f9b2b8c23373cf86dd54b50207f42fc6c SHA512 5507388c113c2073b9a81fa6fa2914dbc59e39ac0fae868076ef8d5852c12a2c7c140d4d204b766666df8d2f7e3e3fb4b823b754a1bb9efdb0dfd204006a8538
+EBUILD ldb-2.0.12.ebuild 2690 BLAKE2B 52734c612b6e781f8deb1e268dff9fed9f18eba0536b3b40d2648e7ec4200498f0e67f27f8e40f02ffe32577608980e12bd3596e6fdf20228ad26ef2fe242f27 SHA512 7c56e88637be0cc360716c7de37760d3901e10ab201876d2204d521de9496cb605d9c0000e058866e86811aa2ad3a535ddd62962a886d7be8d399fab495265c4
 EBUILD ldb-2.1.3.ebuild 2695 BLAKE2B c41b17921331a9677117f36bde021a244d548c3e2b3b5d9285e5ca104d96437a7723779b856276740d1e6a786fe2e3d2823fd2afce499bb3b5d1839cf034943e SHA512 21740fa246033d07d5ba0b16e72bdf26e787decd87095b7c32747bc48a7927b74fb25da9875afac670bf40b9b6c0c547574b7dd5b1bff7565e2b0cd229dc1579
 EBUILD ldb-2.1.4.ebuild 2695 BLAKE2B c41b17921331a9677117f36bde021a244d548c3e2b3b5d9285e5ca104d96437a7723779b856276740d1e6a786fe2e3d2823fd2afce499bb3b5d1839cf034943e SHA512 21740fa246033d07d5ba0b16e72bdf26e787decd87095b7c32747bc48a7927b74fb25da9875afac670bf40b9b6c0c547574b7dd5b1bff7565e2b0cd229dc1579
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-2.0.12.ebuild b/sys-libs/ldb/ldb-2.0.12.ebuild
index 3d6f0e4ca91d..47518b0da862 100644
--- a/sys-libs/ldb/ldb-2.0.12.ebuild
+++ b/sys-libs/ldb/ldb-2.0.12.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="doc +ldap +lmdb python test"
 
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 592f44e3fdf8..dd3efe2df90d 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -5,7 +5,7 @@ DIST llvmorg-10.0.1-rc3.tar.gz 120876192 BLAKE2B c48c7e00b37adaab411a34196b87eb6
 DIST llvmorg-10.0.1-rc4.tar.gz 120873659 BLAKE2B 2413fb8af98384e608fab83b91fa826ffe2a7cdeb052eb6a50f253f9fe46ee71c040f210bb2f395d73b0a2772854ccafe2ac2cf1cc7c8405bc988183fa732aea SHA512 8b3f0b794c98956238e5d3d195e3a9cb9c9a40f78e2ed72c767fbeac3e1dbae58cb8132db7d2c8caa891a4d0bf631e2a9afc67f3c37707e9e6b94e2f9aeb77b8
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 DIST openmp-8.0.1.src.tar.xz 933320 BLAKE2B 02a7bf70cd3a217845ef1c5a35e0d7dbfbb39069a9029d462c797b5ddf2240fd627dee55856146ca4bb81622a41f31ecd11e0ed66baf3b7d99447087271991b0 SHA512 9ded785c8129e7b3a70b54f07c4dde529456edcc94904ad77fc578cf7f096cfa3ff2279959d7f7f1db51571e11c53375f33b597c7f36ce6dc6b512c44ced8026
-EBUILD libomp-10.0.0.ebuild 3016 BLAKE2B cc2655b1f78b6efa396f8bdd7e350f1ea79b16eb19d43bd45de28030ad7b152b5a20052fcb912705624fb4b87dced2ae870a2d7e6de75af404df3bed04cbf92d SHA512 80c0a3e993b61d7eb94f970032cd64a0bab99fa7f77b088d0e0e53d67303e23655612438ef0bbb20d9d9bf37b1606632185fe474ae5d90eb50f0a1270db62a74
+EBUILD libomp-10.0.0.ebuild 3015 BLAKE2B 1df1e92b79923b28e240ca2cb777aea830a33d857364ca191d0b6b038b504d3b33c3e04c4b1837ea5b6ecbc47bfe27dcfaeabdfb45a04ca537d4ebbb4af56644 SHA512 02671276a42a16497ed3da240d9cf57d8080533f6025a0923e414b4c0234686f4f25c8fcf7f06c32deaf582b0cfb6e426977771edc3a0cfe2d59f2b935f85968
 EBUILD libomp-10.0.1.9999.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-10.0.1_rc1.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
 EBUILD libomp-10.0.1_rc2.ebuild 2844 BLAKE2B edf9ceb8c819d5c522c92af4de5c5470f9d99e09d60c29d1ecc0aa71aea9a281bc797fc141881759cbecbea150dc00b0ae07276808959dc566402f319526061a SHA512 4fed307e6ea1b5e9c5859a6b8d51756a5cb0775dddbefd830acea7633cdb57fd08ec4bc406500b283054d9896a41a194f496fc7dc9f60bc86ca74a165c3a76a2
diff --git a/sys-libs/libomp/libomp-10.0.0.ebuild b/sys-libs/libomp/libomp-10.0.0.ebuild
index 34f5824325b8..0fb61176eda7 100644
--- a/sys-libs/libomp/libomp-10.0.0.ebuild
+++ b/sys-libs/libomp/libomp-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86 ~amd64-linux ~x64-macos"
 IUSE="cuda hwloc kernel_linux offload ompt test"
 # CUDA works only with the x86_64 ABI
 REQUIRED_USE="offload? ( cuda? ( abi_x86_64 ) )"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 412214d79bd4..b5c088f4891c 100644
Binary files a/www-apps/Manifest.gz and b/www-apps/Manifest.gz differ
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 1d1bd673f4d4..a3b9fae58661 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,8 +1,11 @@
+AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
 AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c39e462e5a63607ef076b116c27d2090f894095193dad33918f1fad1767489d45ae80f9699dddf65141ceb9 SHA512 aa09b233402ecb450cab13ed08786c1b8dc72a944efe69792bcf95d6109dd41b73abae95c3048bf339c8bb7849b3a20edb473388c052d32e00f7fb8b9381138d
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-src-1.11.6.tar.gz 68915319 BLAKE2B 8d8fd34fe38e153aa4af932a83933d0b5ad81a63bf7b7b5be59e64dd82db3282072686979a41fafa3ac2e523f79d6926ed057b2ed18645040bf1c446c6ab04b2 SHA512 57d5214a5e05581c134d42e00ec29fe15f3245a75440fca26c7162937570affc5a2e4ba8e903cb7f15fcb271144183ce5aa473457245f36d52686ea9f1cc93b3
-EBUILD gitea-1.11.6.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
-EBUILD gitea-9999.ebuild 3579 BLAKE2B 8bd251e0fe851dc894dbb49aa476f20760f74c245de2df7d9bd026da36115a3f5fabaf7af00f0137ffb363566a2f35b93c2276f1bf6b9c69a2d821f439c79500 SHA512 75836046d9d6e04a438e9128bf5b2cb997ec12edb1f3be9591ceea89374b550317b185e8d5b4bf125de824b25a1e5dbde136521f4b17531f1e97084b0eaf8451
+DIST gitea-1.12.1.tar.gz 135104234 BLAKE2B 36510e25e8c2cc1c718702a7cd0be74bbf5448beb33a90732599a4830b0899b37dfc9a58e3a8ffdb5037e93f185ba3b09a0ac7b8acd629c46b1982d6aeab1ec1 SHA512 6ba8a703272e611aac4c214cd818490a9615a9ab9b64ec22ec2c6331e865226324896f600218fb3b39cea7b6649456db7ff18e1857ece6964ab5d3c6d99c3aec
+DIST gitea-src-1.11.8.tar.gz 68927493 BLAKE2B 4e1b1d201848227bd5d5bfac5bbddc291e2f14d7262bb2f8353131b6284520ecda3f844e81c23e95c5cd4ef17a6414e0b3c6adf6e6be5c59f7367c19a2e549d8 SHA512 13216a4d98211eb1a5c319992c9c253ce6f7a7a343ebfdca18802eb599f7300a3c23adbba94784f70ca604751ced5aac7d663a210885554c61a24857de79b6e6
+EBUILD gitea-1.11.8.ebuild 3698 BLAKE2B 8848e4f4e8b104d5c9d84fdf5ce2f06a14a42220dfc9e66845cfb5d546438f9ea2b4345e03f4687ecb0e935bc1c58f5b996657688dfb82a425acbd5519b500e7 SHA512 0c5b5da2758f4677b22e1b2910da9e1c859cb63d8229c52b3170dee2e92a027afc47836cc058f1840cccee08260f53224ed6f85bc099477537561e0b900107bb
+EBUILD gitea-1.12.1.ebuild 3484 BLAKE2B 70484a7472390bced7d383df71160a22e3cecef96811aef7ea29f1e67f46b1e56886c97d5737c37df5b7e1ff341f9909fcb5f6c6ec863730a9479128dffb1230 SHA512 deca4c035589312c00727e997ef9e257bd1dd0450eec83b452d37acff82b562fa95ac06c7d8e6b8713d2d0f1b46fe7e9e6eb7d4db6b909b6c752ff28d5a38053
+EBUILD gitea-9999.ebuild 3235 BLAKE2B 893edb722e2f4de3054d8bc3744414a0dca088ecb9b1cfd25bd24a839f0da9653df401db84dfd46221d3d60b3a1010f48d1ff9a3528c5b8035717faf1be8d262 SHA512 5fbfdd2d1ee6bedbb70fd23180d0473d6ddee629ad06225298c4a170a5c3198896f663033cfc0db84b02098b181a2f0f29d120799e3c7cf222de175b29888e4a
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch
new file mode 100644
index 000000000000..9baff97307a0
--- /dev/null
+++ b/www-apps/gitea/files/1.12-fix-vendoring.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index efbc866..1c34104 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
+ # mvdan.cc/xurls/v2 v2.1.0
+ ## explicit
+ mvdan.cc/xurls/v2
++# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
++## explicit
+ # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
+ ## explicit
+ strk.kbt.io/projects/go/libravatar
diff --git a/www-apps/gitea/gitea-1.11.6.ebuild b/www-apps/gitea/gitea-1.11.8.ebuild
similarity index 99%
rename from www-apps/gitea/gitea-1.11.6.ebuild
rename to www-apps/gitea/gitea-1.11.8.ebuild
index 44802e089f92..555b0028a9ec 100644
--- a/www-apps/gitea/gitea-1.11.6.ebuild
+++ b/www-apps/gitea/gitea-1.11.8.ebuild
@@ -30,7 +30,7 @@ LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="+acct build-client pam sqlite"
 
-BDEPEND="dev-lang/go
+BDEPEND="<dev-lang/go-1.14.0
 	build-client? ( >=net-libs/nodejs-10[npm] )"
 DEPEND="pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}
diff --git a/www-apps/gitea/gitea-1.12.1.ebuild b/www-apps/gitea/gitea-1.12.1.ebuild
new file mode 100644
index 000000000000..18b851d0c981
--- /dev/null
+++ b/www-apps/gitea/gitea-1.12.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module tmpfiles systemd
+MY_PV="${PV/_rc/-rc}"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	S="${WORKDIR}"
+else
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct build-client pam sqlite"
+
+BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
+COMMON_DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	cap_net_bind_service+ep usr/bin/gitea
+)
+PATCHES=(
+	"${FILESDIR}/1.12-fix-vendoring.patch"
+)
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+		-e "s#^APP_ID =#;APP_ID =#"
+		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+	fi
+
+	einfo "Remove tests which are known to fail with network-sandbox enabled."
+	rm ./modules/migrations/github_test.go || die
+
+	einfo "Remove tests which depend on gitea git-repo."
+	rm ./modules/git/blob_test.go || die
+	rm ./modules/git/repo_test.go || die
+
+	# Remove already build assets (like frontend part)
+	use build-client && emake clean-all
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
+
+	if use build-client; then
+		# -j1 as Makefile doesn't handle dependancy correctly, and is not
+		# useful as golang compiler don't use this info.
+		env "${makeenv[@]}" emake -j1 build
+	else
+		env "${makeenv[@]}" emake backend
+	fi
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.ini.sample app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index 0d1559ca4a39..672af6461ca6 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -2,70 +2,42 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-if [[ ${PV} != 9999* ]] ; then
-	SCM="golang-vcs-snapshot"
-else
-	SCM="git-r3"
-fi
-
-inherit fcaps golang-base tmpfiles systemd ${SCM}
-unset SCM
-
-EGO_PN="code.gitea.io/gitea"
+inherit fcaps go-module tmpfiles systemd
+MY_PV="${PV/_rc/-rc}"
 
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io"
 
 if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz"
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64"
+	S="${WORKDIR}"
 else
 	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="+acct pam sqlite"
 
-BDEPEND="dev-lang/go
-	>=net-libs/nodejs-10[npm]"
-DEPEND="pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
+BDEPEND=">=net-libs/nodejs-10[npm]"
+COMMON_DEPEND="
 	acct? (
 		acct-group/git
-		acct-user/git[gitea]
-	)
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-FILECAPS=( cap_net_bind_service+ep usr/bin/gitea )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
-
-gitea_make() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		TAGS="${gitea_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
-		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
-	)
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
-
-	env "${makeenv[@]}" emake -j1 "$@"
-}
+DOCS=(
+	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	cap_net_bind_service+ep usr/bin/gitea
+)
 
 src_prepare() {
 	default
@@ -89,27 +61,34 @@ src_prepare() {
 		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
 	fi
 
-	# Remove already build assets (like frontend part)
-	gitea_make clean-all
-}
+	einfo "Remove tests which are known to fail with network-sandbox enabled."
+	rm ./modules/migrations/github_test.go || die
 
-src_compile() {
-	gitea_make build
+	einfo "Remove tests which depend on gitea git-repo."
+	rm ./modules/git/blob_test.go || die
+	rm ./modules/git/repo_test.go || die
 }
 
-src_test() {
-	if has network-sandbox ${FEATURES}; then
-		einfo "Remove tests which are known to fail with network-sandbox enabled."
-		rm ./modules/migrations/github_test.go || die
-	fi
-
-	if [[ ${PV} != 9999* ]] ; then
-		einfo "Remove tests which depend on gitea git-repo."
-		rm ./modules/git/blob_test.go || die
-		rm ./modules/git/repo_test.go || die
-	fi
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
 
-	default
+	# -j1 as Makefile doesn't handle dependancy correctly, and is not
+	# useful as golang compiler don't use this info.
+	env "${makeenv[@]}" emake -j1 build
 }
 
 src_install() {
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 0356f2bb2dfa..99ac078c20b1 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 49a321cf8a33..58da86ba19fb 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -26,10 +26,10 @@ DIST chromium-83.0.4103.116.tar.xz 802626772 BLAKE2B 6890d8f4a4a9b12ab56a63e0371
 DIST chromium-84-patchset-3.tar.xz 20148 BLAKE2B d910570b43f63bcf4ead90ca4e4005a08d7c85b5b4e7af2a70ec4bc18265cbe8b075523878710075cfee4e0631eb3374e1e6d06251f4bf03377954807b1951e9 SHA512 316db8b0359b10a988242a0d665475d912fa9b610a547478d8c39b337afc02780a54d7024e231eb4fd402063cf439f6e2b4bb92a4968c8e0c3e69d84a2ae1664
 DIST chromium-84.0.4147.89.tar.xz 845153972 BLAKE2B e8101805af6278fc9c49041071e7cd6d53fe79ba74b83b636584db57f459f003559758a51a1cd155d7fe3d5d0d21c95d37f84e638644c6e08b39ea02cce902be SHA512 cc207a5f09a89e42bc12fd491d5d0ef11c04daaa324aa696d2f8a37679b8f2171d3b265296968c3312e158b0fd2c059e12727a7463d3bd2f640d5bbd43c4f676
 DIST chromium-85-patchset-2.tar.xz 9724 BLAKE2B 929d6abe3a66db395a9cedc63510a6a0ed0d79057f92ade22fe26221bf46a63e88fb40d6e54e6ffa837d142ec5da22e2b428f3153db431e3389de0b230fa2aec SHA512 753ce53c2c10cf1abdce334086a633dfcb4543c86a2dccbee0ad1bc8a8a0b642cdd18e2277c67088a380a9fa2ca8fd655e2fc0b3a2931de3230afa046615cd0e
-DIST chromium-85.0.4183.15.tar.xz 863644932 BLAKE2B e244ff567894c5fce623bfe0e799130fcef447fee26469fcdda3c372ddf054e354d6ead7201332f1aa5e91d0826d838de1af5838a38d1e4849511fb4d96f5e08 SHA512 e92b8325b27e485ff2ac0db5c47661c935f874a9d2d0c6df597bb02faa448ff54b81e7528619bc0dd28b523852e03e4ff8bfddfa9ddcee3d27d9cb39eef1af0a
+DIST chromium-85.0.4183.26.tar.xz 863782884 BLAKE2B a08f042f07b96e490f8e2d7ca132a249f2745296ad5250bfb65550e632483cfbae3a60ed42fda5608bbe7ade3356b84fb4dea7d4dba5dbd7c284a3c5c46e0199 SHA512 00267e64bcbb8c464fa624e203bbfde9d6dd324d70a83ef903e5cec0332ddf6fd540c742fce99c23931522e57e54e46280cda7dc0e085b33cf2c36ef45bbd935
 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf
 DIST xcb-proto-1.14.tar.xz 143384 BLAKE2B 60212b0f0ce039a64a2e6cbbc78564eeffc57cff20987b37dc780d8d97ae888a7dbfbbaadc6e0e4bedfc5d1e360f16318e3825ad8406de668d9c7c66cf7f4b5d SHA512 de66d568163b6da2be9d6c59984f3afa3acd119a781378638045fd68018665ef5c9af98f024e9962ba3eb7c7a4d85c27ba70ffafceb2324ccc6940f34de16690
 EBUILD chromium-83.0.4103.116.ebuild 25728 BLAKE2B e01916870f7d8d96cd4c3428df2e792f73fcc9440c8924c305ab69f8fd5afa55744e599770104e2837bb1d9367e48dfc281df3a4ac4a660cb73b98b56a0715e4 SHA512 d7b82773af9896b0c1eb718af61765aaf314e5ec9e2ff180f171ec5e9987133034b458b8e8ec5158ed5c4fa1b80665082d4f0245c289bf36738bf7a0c3375beb
 EBUILD chromium-84.0.4147.89.ebuild 26745 BLAKE2B 612c937ee07503f278a2bb23bbd54f1732fe2f44f29aab02b2004fb659bebb2f0124d1b3ded4eaf1bef9b5c6d4c0d1256ce573d6c1d7691e7b06a5bdcd7feaf7 SHA512 1c4f3b46686ad826aec001d48d7d1bd396675cdbc066125c5a4eb7210c840c63a87e94761538c2e1c6822d2fb8f800b3e2b47235096a55702d26ce349f436935
-EBUILD chromium-85.0.4183.15.ebuild 26765 BLAKE2B 12ef485d8ecc4dc4e1fdc7e5053b6e6ce10c5e204291d2a235f5d67ae5db89364ad7e1aa35967c1510d9c926a1a9d664da04e8656f90f96a094dc70f8a75dc47 SHA512 d6f6ba552bd5ad16ed0c7682221627e3687d9d4c88ad9779454a818ce5bd49db69dc7ed2361e2fbd1514fcdfc8a925492bd7c348d57b1fc2e192ff18b1db3ff7
+EBUILD chromium-85.0.4183.26.ebuild 26438 BLAKE2B a9477ffe5b2fbdb8ae02b92d7f7046905babec7f41e8979db47b7680c15903e83330140fcd00e6199b5865037f6f4950c48fcda9f428a178076189941803d897 SHA512 af1842cf4a4e75bcf0ea4dabb1f59832b7d7698a5830364cb6981f25e3fbc898ebf19f9b13ddceaf2bce17bcb9d73ba14d08ca51e67074f3b3d1a108a349ed05
 MISC metadata.xml 1726 BLAKE2B a7f72eb8213b17a6cd885940e732456c87207370d4f29e3f80b5a58d7c367e9df2b97b7a8763f035f57e53ae9d9e14fe5c8d7427d52b036eb0703568e8b59501 SHA512 dade58f1481fcfa848392e8ad4f781c20d7746987c589dc29f7bda2986ce46d9c6928756128ec9fddf8a58cc3709fb848fb86eb48abd0bafe224738aeaeda6dc
diff --git a/www-client/chromium/chromium-85.0.4183.15.ebuild b/www-client/chromium/chromium-85.0.4183.26.ebuild
similarity index 98%
rename from www-client/chromium/chromium-85.0.4183.15.ebuild
rename to www-client/chromium/chromium-85.0.4183.26.ebuild
index c6722ddf5594..dd5f95536134 100644
--- a/www-client/chromium/chromium-85.0.4183.15.ebuild
+++ b/www-client/chromium/chromium-85.0.4183.26.ebuild
@@ -12,12 +12,10 @@ inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-util
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-XCB_PROTO_VERSION="1.14"
 PATCHSET="2"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://files.pythonhosted.org/packages/ed/7b/bbf89ca71e722b7f9464ebffe4b5ee20a9e5c9a555a56e2d3914bb9119a6/setuptools-44.1.0.zip
-	https://www.x.org/releases/individual/proto/xcb-proto-${XCB_PROTO_VERSION}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz"
 
 LICENSE="BSD"
@@ -423,6 +421,7 @@ src_prepare() {
 		third_party/widevine
 		third_party/woff2
 		third_party/wuffs
+		third_party/xcbproto
 		third_party/zlib/google
 		tools/grit/third_party/six
 		url/third_party/mozilla
@@ -693,9 +692,6 @@ src_configure() {
 		myconf_gn+=" icu_use_data_file=false"
 	fi
 
-	# Use bundled xcb-proto, bug #727000
-	myconf_gn+=" xcbproto_path=\"${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}/src\""
-
 	# Enable ozone support
 	if use ozone; then
 		myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
@@ -730,8 +726,7 @@ src_compile() {
 	python_setup
 
 	# https://bugs.gentoo.org/717456
-	# Use bundled xcb-proto, because system xcb-proto doesn't have Python 2.7 support
-	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${WORKDIR}/xcb-proto-${XCB_PROTO_VERSION}${PYTHONPATH+:}${PYTHONPATH}"
+	local -x PYTHONPATH="${WORKDIR}/setuptools-44.1.0:${PYTHONPATH+:}${PYTHONPATH}"
 
 	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
 
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index e869e514dbb2..feec3e301f4d 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-unstable_85.0.4183.15-1_amd64.deb 70220456 BLAKE2B ab67c0861f6519f9a31e5d8bf761c7eb89e4d59dc115728341453f4e2f179b8ee975af9978775627dac4dd3a526791c04878d9d06be84efcd0b809bacde84d83 SHA512 c963ab4c78eef9a7adcde39767c9e2f892d2bfcd971f28f63c2227fcc83e36a5934baa2464a50bc14250f1e17ede3c7d5d4d26d2aa52633cab141e2e4bbbe24e
-EBUILD google-chrome-unstable-85.0.4183.15.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
+DIST google-chrome-unstable_85.0.4183.26-1_amd64.deb 70219420 BLAKE2B 0fc68612b70e5f17cf5f69137c7f19e5d5c89544811ca961a72246c353890c07806072f9c7af2de7937e703a359e9a19ccc5944dd8a7fd993c03cedceecdcb5c SHA512 070790b5ba72bc2d631e01afedb5c5eedcea57e433d95ba4fa69bce2b3e66a6bd8a3e82b76b9ba0c6f50bb62a82f2048d570064b75ae6b05c8bd2e138bd5cf99
+EBUILD google-chrome-unstable-85.0.4183.26.ebuild 2950 BLAKE2B 20d97afa724ae77915b7256721042f968e8c2c6e60847a9077967680a25a829cc7a94791f978a6953dcf33370dbd429ef6e720d9df42869bb540a9f01647c68f SHA512 0e29e5c7b8d63fa1ebc2fe28bff26046f8690a16fc548b8ff40e52c41ae4a4eb46f7c089cef94e4422f1225be2be6311f5da8c6e0965aa5d4680b976cd7d0f15
 MISC metadata.xml 436 BLAKE2B 27b8df0153055ab0cd16d5ffac82f87d87a8f6ad1d3d56f9b0714dbc82ef8ec516df85eace40e374598ab5e83b953020d7213400f5a4f959610a034cd8967bb2 SHA512 f2ba37a63b2b9189fb5377a3dc5eaa950daa024b0f785cf39df76edcb4ecb98011c31cfa060c390fd08e232ad7fb40ffba3ebe2fc10125e50cce37a7325d7c57
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4183.15.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-85.0.4183.26.ebuild
similarity index 100%
rename from www-client/google-chrome-unstable/google-chrome-unstable-85.0.4183.15.ebuild
rename to www-client/google-chrome-unstable/google-chrome-unstable-85.0.4183.26.ebuild
diff --git a/www-client/opera-beta/Manifest b/www-client/opera-beta/Manifest
index 7070deb89da7..c4e092832c6b 100644
--- a/www-client/opera-beta/Manifest
+++ b/www-client/opera-beta/Manifest
@@ -1,5 +1,7 @@
 DIST opera-beta_70.0.3728.21_amd64.deb 67480884 BLAKE2B 7dfbc5c440b119ffa5c4d60594630e6d78ef412110f8f0417c7357392d47905dfc4ae5804f60826d9a875b1b1c4fb6708c327be6428e1259dbbfde3216e198db SHA512 41ebc96ec96149028f0c2712aba35f51d1c8c881f213d531a8893f9d2fa80496c57a12481f19af8e9097bef9bf51d6cee3f520ace362bcebb4734af16990ab1c
+DIST opera-beta_70.0.3728.46_amd64.deb 67485520 BLAKE2B 411e3192fd6b7f9939a7774b88facf491998c02fbe746ef4aa950ed487346529199317dd8771442686d5ca994231cba1d2354a42abf5267a4e87ec1a1ee49329 SHA512 cef95c7a3e1b17435b3f5bd31fcefab0c57a00542480b041ebac46796ad16dda00be18a255d0985e49a687d0fd3fd54528aa67c9d202c65b59042a5f4c03aa74
 DIST opera-beta_70.0.3728.8_amd64.deb 67475540 BLAKE2B e95ab0aa633184fd0321f1978c7637258b09350eddc721955c05e465a5a9c92ed4808c0e2d670892eaaaf9bdfbe13513f30f85421500a42ffeef002eec1a61cf SHA512 794eb72492b1edadec458129fed068a727d5e5fbb8cc0c113a7787ea2d539da89032935387895aefbae324ccd1ff4567749949c137d3e900f7f407545f5e2e79
 EBUILD opera-beta-70.0.3728.21.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
+EBUILD opera-beta-70.0.3728.46.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 EBUILD opera-beta-70.0.3728.8.ebuild 2293 BLAKE2B cd8c22cf8bc8b266165ff4e01b5072eca94fcd81a71e52c60d14d5d67573d06cc3724607b0d2bd6744cf44418c0841fa25a44b514a4ca831b855f47baeeb4ceb SHA512 033fac8a61c0983892f0c5e9284b6b41b77c353935f19e37fe46ce7d4ff469f7e139858cb8bee05cdd047581633f8782431d6f9f9974bf937f64261285162cef
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/www-client/opera-beta/opera-beta-70.0.3728.46.ebuild b/www-client/opera-beta/opera-beta-70.0.3728.46.ebuild
new file mode 100644
index 000000000000..99905f624666
--- /dev/null
+++ b/www-client/opera-beta/opera-beta-70.0.3728.46.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+CHROMIUM_LANGS="
+	be bg bn ca cs da de el en-GB es es-419 fi fil fr fr-CA hi hr hu id it
+	ja ko lt lv ms nb nl pl pt-BR pt-PT ro ru sk sr sv sw ta te th tr uk vi
+	zh-CN zh-TW
+"
+inherit chromium-2 multilib unpacker xdg-utils
+
+DESCRIPTION="A fast and secure web browser"
+HOMEPAGE="https://www.opera.com/"
+LICENSE="OPERA-2014"
+SLOT="0"
+SRC_URI_BASE="
+	https://download1.operacdn.com/pub/
+	https://download2.operacdn.com/pub/
+	https://download3.operacdn.com/pub/
+	https://download4.operacdn.com/pub/
+"
+SRC_URI="amd64? ("
+for uri in ${SRC_URI_BASE}; do
+SRC_URI+="
+	"${uri}${PN}/${PV}/linux/${PN}_${PV}_amd64.deb"
+"
+done
+SRC_URI+=")"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gconf:2
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	net-misc/curl
+	net-print/cups
+	sys-apps/dbus
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libnotify
+	x11-libs/pango[X]
+"
+
+QA_PREBUILT="*"
+S=${WORKDIR}
+
+pkg_setup() {
+	OPERA_HOME="usr/$(get_libdir)/${PN}"
+}
+
+src_unpack() {
+	unpack_deb ${A}
+}
+
+src_prepare() {
+	default
+
+	case ${ARCH} in
+		amd64)
+			mv usr/lib/x86_64-linux-gnu usr/$(get_libdir) || die
+			rm -r usr/lib || die
+			;;
+		x86)
+			mv usr/lib/i386-linux-gnu/${PN} usr/$(get_libdir)/ || die
+			;;
+	esac
+
+	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
+	gunzip usr/share/doc/${PF}/changelog.gz || die
+
+	rm usr/bin/${PN} || die
+
+	pushd "${OPERA_HOME}/localization" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	sed -i \
+		-e 's|^TargetEnvironment|X-&|g' \
+		usr/share/applications/${PN}.desktop || die
+}
+
+src_install() {
+	mv * "${D}" || die
+	dosym ../$(get_libdir)/${PN}/${PN} /usr/bin/${PN}
+	fperms 4711 /usr/$(get_libdir)/${PN}/opera_sandbox
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 8503f2fc82b0..de6b2440be8c 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index ff65d6d22598..3cd4824be982 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
 DIST google-chrome-beta_84.0.4147.89-1_amd64.deb 69669320 BLAKE2B b998266c0e6f7e57390119def9403596f4e112b1e68a30b0e5bdb965a79da8ab25b47389779121c144f9374c18e0a319c790e775595c81ec1bfca5d1c575611c SHA512 99a160c083b2d73840c61e0299ee466f1816230688137e310601bc5a030ec71688588a6845d1a6c7a3343261ed2f0f061653d92d5dd92bcc5076f2dd4e8a937b
 DIST google-chrome-stable_84.0.4147.89-1_amd64.deb 69649616 BLAKE2B 1884230c5b6ba9e341cb6a8b2f684fb48a903240d509d335a58de2e9be2d6a640fd5ef16468458262cfba64cda3d7b9479ba43d582e957358274e0ac8ada28cf SHA512 f54f2c11e227808edbe1492eb80b3ac1f0aa24ad181ac8ed018a812d91f70fb5fc60f95326abe07ada6be49a7d5dbb02672989767399fc8b98906dec07ea238c
-DIST google-chrome-unstable_85.0.4183.15-1_amd64.deb 70220456 BLAKE2B ab67c0861f6519f9a31e5d8bf761c7eb89e4d59dc115728341453f4e2f179b8ee975af9978775627dac4dd3a526791c04878d9d06be84efcd0b809bacde84d83 SHA512 c963ab4c78eef9a7adcde39767c9e2f892d2bfcd971f28f63c2227fcc83e36a5934baa2464a50bc14250f1e17ede3c7d5d4d26d2aa52633cab141e2e4bbbe24e
+DIST google-chrome-unstable_85.0.4183.26-1_amd64.deb 70219420 BLAKE2B 0fc68612b70e5f17cf5f69137c7f19e5d5c89544811ca961a72246c353890c07806072f9c7af2de7937e703a359e9a19ccc5944dd8a7fd993c03cedceecdcb5c SHA512 070790b5ba72bc2d631e01afedb5c5eedcea57e433d95ba4fa69bce2b3e66a6bd8a3e82b76b9ba0c6f50bb62a82f2048d570064b75ae6b05c8bd2e138bd5cf99
 EBUILD chrome-binary-plugins-84.0.4147.89.ebuild 1170 BLAKE2B 269453f5870654b3c127e92371b5de5a3d8f04d491aad18a823fbde9aeff8bab64c15ee11edc474f23c34715733bc38ad42888c7e2b42e5a1e00938a9daee640 SHA512 66aa14b8354b1d3909a8cdba157c8869e1eda230893cfcd9ff58b8a92fb45929076e6bdeee9fb8553735ede830d6966899bb6ab74e1e083f3523138b8044599b
 EBUILD chrome-binary-plugins-84.0.4147.89_beta.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
-EBUILD chrome-binary-plugins-85.0.4183.15_alpha.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
+EBUILD chrome-binary-plugins-85.0.4183.26_alpha.ebuild 1171 BLAKE2B 01985722c4f2eb54a78db77047f8312fb5e757e16cdb154ce2b9ec1eee691ce12e761396eec7d32b28aae92c42c5aaa74182c4a5ad08fcd58ecb86dc0aff0ba4 SHA512 e75af48eb85768f957a6465c245dce9fc5c1c78519598735b31be7732c7ade10dd6d5636a53c9b75e01b656ca179c8281f20c3956c4bdf97de43166bd9eca041
 MISC metadata.xml 262 BLAKE2B 6958ab33a832169dbd6b7077bfeae3f398c5d825430d3d85f7f37d732951fa0585a75d28766111d82e5103fa4078cfb3e3d16b98a4520b268d4fd6b670ce811e SHA512 b440c405c25f905f11aeaab1ee3721846ac26502b1e02656f773a3b3be4bc636e85af6185c043c8e94205a3297476d3d2230d6c519d477b5c7d42268916e1128
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4183.15_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4183.26_alpha.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4183.15_alpha.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-85.0.4183.26_alpha.ebuild
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index 5606913c2c01..182943592389 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index d9f4d48c11e2..a858dc6ab37e 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -51,5 +51,5 @@ EBUILD nvidia-drivers-390.138.ebuild 15599 BLAKE2B f62d4d5fd9187dd74dc99199fc1f2
 EBUILD nvidia-drivers-430.64-r5.ebuild 15158 BLAKE2B 87140ae4cfdf096ea83453b79ece53a8ff93981f498c4bf0f22aa3da84058464e28a2e42fa3782abca1d849286994c2fccef4741c46cc90448d46e860528191f SHA512 d0928d336c2407f65aab299062cc173a9b9e9cf13d1843d316266da5013d6465018e751735b83a1e5c58617c72d5ef18663e1d064b632ab1e8581555c899eb87
 EBUILD nvidia-drivers-435.21-r5.ebuild 15517 BLAKE2B 944fba0f0be2e781bf90c1a9cdfe9459c9d2e453505f2a7ea1fa2ea463fb2e492c6386fdcc11d079bd1e35ab05445dbc87f15ccebe22df3324201c111daf28aa SHA512 a2fc558c2cdfae2559740cc185760a74d5864348ed2a90acb8bbb92a19f90637ab9af3d353ce42f7dff11d883d03a15f233b67cf3e7f841c9d0196125a6e7a63
 EBUILD nvidia-drivers-440.100-r1.ebuild 15459 BLAKE2B da60a629b5c22765f17576e9ffa734ae603dd564ca14c140bd6778223b2be8571167930bed4732881075e1abe5ed60775f50b22de756557ec946a6e321627c5c SHA512 646efdea5d2e081dfecb69bdc4f8e429ed7ba22b919dab39fcdaca69e50ee739ed39f1be557a69ebfb125cd339b9050648e5fd431f31207328523f44bd01d12a
-EBUILD nvidia-drivers-450.57.ebuild 15510 BLAKE2B 139ec2df78b37e4c4b5f1b2bc93835e3cb2ec3d7dd61ca6c8afc511fe6176cbc5e5c088f042b8770527aaf28d9dec8cdd9b6dcea6ff151dcd07d88b644800541 SHA512 11fe9f59ec06b03fb3a5803aa5a5fbf1f36cdbeca6130ec12df04a2d9fb6be0237d94dfb5ecc62726bd654124c17466657bed7b966dc63d494504c75977a5134
+EBUILD nvidia-drivers-450.57.ebuild 15509 BLAKE2B 76aff26760536e6b3bf8bd11ff26924ea032e5eebf6bc78eec62de5dda89cad660ad8db4c28e6d87b0cb900c68efebe70b36d57fcf29d59107e3e9a64df13dea SHA512 7a66e8b9cb34fd09ecf016ec752cb22ef67bb77f3b88911a5d1c5e81e091e2f5070a77e66e9b03683596d507f295e5ca2e776c2d4b6a04e867eaa35121e675a8
 MISC metadata.xml 1284 BLAKE2B 0e13b2eae77fee75a4757da7ae80540093962b6e8ccc3b0950caa3a0957ff79c6b08c80ceeec8ffcde47b293c258159f8722a13334fe06868589a18802ec0434 SHA512 0a3c6679f7fc23bf87340145f3a97945c9e8c7fc9c8721fa4643fb662347af312b4b927635901e95acb9349a7b191ef088ff0e51bbbc0cbd333603bb60984020
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
index 2a7ec32148d0..53c0845f705c 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.57.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 EMULTILIB_PKG="true"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 LICENSE="GPL-2 NVIDIA-r2"
 SLOT="0/${PV%.*}"
 
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index df8c91d7aafb..a5641ce21a2d 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index 13ed4304fb96..09793124847d 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,5 +1,5 @@
 DIST qt5ct-0.41.tar.bz2 73009 BLAKE2B de6360feb16a82b262c13e6a3cbe226b7be7c3e95b1f1262b3802de59fc3bb8820c935b170a15a88e80164e6167f6259777c65fda6a3f8fbf1d115a63ddcc1f2 SHA512 a94f9996dc2198d3c8c9af8610912d12b915b8c547a49c36f7bc083b6f237b318d7903e91fb6fcfe06996a319c361104c1923e6d0c49446b6fb66a1e44fae009
 DIST qt5ct-1.0.tar.bz2 73360 BLAKE2B a2a37534434102f08d0f225017c5b835bc22ac2d86592505d4dcc8823a8ed34fd54085a581e86e83ecaec04141e90f4c6e87b9aaed027b68e29ed9a773108263 SHA512 f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2
 EBUILD qt5ct-0.41.ebuild 1026 BLAKE2B 64c305e03b1bb2d1b534cb1fae06816821606bf28fedda93c326e0c7b7c23c49f846a3ab08be11cab61a45a75c3e7644d60c0605b353ddac582f4ad6a6321a49 SHA512 9a58316f68fe1c57b1e94594c47504bb0cbc4091e403b86fccf0be6ff74e745703d7d2f7b60c511cd7078da73e10d228fe6f2fabf49331b1c4bd3ae3de0be23d
-EBUILD qt5ct-1.0.ebuild 1040 BLAKE2B 16822020b9fca286f10dded558b938d81725c04f8f91e21a2a7b400b2f8919264e62e6ae13136e711c618f1efbc7c1bb8f70f77a26c7a8dafa4730cd72317288 SHA512 b35f92581b02ef5ff241a74f8210b7093b784ebee3272a42985b36af487c0bcfdaba88383176997dc16425e8200d91e306a7e6d76951fd25268921ef884a6e0a
+EBUILD qt5ct-1.0.ebuild 1045 BLAKE2B 655e8453f4c44b92801ef5733f5e674477cc3ac0628bf60b81e4cfeca0da693db938cf48721f1fd8a73f4047b57d92762bb55cbed4cd0e5bb804b2f2ce59878d SHA512 5d0b741947b904423f126d9752c999cf6c9683a82360b10c8cc3cc0ec79ec4b2c49ae4c4531bff378952932973bf835aaa41abe0d17d946d9e5c4e564b8a2e86
 MISC metadata.xml 566 BLAKE2B dbb30222ccd1079489ce54e50d5d4ce9a3b9e9acf38d4cc30a402f81418685a3cf86f1adae23d85a409f9866ca11ec1321e543e14bd37ed13a45d02a32accc15 SHA512 d40c24dd0cc2d0b2c79251cf1fb2540dbec484653817469198f4ad7e41164a8c518442c5d11764f0c8aa53bd7ae9758629acc7ba4a4c9f2a374af13cbdaf67c1
diff --git a/x11-misc/qt5ct/qt5ct-1.0.ebuild b/x11-misc/qt5ct/qt5ct-1.0.ebuild
index 9f615edb3db0..976ddce58235 100644
--- a/x11-misc/qt5ct/qt5ct-1.0.ebuild
+++ b/x11-misc/qt5ct/qt5ct-1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/qt5ct/${P}.tar.bz2"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="+dbus"
 
 RDEPEND="
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index d1606f22a2da..3b2e937fa02d 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -1,4 +1,4 @@
 AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd031096cf2bcbd4d4cb86b31ceff18dda880b5cf1f8441e452642dd28275c9ce6e20c7da0a3a77b4157da13d5d4bbe9b6a30a9086 SHA512 a2e202986c77490898c15f6c4e647667fd6662422e8bbd638624a52a33989cd4259f95b37f488ff4a947f04354704ee9df7b9d60aae2fcc928f1f3186955ea1a
 DIST zim-0.73.1.tar.gz 2615382 BLAKE2B 055857b20dbdebc1e5d8d6b13c344fcf665d9889f392f9c58fd3cfef1f80865a78c48e5138d2443f67bb29b8cd915b8d0d6bc0ac4807de20344dfe6673f1350e SHA512 ba67b396a6c06921e5e67ab5ccf0559e54b29a719262411b24f178c350bd0ac7c8239f8d5d4396b9dc291aadc36b59869d81dc04d457ce4a36eade67cdd53dd2
-EBUILD zim-0.73.1.ebuild 1999 BLAKE2B 31f4711d29ddebb7280b0d2adda80836f4491332223ff81eb8634d910d19274b94bf5514d29d209089ea045a720cd717798d686d1f537d360d1b994f2ff91ec1 SHA512 bbd13dd9703c86924633ff3583119d54651f949b93ce1400af57b0384c7496f150ceef7f282a2f880c9c8a562f1283e2f0e09b48d2ca6c6c730c6a9e9d7281e2
+EBUILD zim-0.73.1.ebuild 2004 BLAKE2B 860e5ec15639b229ccdbadb7af5120d22f05722744927d48788b18d9a8196b82f6bbe0c40ed7230da9549446cc8a9580b3128228a780a7f53b84ff60a8ae5359 SHA512 a615515f58178875db7195628162cf0ee1470da174dfb9fedc3af1f4c52e1d974fd0df423efeabfec8d64df17608ed8f6284db54c98cfd9b54c7481b94bf7e58
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.73.1.ebuild b/x11-misc/zim/zim-0.73.1.ebuild
index 10bea1ef64d1..4cd3e599e93e 100644
--- a/x11-misc/zim/zim-0.73.1.ebuild
+++ b/x11-misc/zim/zim-0.73.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}-desktop-wiki/${PN}-desktop-wiki/archive/${PV/_
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 RESTRICT="test"
 
 RDEPEND="
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index a63b88b091e3..c70a5a498b28 100644
Binary files a/xfce-base/Manifest.gz and b/xfce-base/Manifest.gz differ
diff --git a/xfce-base/libxfce4util/Manifest b/xfce-base/libxfce4util/Manifest
index 9ed79b9d5226..5ab240d6622f 100644
--- a/xfce-base/libxfce4util/Manifest
+++ b/xfce-base/libxfce4util/Manifest
@@ -1,7 +1,9 @@
 DIST libxfce4util-4.14.0.tar.bz2 516358 BLAKE2B d8e3d1e3247e23908456aa296415240c1a9146001a02cb859541922ee541e30955279fd68f2d9938e43f992a5115b21836363fa8d8234de87fca0bbaac830bf0 SHA512 6ac95aea03052d9e2f886cbe76afe9bbb43511bf3fe1766097e10cd8762541ed17060a727df3ef93e226aae448c15d9dd3ad8acd55a9d5f2387cb360bdf72832
 DIST libxfce4util-4.15.0.tar.bz2 516074 BLAKE2B 67ba9d34c850d057012a4a2c76acce55e3afd606ab379eadc6873a62651affd69cb5d2ecd6be5e03f11b81d7bdb9ff43e39b04886f9c2c214b898b7b0dcf6b09 SHA512 f47194c999d5c4b0fd44abf392ea40ea2c3f07064e15b900821e30adc58c791e533ae2df20927037bad9db5e94981621716c743522b6daad579badd0094cffaf
 DIST libxfce4util-4.15.1.tar.bz2 520249 BLAKE2B 94a2d84d5e930cb590b87cd27d2a68e8a2d885fc783b9939adbb1af364cf84a0f2663920de5ae697e31e27c53f5665891733546d3e27e5f8cc01a56d9499ea03 SHA512 813269669df3b6b3d99f83142b4e0fbbc884306e467a3de34cd7e26e2dbe67e8cef769cab165e5f68838ead3ebd0d3895cc58e515c8e253b52a512298690acbf
+DIST libxfce4util-4.15.2.tar.bz2 520639 BLAKE2B ff08a4608bcf6ac854961c1753c531680bff5ba62e7103ffb1cab9c6132db9f07e1dfcf86e24dd7d492e42e6316931f1979567d304339678d3f7826e4e3f875d SHA512 1d244cee684229eacb9effc64f214899c1b449dbadabc422900a25a8870c98365c800d80edf9c252877c4d66d94394127195d3cbe4472493658e0f547c153812
 EBUILD libxfce4util-4.14.0.ebuild 1024 BLAKE2B 46f7b43ced6ac5109718d2085b0a43be351bda24cf7de22caa44d0c2a1ca21c72fdc5c117f9779883730a9d92d03a5df60ab5a0b4814090843a4a29fe0144e5d SHA512 39fae6a20d296ea91c5d1844a73a8d15656289d19586afed045fbf8468957c3a072861d7bbbc847dffb407c958005c8c40b746bbbb3c759e0d0dcb7c90f3bca9
 EBUILD libxfce4util-4.15.0.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
 EBUILD libxfce4util-4.15.1.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
+EBUILD libxfce4util-4.15.2.ebuild 1028 BLAKE2B 23a1b604164f6028791662299bdd0cfa4ee6fc0f1c65c0d2935177a7a0b74ce446ffb3ac051e9c5d8af3e07edc8724bad9c699db82b4f120a062012456068edf SHA512 a89d8e37eaf2f76fe590378405450084c412b2dc36738468e7cc388e852d8ecb8bee8812ad87161523a8a67fe840e1a6e56b476d6543fcb6834dc56325ce0ee0
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/libxfce4util/libxfce4util-4.15.2.ebuild b/xfce-base/libxfce4util/libxfce4util-4.15.2.ebuild
new file mode 100644
index 000000000000..dd5b8e34dae7
--- /dev/null
+++ b/xfce-base/libxfce4util/libxfce4util-4.15.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit vala
+
+DESCRIPTION="A basic utility library for the Xfce desktop environment"
+HOMEPAGE="https://git.xfce.org/xfce/libxfce4util/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+ GPL-2+"
+SLOT="0/7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42
+	introspection? ( dev-libs/gobject-introspection:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/gtk-doc-am
+	sys-devel/gettext
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/xfce-base/xfconf/Manifest b/xfce-base/xfconf/Manifest
index c8074c7319eb..ff7bfd68a3be 100644
--- a/xfce-base/xfconf/Manifest
+++ b/xfce-base/xfconf/Manifest
@@ -1,5 +1,7 @@
 DIST xfconf-4.14.1.tar.bz2 644804 BLAKE2B 1b04770fa9b3f4901f561bc3978dd7ffdbfea9496330a98334ffb19c0c7413b0540423f20200e2e5191ff876f3e2c32ca8354bbab70aac4de00592d995f77e72 SHA512 727d013f7e71e0eb9ff17e464acd65c1fa507f8eba1bd29621dae070161042f60f47b8ac048b28849bf45232d04d5d6e48530aa0bd1e661a3f58db47703a8808
 DIST xfconf-4.14.3.tar.bz2 591432 BLAKE2B 9722547018a6db7132bad53b750ec8bd66b2f5dde2348b605bf9a6ce6a7d18fefbfb16c31f58c1c4e6c593d3f0525c3bd8231b4bab0728bd64f91d918f0a6c23 SHA512 e3add05018215cc597bb76d852903077e1fd0a21429c462116c560739eaf32167f9dddac3adb36e89b9380b87fc4b4c38d4ee9fdd5139b540268be437fc3a713
+DIST xfconf-4.15.0.tar.bz2 586244 BLAKE2B 0bc6331f6a00d9328b7d462da1bffd0aa57b7b6e5a48a6e9d05d43993910fe1a3677ca33ca2315caac0528087e61a66e574118efd6c9ea5fb2d068cc843532a8 SHA512 3d36881a5d4a8b514196905689f32eed0da49c642fced38c57fa9260013e2efc0ce83de502b91c5dd07734dd99c2521f2cac00b43d3d76141efe7eeddc03c5c7
 EBUILD xfconf-4.14.1.ebuild 1949 BLAKE2B a8a3953b1c2625ac1e2432217ddea0e7bdae9811c1770ea7f6b24d015ce1db9776e5f71cb591850babe297ae11366ee60f06777e3eaf510fe15b65974817632a SHA512 794c36200e9a9a7d6e41a54d8b8c1daeb6c1726acf3cf3a003740efc35050b947b06ae2832c4c206f29921707a2a6d8bbb978a254490b7cea0e33fb52f143579
 EBUILD xfconf-4.14.3.ebuild 1970 BLAKE2B 4e99b16d82c6afd2b8ad0201d01bcd0439f5c9031d4dfe20039bf807ea238b545c2817755ae5a7a96fcb949266bdb45900588f6762c4a009f8f24dcd5fa1bcdd SHA512 b5e23f16c284f91a66a4b81a08eec785ce306d0b81b48fbd57505e2c847d6551b1c0efdac6b4ad8050a0e4b9ad794a6b86f3712bc6b800d450a760956e1128ad
+EBUILD xfconf-4.15.0.ebuild 1757 BLAKE2B d09f4c9976687074b31d77ba0afb7a032239be697cb1d4a2f772b6986faa1da82c27151ffae7b6dbd72129274113c33598a546cc36a0d9e9b383ce072b84e2a6 SHA512 5eb83f862e7c62d8e1e67f7cb460ec616248f350033fc0eabbd1fc752e136b82e98c3e4b7d87562a2a255232d6db55c3cd740ec0ac83c63df42f7d6b7d151664
 MISC metadata.xml 247 BLAKE2B f381ffd75f3fdb2842002ea885015f443cc35334f0420d70a61d6730bd55c11750d6a177831dc7c8564eec4dc3863db6085162e58848b0dceb09799006a1b2c5 SHA512 25494c0053fb7b2ed0f78ecc2de8a8ae08a971db8e15f89e906a1d43177fef53eb9ec5dd075a5c67ddee2be112c0943f6c87e4870d405436bddfea3a4fa19203
diff --git a/xfce-base/xfconf/xfconf-4.15.0.ebuild b/xfce-base/xfconf/xfconf-4.15.0.ebuild
new file mode 100644
index 000000000000..993040c79af0
--- /dev/null
+++ b/xfce-base/xfconf/xfconf-4.15.0.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 vala
+
+DESCRIPTION="A configuration management system for Xfce"
+HOMEPAGE="https://www.xfce.org/projects/"
+SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="debug introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND=">=dev-libs/glib-2.42
+	sys-apps/dbus
+	>=xfce-base/libxfce4util-4.14:=
+	introspection? ( dev-libs/gobject-introspection:= )
+	!<xfce-base/xfce4-panel-4.13.1
+	!<xfce-base/xfce4-settings-4.13.1"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/intltool
+	virtual/pkgconfig
+	sys-devel/gettext
+	vala? ( $(vala_depend) )"
+
+src_prepare() {
+	# stupid vala.eclass...
+	default
+}
+
+src_configure() {
+	local myconf=(
+		$(use_enable introspection)
+		$(use_enable vala)
+		$(use_enable debug checks)
+		--with-bash-completion-dir="$(get_bashcompdir)"
+	)
+
+	use vala && vala_src_prepare
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	local service_dir=${HOME}/.local/share/dbus-1/services
+	mkdir -p "${service_dir}" || die
+	cat > "${service_dir}/org.xfce.Xfconf.service" <<-EOF || die
+		[D-BUS Service]
+		Name=org.xfce.Xfconf
+		Exec=${S}/xfconfd/xfconfd
+	EOF
+
+	(
+		# start isolated dbus session bus
+		dbus_data=$(dbus-launch --sh-syntax) || exit
+		eval "${dbus_data}"
+
+		# -j>1 often hangs
+		# https://gitlab.xfce.org/xfce/xfconf/-/issues/13
+		nonfatal emake -j1 check
+		ret=${?}
+
+		kill "${DBUS_SESSION_BUS_PID}"
+		exit "${ret}"
+	) || die
+}
+
+src_install() {
+	default
+	find "${D}" -type f -name '*.la' -delete || die
+}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index dcd6065b9476..7ca2a7927850 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-screensaver/Manifest b/xfce-extra/xfce4-screensaver/Manifest
index a1b52d4a43a7..611385cbccce 100644
--- a/xfce-extra/xfce4-screensaver/Manifest
+++ b/xfce-extra/xfce4-screensaver/Manifest
@@ -1,5 +1,5 @@
 DIST xfce4-screensaver-0.1.10.tar.bz2 665624 BLAKE2B 9af4a821bcbb461462cf620dbd2c064a32b904f0d6887095cd00939f857244d69612e18559c0cf0be93e9044047d0e3dba8c756acc16fe9e3e136a718beb3942 SHA512 a04842697c7a8f84ee937f0371b3d1413163b59d1a54b9adf0b904dd501d6328ab645160567ff79afbe063cc113a488567ec5d8df4d6ed2db354738275c00b2e
 DIST xfce4-screensaver-0.1.8.tar.bz2 593968 BLAKE2B 693fe6e057bc1f5f1abff67c8a0a99244d5c270ab9c9afd7945f21b6eeb2bea027448d1485dea9a9f912b5f231211878a92a882bac56f28696557e44215ce283 SHA512 4cb76272f2f94f5e265a86d3fa58de8da6167da013466a4dd2a08a2e94fafe14816ce6c5a1e635a8c07e91497ede0650c014d21b0bbac666b8a72bc5f4645f69
-EBUILD xfce4-screensaver-0.1.10.ebuild 1722 BLAKE2B 09ddd1731f79cf51e01888c2fc686fdb4e83ee49b3f9f17e566eac3096baf3e08946d19f5479b244c75d2cd0dbd2695178b7ee8035fb136a8dd5af7c7e2a81f7 SHA512 2bf42c1ed2d1a21ead341be63c0311f3f063a201d56317a0e6db5bc1c616f340b89faf599a8feb2b643370fb591e7e03645ecdd2f31fa9427014d4cf8525e322
+EBUILD xfce4-screensaver-0.1.10.ebuild 1729 BLAKE2B c3b3fbe262b1b62b1cea549e320066ec28800d4c466b75d8ebd698e3222e3ed8cb1775ed3e22e77d031ef08eecbced0aad6441bf1ca479c94ca8ac0b90c70242 SHA512 8f1adef3c5dd461e2c971551260a1aafc8a5d8c3662061e66b3dfc3834fb6ce5ca0b37b4075239d15d0304ba9e190b4b4ba32d276c0e1043d3342459d9b397ee
 EBUILD xfce4-screensaver-0.1.8.ebuild 1722 BLAKE2B 70065cd642c22986718d33bae0ed0f97b08c43d71490e8c7fc6924e6d7d1b9339bbb5eedfe52926c84f3eeb585ce6d08710881a020afa456da70dfd3fe5ea988 SHA512 fae41f934f7ac0bcaedb326b813ab12def44df1cd39fb1fdd9e01fa0db41d0e2231759b74fc263ec5c2228198f19372ae9d60ebc1c54cc42d6d8637a2397a8b0
 MISC metadata.xml 350 BLAKE2B ac551b0c67875b795ea6640c67d2a5968a7c7ad19cb12c0103a900fbca8adde364eb32110d92150b677d1fb8089fdd35dfb7cee6fc40d30633a663191d77321d SHA512 88f3dbe07292eae938727232450e5b6a2b7b54766dc095541e6afa451d1261bc0a657467a90f0815c7a3cc4db11cf667cbc5e41f7ba3cefa6354630019fd1742
diff --git a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
index 53db08eb6cd7..e06a050f578c 100644
--- a/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
+++ b/xfce-extra/xfce4-screensaver/xfce4-screensaver-0.1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ppc ~ppc64 x86"
 IUSE="consolekit elogind +locking opengl pam systemd"
 
 # Xrandr: optional but automagic
diff --git a/xfce-extra/xfce4-volumed-pulse/Manifest b/xfce-extra/xfce4-volumed-pulse/Manifest
index 2787411d7632..e091de5e1b02 100644
--- a/xfce-extra/xfce4-volumed-pulse/Manifest
+++ b/xfce-extra/xfce4-volumed-pulse/Manifest
@@ -1,3 +1,3 @@
 DIST xfce4-volumed-pulse-0.2.3.tar.bz2 308063 BLAKE2B e64d2e668bf1a6666ce82ac4f03852abfb0346936a789ce7f89acde1734af948f628ca3c17d515e72ab292fc86525623b8aa0b4a219555d7b8729cee10889142 SHA512 da190cea2b3993717f35e1ded058613df99f8fa223a90d379d95dff0bc9d44f4fba15bd23ff1b54f11218d20518092d14a2f2b808d4984673d3bb77616c2f3e3
-EBUILD xfce4-volumed-pulse-0.2.3.ebuild 705 BLAKE2B 8184497f65562a0725307f13baa300f3e9e2b3975bb80859df176f0ed5403471e05172a9ab91ad709ae49997bb0865f1e65c491b6328500bd40276833a799cd7 SHA512 3cbe8ffbe87f94c24ab74fabcbea668fc844f0a2a6aace7cd48989dad4921ce01576e323630f7c7760730e162c4a5bfd71a7ef0abecae6d349ccb1add4f0c5a7
+EBUILD xfce4-volumed-pulse-0.2.3.ebuild 710 BLAKE2B c782b71c8a5c3e91a460407e12ce9faa4293e31adc76f3e3ab1574a873ed3ee1ccb1e97db52b77533d4394db67d688a27d08d9776c1a06f766f20944fdf1ad0d SHA512 9e91a94b89a86f6f9328ebb25e995e525286bd930aaaba27421c2c9dbd07ff17986f0a59cab30833a3993f81b1ada5fca586c780c02f051766c8d2e363fb33ac
 MISC metadata.xml 338 BLAKE2B 61f4640af586e5f992a5d01ee70a9179276a0e3616498d99043d0f3e6e1a6335f50586a61151b2e2a1e946d2c00a598241c9bf23b13c6fe7333054bc326ef310 SHA512 ac7c6bcb04426f25914c331e4f670839e0ba5d4e385f2478387629a7bbf6995254f44cd75516be2d1324fa5f7a98ad000144c7c6fee1582a381c28b280baa2f8
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
index 2008a747cf3a..5cbb94f77326 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="libnotify"
 
 RDEPEND=">=dev-libs/glib-2.16:2=