gentoo resync : 29.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-29 10:15:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-29 10:15:54 +0100
commit: 9aa80713372911cec499b3adb2cd746790920916 (patch)
tree: b8e99dc5dd60ac2094a27cc52f74aada8df38f05 /dev-libs
parent: b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (diff)
62 files changed, 605 insertions, 206 deletions
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 3d53c1343bc4..ec2c1c314b5a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest
index 2c2a7dbd831a..248dfac132d1 100644
--- a/dev-libs/appstream/Manifest
+++ b/dev-libs/appstream/Manifest
@@ -1,4 +1,6 @@
 AUX appstream-0.14.3-disable-Werror-flags.patch 449 BLAKE2B e6513b3c64b5f99afe8aa231d1885c157a8fb1a0849ddd4e2c015a87df58965ec6ae9c36b536bfdd3969ead61215686021f5e39274e00d9179e7e00c1f975aad SHA512 2e9e2597df81015c2eb91dabd39d3cbb6bcf01b3732a35e68e08e52df40e80edfade620e525d480f46126b5c1080027516a13a524da11d71f5c63844ce714ba6
 DIST AppStream-0.14.3.tar.xz 2277536 BLAKE2B 99ceae6873c189b289143c8ab59eaacfbadbbe7cf05db96079c00ba09c82aeac63f4436e1b9e54b8d172aa7e9f609583cf2a78d3f44ce880cb1a326034432563 SHA512 b4c41b44375091636cc46e2f7f5e0b86612474faa6d55010caee78cb9c9ac468d093cf261184d900be7aae8513dc72d2821ff9ee17786e123c86a928ce5e9135
+DIST AppStream-0.14.4.tar.xz 2309444 BLAKE2B 0c1fd20a01d0fe59d1b1ff029e4fbddbf9cea833d4665549480744e48dc0b3615b0d507278c75025c99ccda21b97e25e62496ecfc49dbe6527132f5dad5d6ad5 SHA512 86bd98e94f3e730d37030be31c6ea0000ba12b35e13778458c0f50bad75babf8c8e93b62492a2546a42f750f91ae81f3456d04e63ad9a4acb804cf38493440a4
 EBUILD appstream-0.14.3.ebuild 1771 BLAKE2B e54b4904abf50fc210cd18a1462b0d1a0d97df38f81bf94f86a55dccc3ee32b3a0dadde3e5919ec5edea7fd1c4a03f6d0f4da6ff7f3ebd55fb8c3b9db47a5393 SHA512 28f8bea8d0f6899fef3458202bf80d72c9b9425d6f0965b025d3b4cb7635853eea9a71924ebf314b612363cdbdc160ed85ec51caa25700a7d06fc79d1604a1ef
+EBUILD appstream-0.14.4.ebuild 1782 BLAKE2B 50a0666552b3ce2623216fc5609062c9d72da7dae4e03cfd3f4f6ed838c6b49e463c150ec99d981038015487e0b7852e99f92c7e13f1c3a20a6606043db2e9b5 SHA512 7ddc34f548cbee2c423e1743b5d6979649cd86d4c5003a265581f112fd2b40317ac4695178540db20c4ab7e96b51f9cc5026cc2f723d16b04ec172a5d9d47de9
 MISC metadata.xml 399 BLAKE2B 98e37c9ee3555d98672fc5341ef9db517e386c0ff141671c2d668ecdfcde0fab1e156bdd78fa865bb68ee602b6596b55a20a8513e7c6fb1bc6e0c2843ac0f683 SHA512 fd61c504d44edeebec961ecb6f480562d848a747ee94a8fb88c48e7d885df8475d5fe33422d081576b44a6b7e05d6f94fd9a73dbc3d19f6ead0076654f7a7019
diff --git a/dev-libs/appstream/appstream-0.14.4.ebuild b/dev-libs/appstream/appstream-0.14.4.ebuild
new file mode 100644
index 000000000000..ff3c834181fa
--- /dev/null
+++ b/dev-libs/appstream/appstream-0.14.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg-utils
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ximion/${PN}"
+else
+	SRC_URI="https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz"
+	S="${WORKDIR}/AppStream-${PV}"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Cross-distro effort for providing metadata for software in the Linux ecosystem"
+HOMEPAGE="https://www.freedesktop.org/wiki/Distributions/AppStream/"
+
+LICENSE="LGPL-2.1+ GPL-2+"
+# check as_api_level
+SLOT="0/4"
+IUSE="apt doc +introspection qt5 test"
+RESTRICT="test" # bug 691962
+
+RDEPEND="
+	dev-db/lmdb:=
+	>=dev-libs/glib-2.58:2
+	dev-libs/libxml2:2
+	dev-libs/libyaml
+	dev-libs/snowball-stemmer
+	net-misc/curl
+	introspection? ( >=dev-libs/gobject-introspection-1.56:= )
+	qt5? ( dev-qt/qtcore:5 )
+"
+DEPEND="${RDEPEND}
+	test? ( qt5? ( dev-qt/qttest:5 ) )
+"
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxslt
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	doc? ( app-text/docbook-xml-dtd:4.5 )
+	test? ( dev-qt/linguist-tools:5 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.14.3-disable-Werror-flags.patch # bug 733774
+)
+
+src_prepare() {
+	default
+	sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die
+	if ! use test; then
+		sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+
+	local emesonargs=(
+		-Dapidocs=false
+		-Ddocs=false
+		-Dcompose=false
+		-Dmaintainer=false
+		-Dstemming=true
+		-Dvapi=false
+		-Dapt-support=$(usex apt true false)
+		-Dinstall-docs=$(usex doc true false)
+		-Dgir=$(usex introspection true false)
+		-Dqt=$(usex qt5 true false)
+	)
+
+	meson_src_configure
+}
diff --git a/dev-libs/chmlib/Manifest b/dev-libs/chmlib/Manifest
index f16400276a80..8df9dad98d48 100644
--- a/dev-libs/chmlib/Manifest
+++ b/dev-libs/chmlib/Manifest
@@ -1,5 +1,5 @@
 AUX chmlib-0.39-stdtypes.patch 624 BLAKE2B 29de38c9de0faf7b924c0220a6ef77d338755fa57b87a120db99866b85cf7b8b4bdcacb2d5ba301eeecc6ed167384aceedf059f232a933ee920ff3ad8b9e1388 SHA512 123c28fb581c59f7aba886a0ef9ccdc31586411ad23a716759738075fa9006b2bb170f371c2e272dd21816fed3e426ab4259f16fd2ea9220c4eb005a9edf8194
 AUX chmlib-0.40-headers.patch 361 BLAKE2B 182336c3e3ac3c30226c4860315ecae2d6fec900a84e49b4f7daaa84ecf7ef1e249d46fb059978afa43ed00bffef6eb915ac19b1f78eff98714d9e633f642b5d SHA512 985cdee377e53f7df8d3d53aa305069fa138388397494094498415ec1b026bcb5e2e218ac91ed8977c930840a73f371124b0f7bdadbc1b79a65384b333a4b8d0
 DIST chmlib-0.40.tar.bz2 252036 BLAKE2B 69216120f7efcc7bfaa30faa46d9f2e2490923a6b42a766fe39838bda2b3b033ea39cb0c05eeab85a66b5a69f9297a6a412c375a2d790a463c7f6338610432fc SHA512 3a3e151cf455b19e9e7c163a1d1e5ac52e8196f0b98f77932c72af58f3517824b9244667a18279ae754ccea784f6d6ab0c47465e74e3768ce98bb7dca0ca16e3
-EBUILD chmlib-0.40-r1.ebuild 825 BLAKE2B a5a08db69dc608e4332d58e59373020cbc68b59498780dade5fb8e50734843384de5aebf606fae2ecb2d46e66cffc0aa25622a546bc712ebdec9dd15f8a94554 SHA512 023f8a4f05f0e173b4dc9a3f5412858de52bbef108e7e874299609f6d533de5673eff9b024ec7f704ccabb687a4fc7aeeaa27f7750fff28145eae6a2e47ee11d
+EBUILD chmlib-0.40-r1.ebuild 832 BLAKE2B 4825ca357d357835fcd342394992b2946155a8c25bcecffb9fd94665e48f81d2519b3fe83bf471028d36261644ea7895771988b46ba0a632ab6ce0f211e2aed1 SHA512 d93e41fcabdb1bb7ae5b3403133add141e4e7f8350bcc87eff75e080feddc69f2fc6ddbab7ffe307814c464b3e90d2f0f290b5d09d0dd57b4e359df7f722673f
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/dev-libs/chmlib/chmlib-0.40-r1.ebuild b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
index fbeb8f1b53c8..abdf79cf4f16 100644
--- a/dev-libs/chmlib/chmlib-0.40-r1.ebuild
+++ b/dev-libs/chmlib/chmlib-0.40-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://www.jedrea.com/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86"
 IUSE="+examples static-libs"
 
 PATCHES=(
diff --git a/dev-libs/cyberjack/Manifest b/dev-libs/cyberjack/Manifest
index 8bf807065483..6f41cb360a5b 100644
--- a/dev-libs/cyberjack/Manifest
+++ b/dev-libs/cyberjack/Manifest
@@ -1,5 +1,5 @@
 AUX cyberjack-3.99.5_p14-gcc10.patch 344 BLAKE2B c535dd6c5d034b0ad81dd6ce6364d2c8807e1adfb2391d5b801cf285260c6f55c2bdf9f56e3bf4c0fc06cc8f87128855f34f6e3519a6ebc67a7b6eba10aa8008 SHA512 7ee096fbca22ffccff1ae941c7e16578ee10ab3b7704902dee4643bdf1a3d1592ae5cd19625414245fd4c1ee6f10d8a869e273e47d71c47a3300356a0709995d
 AUX libifd-cyberjack6.udev-r1 1435 BLAKE2B 3606ea979cf8bc068eb7ab447af70f5f9c409369554868ba36a43eaa7202813587b2193b0ef16b42a68bb665f4eaee5ac976774ec0f77dbaa93b447a6e6021bd SHA512 bfefad4cd2b509a41d3e8f638364a3f604e80dd5302456ca9d27d592175e30a2c348353d35fda242f2f80651efcd111c7294ecde7a8d80f1c7e1a655240483d2
 DIST pcsc-cyberjack_3.99.5final.SP14.tar.bz2 1682821 BLAKE2B 389b0da28beec42e3e2f1766b76dd77efec24bf7aea906ff14ad206c182162125431ac6c81e9242813c088b4936958b8056f5e7c71424c95de6e8e1ac2357aed SHA512 c83e142d6c071f7f20f9f15b9b76ed819873760bda4b49ec042506b2d7ef9ad8674c953abe67f08a1c4b178ce44767ba6479ea1148d8eeb38797e4775b2a9e82
-EBUILD cyberjack-3.99.5_p14-r2.ebuild 1933 BLAKE2B c266c616b905ad859000bef946c33f17c85f54220bb6802bddb40c51fe846a106b9f5d77c87b7848e829ddc5bcd214bdf21dd39d49055c1481efcd4a44b27c4f SHA512 c0453cb55d8386c87a93372863028d23a5e3c35119838933b91c7abb80bc9dc2b82e85fb1f550877b25d93fb2a305d075f699c60939f7276a36bc4cd5fa57c32
-MISC metadata.xml 622 BLAKE2B 4238fe4ea370787f4542d53d161afaa0c0df5788d7a2da5ee6b99b788ae6d4456cd43d6ea8df0a174431b4582127fb49712a59ed2acdbeaf4808f57b8fa44930 SHA512 2062ac48ee73a6a58a2663e39f467e8e55f06af48b7a04b5f174e467c3f33d4b92b93b8fff3747447503b3256fc514fc40c8e07f7cbec8e1608d6389d9aed4ba
+EBUILD cyberjack-3.99.5_p14-r2.ebuild 1910 BLAKE2B ce129e192cd8396a8a4d20c39b2f58bb8f3b38cfe16c10692490c3a8222f5b71cca1a200a7dda81f98ed0e601de6bb99e6864e9c97e19e98ca9a8954a00c2c0c SHA512 30fe40220ff67cd04e1b3b4701e83a1f3d8ffd8d20976c91e711be7777deb13cb2108021b81a7691eef24ac068047846e234c71d477fa410b67f1d40fb7b7470
+MISC metadata.xml 550 BLAKE2B 8e0ec98b6fe68d344861ecec35d6e824c791550805d64de6b8d882ffcea31f47ef77718e8684c3209f19f47359d68b106490a2c5d6d65320307a0b026918a3ca SHA512 6aa661159988560135832d01ac40b89e8506ee53d8ad0d5156007d310d29fd1bc3d8040a1195dc76a52517850e3a3db466e0cb09a32edf354c5734382b477c2b
diff --git a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
index bb855c3443d2..6324d86c3a9e 100644
--- a/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
+++ b/dev-libs/cyberjack/cyberjack-3.99.5_p14-r2.ebuild
@@ -12,15 +12,16 @@ inherit autotools toolchain-funcs udev
 DESCRIPTION="REINER SCT cyberJack USB chipcard reader user space driver"
 HOMEPAGE="https://www.reiner-sct.de/"
 SRC_URI="https://support.reiner-sct.de/downloads/LINUX/V${PV/_p/_SP}/${MY_P}.tar.gz -> ${MY_P}.tar.bz2"
+S="${WORKDIR}/${MY_P/_/-}"
 
 KEYWORDS="amd64 x86"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-IUSE="static-libs threads tools +udev +usb xml"
+IUSE="static-libs threads tools +udev xml"
 
 RDEPEND="
 	sys-apps/pcsc-lite
-	usb? ( virtual/libusb:1 )
+	virtual/libusb:1=
 	udev? ( virtual/udev )
 	xml? ( dev-libs/libxml2:2= )
 "
@@ -28,8 +29,6 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${MY_P/_/-}"
-
 PATCHES="${FILESDIR}/${P}-gcc10.patch"
 
 src_prepare() {
@@ -47,6 +46,7 @@ src_configure() {
 		--disable-mac-arches-i386
 		--disable-mac-arches-x86_64
 		--disable-visibility
+		--enable-nonserial
 		--enable-pcsc
 		--enable-release
 		--enable-warnings
@@ -54,7 +54,6 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable threads)
 		$(use_enable udev)
-		$(use_enable usb nonserial)
 		$(use_enable xml xml2)
 		--with-usbdropdir="$($(tc-getPKG_CONFIG) libpcsclite --variable=usbdropdir)"
 	)
diff --git a/dev-libs/cyberjack/metadata.xml b/dev-libs/cyberjack/metadata.xml
index e57eaa0f05c4..3deab0720707 100644
--- a/dev-libs/cyberjack/metadata.xml
+++ b/dev-libs/cyberjack/metadata.xml
@@ -12,6 +12,5 @@
 	</longdescription>
 	<use>
 		<flag name="tools">Build and install optional management tools.</flag>
-		<flag name="usb">Enable support for usb based chipcard reader.</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index 5376d9d25086..df47ac0209b0 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -1,7 +1,6 @@
 AUX elfutils-0.175-disable-biarch-test-PR24158.patch 307 BLAKE2B 9cfcd2c9ef972b16fdf6bc203ed2cde70b0da80d982dc3493c993532492cdb8f597b66fd38ebedf7517403096c1704d77f7541972d875af2b952cad3586751bb SHA512 d3263c42b1638a416e95c2b8e68b15a9723e748490c8eca727da94bf7bb3dd8389222dd01bf69612ba45a20114ee1427d77935c41436d1ca9180fcfd71d3cdfe
 AUX elfutils-0.177-disable-large.patch 383 BLAKE2B ce5a90495ca0eac5a74d7e3f52b9f55e0611fe83782374d5201b984e85e7c27897d0d056f53af40ebb383e8cbe315a57adce2af378348ee1a573cfeb005e7a43 SHA512 2660ee456b62d6b1ed72ede92d8b00e9d1cd4b0a5778a80bfbdc3139e5527758591cdb05110b39a5c5811f60e2223cc8c83a488ac055a554f5b3c71fc5980acb
 AUX elfutils-0.180-PaX-support.patch 1058 BLAKE2B 9d7980eedf6250b848923eddb86d918ac983b348f77b3816ba77e1a663cc637ec02670e062b005aa010fa50f45fb953b1f2ef033bca6381773793231eb3cef06 SHA512 1bfb390ff4fb9ba2cbaf677bb4cd0d3ab3a27e465629be0dcc7b37f14dfe6c876069b598e29e9f3aa0c345b08c62895e68ce557237d18239c7505b8ea51c9ebd
-AUX elfutils-0.183-CC-quote.patch 1795 BLAKE2B f6147afec19a45538517190f3feb4c483bda60643b7c14df66c9efa632130785865a1b7d5aefa6f29a51e2998e309333c9bc0a62a4c6bc050d9f79ddd0df7be6 SHA512 510bb7e3448318875586c33e586c16923bcaf0673f40f282f2e0ac8958ab28f070c6501e4ab4bab08209ad17ee3f861c80e1dd3354e844f78b6610a6d05eb3e7
 AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb8b4c92c897f7ebb4284445a489b5b28c630ac28e337bff977f67c164abed688aa0ed0dc76a715f6270e1001a7a80d46799f SHA512 8ac89c40aa108b097f18deb82ec3267d987aa16473fb40105aa7f83465cbea4ac1538bf4fc84c957e61250f9b8b6ea1f5694dcd5b404902ce8b73f53eed3308a
 DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
diff --git a/dev-libs/elfutils/files/elfutils-0.183-CC-quote.patch b/dev-libs/elfutils/files/elfutils-0.183-CC-quote.patch
deleted file mode 100644
index 8dc59bec262a..000000000000
--- a/dev-libs/elfutils/files/elfutils-0.183-CC-quote.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -528,7 +528,7 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
- 			      export LC_ALL; export LANG; export VALGRIND_CMD; \
- 			      unset DEBUGINFOD_URLS; \
- 			      NM=$(NM); export NM; \
--			      CC=$(CC); export CC;
-+			      CC="$(CC)"; export CC;
- installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
- 			 installed $(tests_rpath) \
- 			 '$(program_transform_name)'
-@@ -540,7 +540,7 @@ TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
- 		    export LC_ALL; export LANG; export VALGRIND_CMD; \
- 		    unset DEBUGINFOD_URLS; \
- 		    NM=$(NM); export NM; \
--		    CC=$(CC); export CC;
-+		    CC="$(CC)"; export CC;
- LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
- 	       $(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm:$(abs_top_builddir)/debuginfod
- 
---- a/tests/Makefile.in
-+++ b/tests/Makefile.in
-@@ -1568,7 +1568,7 @@ installed_TESTS_ENVIRONMENT = libdir=$(DESTDIR)$(libdir); \
- 			      export LC_ALL; export LANG; export VALGRIND_CMD; \
- 			      unset DEBUGINFOD_URLS; \
- 			      NM=$(NM); export NM; \
--			      CC=$(CC); export CC;
-+			      CC="$(CC)"; export CC;
- 
- installed_LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
- 			 installed $(tests_rpath) \
-@@ -1582,7 +1582,7 @@ TESTS_ENVIRONMENT = LC_ALL=C; LANG=C; VALGRIND_CMD=$(valgrind_cmd); \
- 		    export LC_ALL; export LANG; export VALGRIND_CMD; \
- 		    unset DEBUGINFOD_URLS; \
- 		    NM=$(NM); export NM; \
--		    CC=$(CC); export CC;
-+		    CC="$(CC)"; export CC;
- 
- LOG_COMPILER = $(abs_srcdir)/test-wrapper.sh \
- 	       $(abs_top_builddir)/libdw:$(abs_top_builddir)/backends:$(abs_top_builddir)/libelf:$(abs_top_builddir)/libasm:$(abs_top_builddir)/debuginfod
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 9d56a47e3056..7f276d4cdc13 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,6 +1,4 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
-DIST libjcat-0.1.6.tar.gz 64485 BLAKE2B 1b9c26655864972a5b0686eaa1b2d3835d494fd897bf0e0d08639a5b8d337c245c1265fe49d24bc52038379e4eba406660f8485a5c6350b4abab01b76a80e161 SHA512 89f49b4c73305ca83157bc0ae369d2793835b6d7d06ff90e55cd27491363c8ca7451dc0e4e5c1e3def9b653581e3ad1a990469b029f4557442cefd650420dc2d
 DIST libjcat-0.1.8.tar.gz 64828 BLAKE2B 86ebc635364cd78c05694baf3d5fe7d9bf6764629f4530f5ab8a9502887884b3d5369860806a252493a7a3208367b848e470730fb8c32d4c66cc8eb92df51990 SHA512 058bcf7ddddc7a3cedefcfcef9947c5f318fa806c8673b991be29f36e4fa0e09e51e972c0bebe0404fd92060715f8a497a0c0566d743bf6f3fa71bc3d94688c9
-EBUILD libjcat-0.1.6.ebuild 1446 BLAKE2B e221f9c8ae420640276ad71c36afa7067a0a7b8ba1aa88ffec5f16270c93729cc7617e63dbfcd5021cd7f776939ce070c08837399cbf0aa734d5f084f811f3c7 SHA512 57953396b10b16df1e12c1ff5f690d339ce12543af7cd0c2d1f082b94fa6de950577b5965715bd317a3999fa9a0b07676b7aa4a4b5f6aefec1803ff43d130cb6
-EBUILD libjcat-0.1.8.ebuild 1449 BLAKE2B 004523fceaae3649d805f671cd728be687262d0f89fcb90c0c22aeebb147c1b00c9a51f9e2fd1ad55ec46925c16912fdb0279ec0fec12946324beb0e1f43de61 SHA512 7251a9dd8471cc42ff69c931a45a555ba01ddbac1d61cc9fdce155f85d4f33a16384f9bda07c7a04c626e0211a86815c4077c2086e07bdc23651cc77c1533a3e
+EBUILD libjcat-0.1.8.ebuild 1447 BLAKE2B 7838b66cc1db2b3df022dfb4e7d9a4eae6db247d0eaeda35a622d915187241d47138391a93482e300b7d177669c07575029e588d596fc05849002aee7cccb61a SHA512 a90d18c2ecad02c3b5b1a8af67f476ff63f98c4f7445da332d36f6bb2e706ce6ec1999b941fe75bdaa365475068b51c5dc074a12a77222f5ed1f55d1adeefdca
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.6.ebuild b/dev-libs/libjcat/libjcat-0.1.6.ebuild
deleted file mode 100644
index bada11c0c7e3..000000000000
--- a/dev-libs/libjcat/libjcat-0.1.6.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="xml"
-
-inherit meson python-any-r1 vala xdg-utils
-
-DESCRIPTION="Library and tool for reading and writing Jcat files "
-HOMEPAGE="https://github.com/hughsie/libjcat"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
-
-RDEPEND="dev-libs/glib:2
-	dev-libs/json-glib:=
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	introspection? ( dev-libs/gobject-introspection:= )
-	pkcs7? ( net-libs/gnutls )
-	vala? ( dev-lang/vala:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	gtk-doc? ( dev-util/gtk-doc )
-	man? ( sys-apps/help2man )
-	test? ( net-libs/gnutls[tools] )"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.1.1-disable_installed_tests.patch
-)
-
-python_check_deps() {
-	has_version -b "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	xdg_environment_reset
-	use vala && vala_src_prepare
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use gpg)
-		$(meson_use introspection)
-		$(meson_use man)
-		$(meson_use pkcs7)
-		$(meson_use test tests)
-		$(meson_use vala vapi)
-	)
-	meson_src_configure
-}
diff --git a/dev-libs/libjcat/libjcat-0.1.8.ebuild b/dev-libs/libjcat/libjcat-0.1.8.ebuild
index 5ba6f9393cff..20c253ee26f3 100644
--- a/dev-libs/libjcat/libjcat-0.1.8.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 4351738f5cfa..a10bae37baed 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,4 +1,4 @@
 DIST libmspack-0.10.1alpha.tar.gz 963274 BLAKE2B 39bcb3b7ea419d6d00850b70c217c802a2095dd4398038e594ae7c01ca12e71508218c1cfca5ae8b102636ab9517b13d55c1e411b31e87d28aa46331cd0127e6 SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245
-EBUILD libmspack-0.10.1_alpha.ebuild 1638 BLAKE2B 66e3c38c096b112e2214e3edad870d47bbe4484cfdcc471b438f85a3784179ae43933e08ce4f3cc5a51fe995a73f35e82d1ce8d767d0beafa72779c158c74bb5 SHA512 915e8b7ea9aa4af662568c560c126181b066850d8d25bd3ce1c707ee4fdb4472eafa26bf3d6270d90aba212b34b2d8c3fcd0569b38e0f3d3bdb02bf77b86058c
+EBUILD libmspack-0.10.1_alpha.ebuild 1645 BLAKE2B e2a4e808b9d4686e416e3eea7b3fdb2dd166ccb570b9a35af33cb69737f464cdc0aac21dae72b483012bf45cad3340a5e611e40ae3f7273a70f31182f99811b8 SHA512 5be3e4bed58d72f6cbe1418a540ac0930ae28faebbabcb6618956db6b7a7dffeabe48d6b6186960e64341f0adfc70ab9005f7e3343e214a923b94ad3a859c676
 EBUILD libmspack-9999.ebuild 1604 BLAKE2B 4ccbda9a8108a4b6381a908229c87e5111faf33e67d507f7cf079012842cd135aca9c3fe968e363d213cb6819ff6af01927b745994a6b75248ad6963196fb48b SHA512 2025a1a6422a0703bd3d95611e3917e25ac8797fd88255e839684c5ba5efb4418b493219c278fed94c94b686d4b3995a99b140de4d262d5dfc0ff4dd0c9655e2
 MISC metadata.xml 251 BLAKE2B f8ea69eed31c6ee4eca7ce37a9ee2b99d4139e42e53a0c93441863f1c2eb1148149038cbef9ec91a4c92971077fd6ba8e6ea995a138f8863c06d8ee57bc4f74c SHA512 14f3538a99bd8d32654ef4630d0cc667d55b36b44701791eb42d98f8e958641188915d86c306d68c7c20a4587e53477a3f9e32aeba2e0ba51c63c903391c4277
diff --git a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
index 9ddf9f32ef53..e7f7d1b121e0 100644
--- a/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.10.1_alpha.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 	MY_P="${PN}-9999"
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 	MY_PV="${PV/_alpha/alpha}"
 	MY_P="${PN}-${MY_PV}"
 	SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
diff --git a/dev-libs/libpthread-stubs/Manifest b/dev-libs/libpthread-stubs/Manifest
index abadd84b40a0..e3c02faa2ced 100644
--- a/dev-libs/libpthread-stubs/Manifest
+++ b/dev-libs/libpthread-stubs/Manifest
@@ -1,3 +1,3 @@
 DIST libpthread-stubs-0.4.tar.bz2 57565 BLAKE2B 0c59ba509aa24ce0d255790363d78d670be0bae5fd9556798f276466ecaf70c4d93064b531dd9870da8f934da6660fba71a7f0b402bb6ba5420fd6ee5ca546df SHA512 0fec563f3833b84311b32cb13a4fd9832aeb0204c65b1541bf453d5d35693b2267c3cee656e00a4b8533b07a8f6320ca5c3672dcf8ab047cdac8628154c08954
-EBUILD libpthread-stubs-0.4-r1.ebuild 813 BLAKE2B cd553e979017489860e145cb61db91be26ff39b57cdc21fc4cc80a7596d802d94baf0122460e515cadbef8c48470aadca8fdfc0f8dafa654185de24486d69f7c SHA512 0f4dab86427640d12c4bd24cc4f3b283aa55b2ed97becebd8be7869eff6d01ebb5709b5692585b5982370f7ebcc0489edbbb3d1cfdf2bcefa39257fae2c2d66b
+EBUILD libpthread-stubs-0.4-r1.ebuild 820 BLAKE2B ef6c6220e61b83233ef808f460ca37f6c1729cd19b5100653a2ecd704c217dc9704cc06a7247bbf45d7dc80a9bc5d90b088ac578f932cc61c6ac857118f39679 SHA512 8ed1cc22a46222c858883ea627989e398488ee54c313aa14b4a8ec4caeaa458956cac3c406598319d59d2cd31e734bdeacbc9e5140d2dbcbf5080f5d021cdd44
 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
index 3440248d88e0..1f41658a74fc 100644
--- a/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
+++ b/dev-libs/libpthread-stubs/libpthread-stubs-0.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://xcb.freedesktop.org/dist/${P}.tar.bz2"
 
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 multilib_src_configure() {
diff --git a/dev-libs/libratbag/Manifest b/dev-libs/libratbag/Manifest
index d3586c6ba8bf..e03a480f175e 100644
--- a/dev-libs/libratbag/Manifest
+++ b/dev-libs/libratbag/Manifest
@@ -1,4 +1,6 @@
 AUX ratbagd.init 336 BLAKE2B c6f2ef095cd7d929c3097a18e912ae4b3615bd0ebbdfdaa9f4151b312614c016af2f3581c2fbb2853472cb70ce47d5f26f254772fb9f3dabba2ce93626b672b7 SHA512 3908b3481b49bcebc84e3023ff911dcbc1773e4322356def0067ed4aa426184cf43e12de702e98210157d17c2806d57c1cb4bc79ddb0b8660036a6fe3974607e
 DIST libratbag-0.15.tar.gz 249492 BLAKE2B 0f5b35800cb9f82cb892dacd5e3b041843cf5513507ee4882ec5b3f8c8aec8a24594736f2eb1c8e373a0ee38ace1e6328cbd4816d6e5b2cd1f2154ebd803a5fa SHA512 add47a6b3d771de77c6307e128a549f5295e216059b5a2375aa6b2b6bbebcf9a93d7bf148181b3f39f855976e9b6f57072dd9198d07828bebe85409f4ad994aa
+DIST libratbag-0.16.tar.gz 253080 BLAKE2B ede56838c822519b4fe4c6846f5d6d237104fc06f96fb17aa62b4c712965f00827973ebe732ee5ac9a16f101baf0b63eb445fbb97746df3b8ed24d6e085b34e1 SHA512 b3f2fee39ec85c0e08d257753241fb0e553de53eb7409a3b95f93a0fac3989a9411c53c915e72bef19bcfc5682fe9cdafaeb1f41f2718ab02766859f565415e3
 EBUILD libratbag-0.15.ebuild 1982 BLAKE2B d5c71bc1c69abdf478bf56082b359c714592d91740b401027e276008a6e7f9a260643babf51d100b05a5c4a1c30423eb12e1038ca26a9403388c0ec6a1f264a9 SHA512 5c5bb4e1a5a47c89a758f752d6d5b93a241436348462e2ff9cc6f023910b8c08c8b2a9623195b5203b9507e097cd788b1607cf5413606e255f7136664f0ea6d0
+EBUILD libratbag-0.16.ebuild 1982 BLAKE2B d5c71bc1c69abdf478bf56082b359c714592d91740b401027e276008a6e7f9a260643babf51d100b05a5c4a1c30423eb12e1038ca26a9403388c0ec6a1f264a9 SHA512 5c5bb4e1a5a47c89a758f752d6d5b93a241436348462e2ff9cc6f023910b8c08c8b2a9623195b5203b9507e097cd788b1607cf5413606e255f7136664f0ea6d0
 MISC metadata.xml 623 BLAKE2B 9927622eaaa6c1dac2628439bf9b923ae0707fa6cb8d5ec7869bed62d8630d4ca10d9ed0f7a330e887fb4683467928c6280decbd6aa2f3fe25cacd24dec7425f SHA512 ffb3bae021b48df16e0a0123e0d74d6ba2152bdef2fc8e9512ec3218430b0b4090811fa25d9200a3868700b8ddb0cd2a59047765952a577b0315bb62c74944a7
diff --git a/dev-libs/libratbag/libratbag-0.16.ebuild b/dev-libs/libratbag/libratbag-0.16.ebuild
new file mode 100644
index 000000000000..91fa0ecda28d
--- /dev/null
+++ b/dev-libs/libratbag/libratbag-0.16.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit meson python-single-r1 systemd udev
+
+DESCRIPTION="Library to configure gaming mice"
+HOMEPAGE="https://github.com/libratbag/libratbag"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc elogind systemd test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	^^ ( elogind systemd )
+"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-lang/swig
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	test? (
+		dev-libs/check
+		dev-libs/gobject-introspection
+		dev-util/valgrind
+		$(python_gen_cond_dep '
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+			dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+RDEPEND="
+	${PYTHON_DEPS}
+	acct-group/plugdev
+	dev-libs/json-glib
+	dev-libs/libevdev
+	virtual/libudev
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/python-evdev[${PYTHON_MULTI_USEDEP}]
+	')
+	elogind? ( sys-auth/elogind )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/gobject-introspection
+"
+
+src_prepare() {
+	default
+
+	if use elogind ; then
+		# Fix systemd includes for elogind
+		sed -i -e 's@include <systemd@include <elogind@' \
+			ratbagd/ratbag*.c || die
+	fi
+}
+
+src_configure() {
+	python_setup
+
+	local emesonargs=(
+		$(meson_use doc documentation)
+		$(meson_use systemd)
+		$(meson_use test tests)
+		-Ddbus-group="plugdev"
+		-Dlogind-provider=$(usex elogind elogind systemd)
+		-Dsystemd-unit-dir="$(systemd_get_systemunitdir)"
+		-Dudev-dir="${EPREFIX}$(get_udevdir)"
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/
+	newinitd "${FILESDIR}"/ratbagd.init ratbagd
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		elog 'You need to be in "plugdev" group in order to access the'
+		elog 'ratbagd dbus interface'
+	fi
+}
diff --git a/dev-libs/libsodium/Manifest b/dev-libs/libsodium/Manifest
index 17d716290c80..b80ee30f95b3 100644
--- a/dev-libs/libsodium/Manifest
+++ b/dev-libs/libsodium/Manifest
@@ -7,5 +7,5 @@ DIST libsodium-1.0.18_p20210617.tar.gz 1854880 BLAKE2B 5b421c7efacca5b2a2b5a99a0
 DIST libsodium-1.0.18_p20210617.tar.gz.minisig 311 BLAKE2B c54b76a9e29f49bccca80466a5aaa77fb8341e8164041331003710de8f9b173fd25de4812157377645d97ba8a97470076a7f5e037501ba8376b285a06461efa9 SHA512 2180beb872716ad6b728a455981b548003b18594c3f28435c5ddc9803ab2a0f8f1945b6c77de5928b948bbb803b4fa7527cc2e72059931364343a2fdf51ca1be
 EBUILD libsodium-1.0.18.ebuild 1556 BLAKE2B f2f3c2e042a14f76b944219175597afb36440eb93ae5e0ddf155cc219ea7fc554ce97b7c727ba147c9532d6999fca04eb8c68cfa446bf709be4f3966ef724d48 SHA512 7a036b36d982e96af60b5635629ae4bec2dea216e30b69d792e1bbbaabd77177d5d5e51a9eb5ecf5730948006f1ed23bc3be253662f7678a9d77af59c4308d8a
 EBUILD libsodium-1.0.18_p20210421.ebuild 2612 BLAKE2B 2aa57578e12e149c2b86896393a9dc9039b5c47548ed962cd65381a2db6ff2ca98d0a616a151afa14d2593ac896cc30d91beabf2170ab5d8b289707289929a0e SHA512 4cd7dee80fd529ee70bd97be4ae6314518b0d4d84a1200817db92f6c74763b12e07477664a8f4d6b5fdb00fab9d97ff8fb0662c858989d181613ee2f48fe5f15
-EBUILD libsodium-1.0.18_p20210617.ebuild 2612 BLAKE2B 2aa57578e12e149c2b86896393a9dc9039b5c47548ed962cd65381a2db6ff2ca98d0a616a151afa14d2593ac896cc30d91beabf2170ab5d8b289707289929a0e SHA512 4cd7dee80fd529ee70bd97be4ae6314518b0d4d84a1200817db92f6c74763b12e07477664a8f4d6b5fdb00fab9d97ff8fb0662c858989d181613ee2f48fe5f15
+EBUILD libsodium-1.0.18_p20210617.ebuild 2619 BLAKE2B 9d8ff8005a51500bfe0af913c6bc08010ebb6840c9d0c6c1e382e039f77e1f740e422d25cdd020c35062c6932d0d8386344b2816b1bce187c5f69500ab45f058 SHA512 1b674b3a46efe0b409491f6e07700ce6ba4eab4d8eeee968d50530c09f5da251b0b141d0989154d2851e59b594e586dc97f2b1254de14c96d624657880c86af5
 MISC metadata.xml 864 BLAKE2B 5776de362d73fafaf378d83f7c050cefced1e3659f95c87cd31ab4791d24a416004d806e14abff108a7c235b750c854d20342560372a6125564655303e098cc6 SHA512 e5ec535a7fe1a299357b7886d197bcfb7fe358cc010c89d8d030cf9a8250b3e5108e945aff5fda56014648969af33d32216c22b864ee68e1632cf08006ca95d0
diff --git a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
index 3d4e4edcb0ee..75d0d4c4f6c4 100644
--- a/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
+++ b/dev-libs/libsodium/libsodium-1.0.18_p20210617.ebuild
@@ -31,7 +31,7 @@ fi
 
 LICENSE="ISC"
 SLOT="0/23"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="+asm minimal static-libs +urandom"
 
 CPU_USE=( cpu_flags_x86_{aes,sse4_1} )
diff --git a/dev-libs/libtermkey/Manifest b/dev-libs/libtermkey/Manifest
index 5fc21507d963..bb53e1c18281 100644
--- a/dev-libs/libtermkey/Manifest
+++ b/dev-libs/libtermkey/Manifest
@@ -1,5 +1,5 @@
 DIST libtermkey-0.20.tar.gz 45167 BLAKE2B e51a0c91efce056824ee56918aa6a794096e1f19e02d04278c0f3e82382055f16b0413c9f3832492677fbb68bcc1803303cb4c8ee8dc7363276dfeda3e5a6e4f SHA512 81a4bc5917c60ca692ec3065ac0252ae5dc1adccc2832be1c83c82318c97473d883900ab88a8a0ee08ab3f831ff07f3a4827ee3d8e936a3a42c4708ee58f6301
 DIST libtermkey-0.22.tar.gz 46147 BLAKE2B fddc00a1ae525e5ed8c9c6eaee46fe30a99dbbc76ca988f9f5301b3c5c13a6de4462d6cc612119409a21737176f67ac196109b11fb58f414b25db5b6a49f4982 SHA512 2e8242cd1e6acb8900125dcee9fd47f7554c359363f760b88858c82667e1f3871bdd87358b14c8a133ef3cd2699947a5045477e64cdf7f96d4ead1723e73a219
 EBUILD libtermkey-0.20.ebuild 965 BLAKE2B 1e16f410da62765d9818cd526aa1e2cb5e88f96940d17bbd21c9d90ca7d50787825f0115a633dc4803be5e37d2cf39945c84d559a21dc22ca0ae62f1ff6fcae6 SHA512 a738569e408342f8605d32dbe96fda1f4843a39efe49f998b981b5d4f3d78cacf2e2be5832603704aac66c6a9fe84fc052aaea925196298721d4f69380bf641e
-EBUILD libtermkey-0.22.ebuild 973 BLAKE2B e8ec065e838e7e7f2ba28affee2ea1329693bd82d5dbe46f4a7d3042664c88eb25ba075a85662ff0bda8d25c3c07676b4b3c2ef060aaf2666915b263b10857a6 SHA512 419f39f02fd8c5927160d55b52685643e173a07d193649f4e9cd9092947ae9b0a900d84d41b9b1275a8b9afda312800dbd6b0b119667707510b3bee628490e85
+EBUILD libtermkey-0.22.ebuild 984 BLAKE2B d2026920989f636c339058ac83b0ecda50c82d7a386ffb18840e530c3a6143ef7dbe1318ad5b8efbfee0f028de665eee142196d8477e281a623085ff16e82e1b SHA512 ad9a012b24b91eee34532c8e08b81d936d4e4f85b696c291a00867a7791ce4284b47f40c2789216ab525c492be45ca96d83551ee3e925357491ed1ff8f83e11a
 MISC metadata.xml 357 BLAKE2B b658c2de2a5bcbf02faff436d83266b842ab4217adb954f71f0543e5be5f791e48c97f4299e6c97e1338b0a2ee3937136062d0b80c1c8cb09deb3cec8d7add13 SHA512 0b48ba4931f32eda8d9c162693389fc65a0e0eac83b8f2f0dda2e58cabcd93a2bbf301c86c12cc0b2d89ed2c19afd82bbc3a54da9ab3e3f8c615aca24290dfbd
diff --git a/dev-libs/libtermkey/libtermkey-0.22.ebuild b/dev-libs/libtermkey/libtermkey-0.22.ebuild
index 4df93edfc85e..5f60647df324 100644
--- a/dev-libs/libtermkey/libtermkey-0.22.ebuild
+++ b/dev-libs/libtermkey/libtermkey-0.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 x86"
+KEYWORDS="amd64 arm ~arm64 x86 ~x64-macos"
 IUSE="demos static-libs"
 
 RDEPEND="dev-libs/unibilium:="
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index d0390b27b848..21bd9f43fde4 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,4 +1,4 @@
 AUX libtpms-0.8.0-Remove-WError.patch 472 BLAKE2B 08bf1379957d35b123180d0e2434ee9f0bb050bb420e3ab176467f517489890491edf12a14d1ed28a6eb6d5adb3d7aabe274870de7ea691a9f53b169c269761c SHA512 2e7dcd146f8ac438c574ac662c513a95f4d99277c7123b86f633ea1b4c2d3c8dc758f4675258c519b6b1449cfe6f3573eb13241b7b255d09967965627eddf997
 DIST libtpms-0.8.3.tar.gz 1254474 BLAKE2B c71f52d6475d4328e93a35f88557de3400308984ec086f7e6b3c32ebc266e078b3a9864396546ba11fc310c1572efa1521bdac89075c5eba18cb35eef883e706 SHA512 07cf78c2a5b03f3c9179b041db57d5ec049dc0085c09e4fd5c9b54a247cf81a3b9982f0fb1cd571cd6b21b3d9824b061f8f38508fc25b6a23a6a6b06dea7115b
 EBUILD libtpms-0.8.3.ebuild 1185 BLAKE2B 90295a0a4023e786ed52815b187baa20d91b03f3e959125ea626ec980b32356416ffc2a4e23b7a7179f0fbd5beab47857d7245ace5ba4e25d28dd6c10f927b4b SHA512 f7f2fbacb42ac4b531312e333abe24b72d93befa29781892c90a69a76a3c3cd0f8f280c8a104e52a8ffdde33971a6f38bea906aa6a2e6a60b1ebe15110fe6024
-MISC metadata.xml 403 BLAKE2B 4814e5c482ca758a1dabe326fd8a25fbe32554dbc1f68c4fe0b4db76ae1db086a31d256d8c015884fa6b811e495862a559fe3cdd08ffff7b35def3099769f40d SHA512 f0c7f037abbe22a17b86ae160ddd5c703051b10ec53bea2bf9f2aa6efdaf50bdb8fc2eb1ed7caa47bd2d7dc3276d8d0212dece07184c4fc2daa8793d1592e50c
+MISC metadata.xml 535 BLAKE2B bae20f8be44e80b54b497276a1913da891e9c1bf3e61d3ecc41c0db089ba78424dd470d2b3d9e6475f772d786c44b390cea07dba2498521fa5316144622bc4f7 SHA512 ad2c131b3183613382d1ecfb0b24b02ff3f1d2b4901ad586289298816ef39d4604e82ea1065df54f35883e0cc4052c0510f6971220df8196fe9477a105e50f68
diff --git a/dev-libs/libtpms/metadata.xml b/dev-libs/libtpms/metadata.xml
index 69ca4c8149b6..10d230e20423 100644
--- a/dev-libs/libtpms/metadata.xml
+++ b/dev-libs/libtpms/metadata.xml
@@ -9,4 +9,8 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-libs/libvterm/Manifest b/dev-libs/libvterm/Manifest
index e8de7ff01d07..4819b2ea332b 100644
--- a/dev-libs/libvterm/Manifest
+++ b/dev-libs/libvterm/Manifest
@@ -5,5 +5,5 @@ DIST libvterm-0.1.3.tar.gz 69115 BLAKE2B befdb173a75652a42f3ba72682cc5c411ee170f
 EBUILD libvterm-0.0_pre20181126.ebuild 819 BLAKE2B 407c20beaada04be4a5ccf381780f9c4f3003a621f6fef0a300a261e58380a1771ab5448c4cdcfa2492dac558b18a083c5ec10bbb8a27b2ab948d08c72951249 SHA512 929568c1d1c5c56c43c39fb502cc1d08691dae6a6da69c6673baee415d8f17e6f0e7a0296d09d51ccac227d1accae9d147aef24762c665b516cdd154a552be07
 EBUILD libvterm-0.1.1.ebuild 877 BLAKE2B d7ccb94b2b5302528a32d1c5eb9cfd93b55a201059f117e5c07911a5f734e05d3b7a62c4694aec0b1e519c820e550ee65a41a28ae57f96454589477d031595af SHA512 f1a89cd21460683084fe86dfb511897ad60a45eae00f5d5f90b5053876f047fcbc4b8d1e81d1278e0486bf1e856f69c43a0673d5bd94e21b6197d5ebfeb5d85d
 EBUILD libvterm-0.1.2.ebuild 856 BLAKE2B f0280c1a73cab89dc1b306df9f2e690bb7ae4a524af4d1b5ba4bc1dfa12c07b4a777bf08214ce5fc27725e334fbd0dcf1a5d8baaf3e7ab808816caaa18620e7f SHA512 2de243264c74a0cb432b49615aa4400eb64833c502237c8eec95706625ca0b2130a5201a4f97c94b50d93d187ad9d79803e09a796a37100ffc31729249b98fcf
-EBUILD libvterm-0.1.3.ebuild 863 BLAKE2B 0c5bc8575e7e377f452b1c7d9e3ad93493d94e6a235773b5f97e6677bbd768a81759440b8e8e336f1933c2ffee7e7c351c94ecbc5abe5f40bc78e1053bb7ac99 SHA512 62a55f2f314507287739a31030257c07d8e8c74984c3648b2ff9501a8da0e7d1f88c95d33ae64efdb8bdb1dfe23a925589958fc51d650185ac287d3eaa8633f0
+EBUILD libvterm-0.1.3.ebuild 874 BLAKE2B c7950e6791458d4bc90123d20cd9df202552bf906dc86aeafaef30c90f04ddd852740c5dfe8e41e00e08bff76b2d8a93c768cc907c050a5180c8eb78f05cd1c2 SHA512 5dd4c45fa505acedf8be522a01f82bb2d2765f41d69458b56ff63d3412408d7a187f995009d15d7fe669d1c774764541eec9f798583a4957e78f23fd66d7312e
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/dev-libs/libvterm/libvterm-0.1.3.ebuild b/dev-libs/libvterm/libvterm-0.1.3.ebuild
index 6530912e8f74..93b4531f0e54 100644
--- a/dev-libs/libvterm/libvterm-0.1.3.ebuild
+++ b/dev-libs/libvterm/libvterm-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.leonerd.org.uk/code/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~x64-macos"
 
 BDEPEND="
 	dev-lang/perl
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index 0e8c256b8326..11c1da6d0812 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -1,6 +1,6 @@
 AUX libzip-1.7.3-missing-header.patch 1273 BLAKE2B d3ac8bb5f4af6a0f9b80bd93b72122f018f73b2884e97a3ebe770d84e91cd95a2815db541bc3c5fdfec7fe1a368e784f1b47e7a875d7533196b5306f61b585fd SHA512 0c8f8438d2dfc692be78c487f7b48781158611378df6c143509dce6afd7b3b44f3a568acfeefeaf2cab508bc0a4a3dabf50f496c200dbbcb429e12e99dfb0955
 DIST libzip-1.7.3.tar.xz 747372 BLAKE2B c0fbdcd5f5592b0aa828c47b6d90c4c84addfb037cd3280195ab83ebc9d586a6de32d833774175a24e0c6fed55b7d9e47931867721e6e7be7e61d8e5bec2dc9d SHA512 488866348a0c859f6f995c50e956bd51b4105278f07b63fe019cb44ab36c09ef958cc0684fd5444c474d83874b999e8ed1aa9b2da51b74caa37bbe7934b9c870
 DIST libzip-1.8.0.tar.xz 760604 BLAKE2B 7aadbd4df909806ff728f9315f91c2f4b4e884464ef36acd668b23739fa57e4f65987b368cae0d728dd6cc1468718e40086cf0dc21f437a5c2cad91b455c0bb1 SHA512 fe94a26a2797dff7c9b27334f29982f8e523dd5095bf32ebcadc6443726864f0ff7b2e8bf243e52cad8f79297bc7a87d73fdbc35edae4ffc8ab6aa0bcc93b03e
-EBUILD libzip-1.7.3-r1.ebuild 2420 BLAKE2B a2ddb2e1d5ef8c9e15d09bf99914092cd209ecf7123aa61683ddbc6b8dfcd280c5b6bbcb0c8aab8ad07f3e1eeec7c3640033350c8c65c0ff432e016ef754d4fe SHA512 637dc2793f2e54383221bfa2048e0c26df8788e62f9d1f078ecf7cd5a0878cb1bfea67f8e37b6913bf496778c8aa1a90b6ee6c78218eac99358fb9ca731f5957
-EBUILD libzip-1.8.0.ebuild 2361 BLAKE2B def152e6e6bde5bbe9fd78b6ad9a552c5890aa944e28817da2b1be0667e852625a369d2db190e351de094c4afb9f96f846fce2f9c5c2cf7cb9a2ae9688d1c7a3 SHA512 b20271f5aac03fd1388c7695dd62ffe860daf0807b2067cd4e340d63170c4e531e0e3a32f854e30662d04b2cebc78e3ac41636d4422c76b39d01c8a26cb0838c
+EBUILD libzip-1.7.3-r1.ebuild 2419 BLAKE2B ae0fba701fa76463781c39055348fad1c565dcc9fdfeaf293cf7594a2418f7e4af5fa79f428c429ad25968085c4feea8ca3e4f58de42d1d87b62fa07120e281a SHA512 a488325463c8ea8c63c9e41b0a109ffc0af1e655572c4cbe7739431f7098d96fdc2434ac74729cd02fbbbe78c3e28b16e016aac0f1d1e5bbf8c3d2984de6842d
+EBUILD libzip-1.8.0.ebuild 2368 BLAKE2B d60c303dbcfa2545e2ba0318c6bd4e49f8d8dfcdfca485ecb6d7651e38c7cde88b3f0cf1c2d636832a63a4a0217ee84792978ef8882de4a0b23f7cb9e03fe077 SHA512 b9b7457bc944f5fb2d112a7662136bfc7c552e11d148a53bf278f8e07ac735239e0e92bd8a691ff1cf5708ce16568fd583a124fd46d31dac4ac74e700c9ad617
 MISC metadata.xml 509 BLAKE2B e5012e29cc2157f4cd37b19edbdd2da53377f2671574681aff241dcab50e22d39b8db7bce14b7085cf39e4adbe89c486047f3089a9f91fde3411b02de45c8284 SHA512 bfa09ea8c47388786ec4fa938fbb2df96c4d2bf936f1a2a79765bc178ac34a9d69c19a1be53eef743d49548e32ce110f3e4b9776932248624192d4b92b7525f8
diff --git a/dev-libs/libzip/libzip-1.7.3-r1.ebuild b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
index 889bec7371ec..4d7fa7066ed1 100644
--- a/dev-libs/libzip/libzip-1.7.3-r1.ebuild
+++ b/dev-libs/libzip/libzip-1.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/libzip/libzip-1.8.0.ebuild b/dev-libs/libzip/libzip-1.8.0.ebuild
index 858fde7ef4d3..85789584b71f 100644
--- a/dev-libs/libzip/libzip-1.8.0.ebuild
+++ b/dev-libs/libzip/libzip-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gnutls lzma mbedtls ssl static-libs test tools"
 REQUIRED_USE="test? ( tools )"
 
diff --git a/dev-libs/msgpack/Manifest b/dev-libs/msgpack/Manifest
index cb88e93f2528..48f88eb89a73 100644
--- a/dev-libs/msgpack/Manifest
+++ b/dev-libs/msgpack/Manifest
@@ -1,3 +1,3 @@
 DIST msgpack-3.3.0.tar.gz 508001 BLAKE2B 3017c44689f8afbf078b9c498449e21b4e3b87591c50a37bf9ae73869dab550819f24d6e5179a3600df297aa2c024e5a7fe1defcbab7c0f1aff826870de2ab32 SHA512 ad3e32edc8c6afd70282b3d4b493c2ffe74a697c41bd1f39030c5b4752cccefaa965bc049d4c2e63103a210bf714dc3bddd474691bc067d1475ae017593f55e6
-EBUILD msgpack-3.3.0.ebuild 1750 BLAKE2B ec8ce6b3d45b0edfb7925014aad51a13da77d36817ac0a39e48accc24d2204ca9ec4725980a14b0297305739388f73475ba8fbe3346b9fdd64d37398f7691db2 SHA512 f121387110c6182b351f27f225ba8a29ddcc3ff43951e30ea19b4ab1bbc92df554d7d1acc3bc9f5ed6848014b62c5676a232aa6e2a15ec559b183769405972e9
+EBUILD msgpack-3.3.0.ebuild 1761 BLAKE2B 224dfca356b4a9012719919422b9abe375b960cff275795a48837140468e78fe17c1fa4f3cede049ce5b11abf7497df2c2c103c2d35371b6350190d5ec3c2275 SHA512 8e2cebdc9ce702a1dafd429052c8d818d40c722dab0493e2e33b61d41a33fbb5e5e5245993e426351aeac95befed2a4b03b374e54b0e83f0f0d69e5a881fbd46
 MISC metadata.xml 409 BLAKE2B 7656515e9cbf76555dd77ba3350bfc3720d685f061aa2a4c9ef793c7d0eb0dcf327bd707f00a01b0d2be706ec79d62778cf7266998457a62f4291ccb1a5de194 SHA512 f56436ccd3ab6d2d5cf453e4eaeb8e3b79cd8d89a73c1c0ff17c2a47b1802641b20e41d75a12ea161f0a47e0236c84425a02cf8bb16e4b9d5b406fba4d2f1ec1
diff --git a/dev-libs/msgpack/msgpack-3.3.0.ebuild b/dev-libs/msgpack/msgpack-3.3.0.ebuild
index 8d8ed36de2c5..5fcb81a96898 100644
--- a/dev-libs/msgpack/msgpack-3.3.0.ebuild
+++ b/dev-libs/msgpack/msgpack-3.3.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}-c.git"
 else
 	SRC_URI="https://github.com/${PN}/${PN}-c/releases/download/cpp-${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="MessagePack is a binary-based efficient data interchange format"
diff --git a/dev-libs/ocl-icd/Manifest b/dev-libs/ocl-icd/Manifest
index 95d9c24d6f8e..419de224170f 100644
--- a/dev-libs/ocl-icd/Manifest
+++ b/dev-libs/ocl-icd/Manifest
@@ -2,6 +2,6 @@ AUX ocl-icd-2.2.12-gcc-10.patch 1551 BLAKE2B 0a2b6c66e83e67db9ba08af5311da65fc87
 AUX ocl-icd-2.3.0-new-headers.patch 4641 BLAKE2B 0013da2cfbe61cf98f98740055b54f2a3a1afacbf7d8845f0a3f53622e4a5e848d8d5d0be279e4717f29bc8e379affb3508aa2efa1c355c073ca42e883bdeead SHA512 951f1fb715031ebd6b1146b08d34fdc98154435129f8c1fb7b7b01ca33e10fdf2b8651c231fc1f47a41d3dc66c77df29786b3535099b7bbaac2e2b62fa4edc93
 DIST ocl-icd-2.2.12.tar.gz 80718 BLAKE2B 524f9eea9782323eafa2f41858c4970333c029898c651bbf15624331e184d1b439d2259532b02defd67c9ab434a35b1b9a64a28e1515b3f42f09b3a270975df7 SHA512 f1668c3a39ecfbc089ee5a5f61f44ceb86ab80e504e58064dec306ce907daf77936c5403b4af15ed8714068891d68346c86725f285cfbc90c4fcb35d18db4048
 DIST ocl-icd-2.3.0.tar.gz 100848 BLAKE2B b9e5b78df63f4865bb4cb3623fbc6bd336c86b4a9e1f23a29fab1cf11f848cb20d6d8d4a480ff44e442b02d606247a923798143058256ef59c2b16c9daf7098d SHA512 003f3661b7086a7364e79d1058591f12a7095aa2c3decfc4b496f00a0863a91cd81080f33b9308e3948045f8aca5856868ed2725f478654230e51a60d654e613
-EBUILD ocl-icd-2.2.12-r4.ebuild 1245 BLAKE2B 54353b59e3466d5bfc0b4428b77417720e22bf2313ef24db4f3ff4037f5f3752395bcd0bb5aff30213fe15c881856f1922b1184be14e6e8cd272d814d066cddf SHA512 5b2bd8bdcb082456b6f8a11dd8f58a4ee5cfb3748858558c7c9279f06451739ad92f2c7984333f1acdf593bb34813c1bf7c23dd4ad6a2fa884fa873c690dd3fd
+EBUILD ocl-icd-2.2.12-r4.ebuild 1212 BLAKE2B 8b39938a7bc2b83e4e3b04021f2d913d1e894ef8b89b655f93b56009ae0ed05b0e66144a5089d8b38c6f9b0fb6e6fd8bc606504f9cf10ee5c090fd941d8030ac SHA512 c2b9c70e2a62d6b6bc8974813715d1e6754e716d5eef7adb314a5f334d9c7ba748d04de3c25177231b0a74e5afc4c43e549af340633646627268af46eaa9452d
 EBUILD ocl-icd-2.3.0.ebuild 1526 BLAKE2B 05d8c1ca540428b0131a5b09a090a1d2d9c2e18ec6548bcf34f94a32bb159a7a7a4895ed8de8452547690ae4e34cbdf3c10c7fe8e5029be052f6e01cf85da65c SHA512 a430f6108f48c20a0590e84fd94888743daceaa091a716136b6f17d69fb3adb8a363c4963d57247b58af6f929e8caaf63c52ad10a0877f0db328134d37682036
 MISC metadata.xml 396 BLAKE2B e87119ee4f6793c9fa1229c9c2430f8eba749df95522f5f658a6bc26fa22265bdcaa185e8338eef057320342beea263b64f162b2a8ad3c6aa4db73307b949244 SHA512 69effb7af79439eae9702055f6f1e20318f30ef76827e5be6d69ae63ff39a6bafbb177c681f76ac9bdf861a9921d7c897cecaea320d796e6d104dbcab9a24b79
diff --git a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
index d3d2516ba6d3..3cc734b6f736 100644
--- a/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
+++ b/dev-libs/ocl-icd/ocl-icd-2.2.12-r4.ebuild
@@ -19,7 +19,6 @@ IUSE="+khronos-headers"
 
 BDEPEND="${RUBY_DEPS}"
 DEPEND="~dev-util/opencl-headers-2020.06.16"
-DEPEND="dev-util/opencl-headers"
 RDEPEND="${DEPEND}
 	!app-eselect/eselect-opencl
 	!dev-libs/opencl-icd-loader"
diff --git a/dev-libs/protobuf-c/Manifest b/dev-libs/protobuf-c/Manifest
index fbfba415bca8..866ab0a4c13f 100644
--- a/dev-libs/protobuf-c/Manifest
+++ b/dev-libs/protobuf-c/Manifest
@@ -1,4 +1,4 @@
 AUX protobuf-c-1.3.0-no-build-tests.patch 1020 BLAKE2B adda0e4764283d00093709bc97500187521c1d099c6a057513cd4c4ab3b595479f62e7f90bc28ee062f7cae8a760445c78334468f25291320b74d46a5bb454cc SHA512 c6b6f37d8d0fb1ac14e650cc521034267b0af06525249078cc81fc8a3d551dc446bb5285228ca349ce18581979ea88eb9765233154cfbbedd8c4a937987d2684
 DIST protobuf-c-1.3.3.tar.gz 500505 BLAKE2B 6f00eac847f5287cdea5afaea5be05d660eda10b30a14bbab89331ef134f93b8a77d3f6546cab246447494b0283b32218f794c56a7d081906c49668631b14505 SHA512 85308348929487e3a89158c6078dab39cee0b39a0611a4d5ba73d20520e41d96915e42a0d6060ebd3eb7d922c82444f5ca000ea4f8791b37734485cbb7e283b1
-EBUILD protobuf-c-1.3.3.ebuild 977 BLAKE2B eb1ef10b3aef000bb45b85af1659efb7a817e4fd4d8bff0c55fd6620e9ac6dccdb8a16f19c0c8048e3dff66332ca1d698bbede15d4631fb1fe10dd77bc87d0fd SHA512 9d85ad8df7dc4bcb5c89d1fae0d4cd0b669c490746f07d7f65ed2a9915bf5bf9d1340c0124a59a1d342ee90f7c1bab4bd65ac1b71536e5a15d490d9b9899d0f2
+EBUILD protobuf-c-1.3.3.ebuild 984 BLAKE2B c282ba26b201c74f2d32a0218e3ac04d3d1319471c10bfaf3b8efa72ac335317a2b1d93699c8f64f01691138c53b09e621de43dd80d4b56df9365e17d49fee2b SHA512 2d67f3edc2c60e5705c2fcfca275cd49f1c42f60defa443c94e3a2f5cd62e433bcd55fe3a9abe0e57c015b1e65398423ba17fc29f0d735df59f9f342adf9e49b
 MISC metadata.xml 258 BLAKE2B 4600b6e0e51f9c280726dd71ec122d3c51e0c2b1f8b4ef208a1c9838a01d405bedce2cfd6949bb2dbcc448f76f45c717a630eed98fb9d0ad06c91dafdc2ad288 SHA512 92e3b05f2cf1d2ff09b852d2ad8707f55b4cd3fc78df317fa5234a9c0018405cfad67d90211435963983440228dfb75de28ab7ee62f1a80bb97192768d93ce92
diff --git a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
index 9a6f86d79c89..1fb166b0ecf2 100644
--- a/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
+++ b/dev-libs/protobuf-c/protobuf-c-1.3.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${MY_PV}/${MY_P}.tar.
 LICENSE="BSD-2"
 # Subslot == SONAME version
 SLOT="0/1.0.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/protobuf/Manifest b/dev-libs/protobuf/Manifest
index e6b535957a38..5ad8d4a12982 100644
--- a/dev-libs/protobuf/Manifest
+++ b/dev-libs/protobuf/Manifest
@@ -18,6 +18,6 @@ EBUILD protobuf-3.16.0.ebuild 3756 BLAKE2B df0ebf61c08a5dbb4fdeace2bfd04d1fa9929
 EBUILD protobuf-3.17.0.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.1.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
 EBUILD protobuf-3.17.2.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
-EBUILD protobuf-3.17.3.ebuild 3756 BLAKE2B 43fb43c67e6fd5baae33bdc3b70e91f5cf009c230c766f68e918afa414d97395caab697839e4c8a95ee9b56aae8a2016c831e6b38f0dc8d4dc499affb1c4f6f7 SHA512 7daaa2b24463230be1cef9b1d8b8cbe1ed9732c6cbea497bf1be650adcc6bc4ef4133da902851824b1c74432a6b12725516ccb57e9b9f1c70c567a8e2cbe7d3a
+EBUILD protobuf-3.17.3.ebuild 3763 BLAKE2B 5a298b10e9fb72878982a162f76f78cd958adca0dd8af7f4eafa6c7814b3564a11110aba7345f6a167a196a8f54b1f793bc0622d63ee34c58e220ac84322c927 SHA512 4859760a2d4bfe3b3d01d616c462bc50dcaf431f0f3dcd9f11717e10a77f78d5383b264e5ac5d1cb3e46d9694204490ff09590132b30b1dccfb46363cfe05450
 EBUILD protobuf-9999.ebuild 2672 BLAKE2B 194e9d88477eb97f57cb544d733c61661bcd2fbcdb9cd1c1353ba1b9fd1c22de8e3ea291cd5f9bfbdac939afa316c6ca2888a2fc790d5f1113a2c416d9f3a3ed SHA512 c55a151753fe1b845d5566999064640fb3ccea13c222b37e4563eeaa8c09788ee74bb89407f4d68d17288d40ae0fd5761ad556989e8d2803c9317c7626ad24e4
 MISC metadata.xml 622 BLAKE2B 9495a95dc28c0fcc48d67767758234b28d4c22956defcd4afdf1b418a15c5e150ed025a3766ac9bd22668f24f9359d01322b32843b2b2e76aab64615db266548 SHA512 3f70b0df1e188b61fbd994a6787ebd0cb38c73d500939f19263837b12a7741073f086ecf7ba09dc08c284547b864c8e26df85d3c39fd92723c0fb145abd7131d
diff --git a/dev-libs/protobuf/protobuf-3.17.3.ebuild b/dev-libs/protobuf/protobuf-3.17.3.ebuild
index 6391fd499f34..85c77d0ccf7f 100644
--- a/dev-libs/protobuf/protobuf-3.17.3.ebuild
+++ b/dev-libs/protobuf/protobuf-3.17.3.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="emacs examples static-libs test zlib"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/re2/Manifest b/dev-libs/re2/Manifest
index b1404bd2084f..c15abb3646ba 100644
--- a/dev-libs/re2/Manifest
+++ b/dev-libs/re2/Manifest
@@ -1,5 +1,5 @@
 DIST re2-2021-04-01.tar.gz 403354 BLAKE2B a0c387d8e9898a82772718a7cfbd0520aa70359ec71e5359aa8f525fc258853562fd2940cb2db5be635c6a04f9b0235007447325f22938ed232632f55d20b459 SHA512 0cc3b1522cd3fcce0a277e89d9530b45fb0d7bc0a3d3b214d3b173cdc7b42d8a816a46a9721821f3dfbba8ca1e1aec7348174ebfaaecc0e0b121c2b9734dabda
 DIST re2-2021-06-01.tar.gz 403726 BLAKE2B 1919cc564f84073198062dace3c390b14acdea8b6be7b87d7f7548655dc6194b8fd5f0cd27567297ce80ba69b0b5a6bb824a2b9382ef2bd60d3c40bc4e3f412b SHA512 cf18a9b437d07046294ada992693c5af7c560c36a3435e525a36ef542f352d33627fff8903434063795cd124f7e5c0e30ca7eadda847a0fd9f7d97ca207d4b42
 EBUILD re2-0.2021.04.01.ebuild 1345 BLAKE2B 895b1d92d1ed990d5cdc63041fe39e2fe3bd10cb7247e28a6461af5c170ea2215f5ffbd8dda0812443379de0f2131d5da2032a33240a3f210a72184b0f9c53bf SHA512 3f65ba7cb020840448c228a03973a387cbc282fb8e605f274321d7e60774dcf33d8e76e854eee9e1e716a428e89c49a748ec8a5b9673f1e605f9d08e1a5e86bd
-EBUILD re2-0.2021.06.01.ebuild 1349 BLAKE2B bb43d0cbb31d5fd53a7ad74aefc1c89f1e9a26210ffd8c1682a3673e37f089fa8139d01d6e405b64e826347e7d6328ab3b2e9b9f2b6c0b4dfefe62d30b8f293e SHA512 8bc0269e5c30814ac574a966730e6ad926a5d43b4c28e9e5bc8fee96ebfa82c48f2665ce148105ed4b2b415e2d1a1169048dff99011c40a4b35a687a66360aea
+EBUILD re2-0.2021.06.01.ebuild 1356 BLAKE2B b32e1a35a9f775c330b7f43b5787e6381ee5eb5bd67287034d8d574510fa626ec9390fe536265bcdbbb58da1195da963432bf062616413cd0df88d7bb764dd62 SHA512 eb9e1cf9f22f47fcaac9cef7ffc3732b082d004c7aa49704dca92ec0fb2aa1b2ddf8e9c902fa0b0b319fbd158f9092c09105458081d45add816fe78765efc490
 MISC metadata.xml 485 BLAKE2B 5756cf5940e71ba48d57e321d30966e7b830c45f113a3bb415619c1d573f3c29dc4b02b5471b81906747ef655400e1bbe97cfadaa5d81c97937600ce087167c6 SHA512 0a2acd427b366f5304daf4ab8293d55d7e9d2f95aab034be5ac6c1e2f02d2ed349167eafed5bd89d1c07899f6ae42240479b4c77f6428c30ec6e40458cd9ab3c
diff --git a/dev-libs/re2/re2-0.2021.06.01.ebuild b/dev-libs/re2/re2-0.2021.06.01.ebuild
index 383b552b2a85..61b3fb2cef81 100644
--- a/dev-libs/re2/re2-0.2021.06.01.ebuild
+++ b/dev-libs/re2/re2-0.2021.06.01.ebuild
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # https://abi-laboratory.pro/tracker/timeline/re2/
 SONAME="9"
 SLOT="0/${SONAME}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="icu"
 
 BDEPEND="icu? ( virtual/pkgconfig )"
diff --git a/dev-libs/rocclr/Manifest b/dev-libs/rocclr/Manifest
index 0a010dfd7a25..3866c36cb0fb 100644
--- a/dev-libs/rocclr/Manifest
+++ b/dev-libs/rocclr/Manifest
@@ -4,14 +4,17 @@ DIST rocclr-3.8.0.tar.gz 882055 BLAKE2B 12b62d2316f3f2886f656c8fcca946735e262e85
 DIST rocclr-3.9.0.tar.gz 811081 BLAKE2B 7c3131adcc820a7f331ddd178cd06eb8f3a22dfc85e9634906e60d7cd1b5b1ac3f0ac0327a815139901c8e2d40f74e8b7c84c761a2aecb2c63812559528ebf13 SHA512 211bc0e8008cdaeabe9e9d51f22d939f4f9703d546e6602e59286027c439ee996c44f805154bb31bedc4916ef810e4cffd9b91f054baa76db4a8945b03b07a73
 DIST rocclr-4.0.0.tar.gz 813510 BLAKE2B b9043c6f2725bd8d1769669db522cfa8ece40d83f36dc0e79662137b285a6e89952693d55e5b241144aa7412fa31192c3aafa74ee8d498f02f9a0cffaec7de92 SHA512 81e64af843720efefd24478f65c2a8d9dafc55eb94e9c4865d7fc3e9fa15371570ed54882e3086dcb20f16487bf24bdde0d65c76c07195d854ed51895aad06b8
 DIST rocclr-4.1.0.tar.gz 823082 BLAKE2B 69631f72124d8c7888576963b964b7971304593c1a231f6ea69940ff818b095676e1fef030efcddc4dc89c5e3768413e8e4832a0a95424a042b8df73d0b059e3 SHA512 1c82399d3eda8ebd11609272e756e45565a8c1ebb1354ecf44cf443bfc38a61af9210c6609d346d464e977407f07363da36e8c5ab89faeba3e11bfdc78bc32b3
+DIST rocclr-4.2.0.tar.gz 836337 BLAKE2B 8eefe1db6e16b90ff64069159698a1d4960c6436a9a11ac84a890d572faae6583b998af100f168ce8bb06b0c8094d01c446874edc75de93c7d3b55f8329cbd71 SHA512 33cc61e2f179805567d38b606489394a67f5d43a2cab92baddc14e44992379e3a5a0226e84c6ec6eda59ccbaf999b5d27c52b9da106d0e08fa6d26c38c0885c0
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
 DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
 DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
+DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
 EBUILD rocclr-3.10.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.8.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-3.9.0.ebuild 1156 BLAKE2B 00c2319289cf1420c80b5d99b630684593923a06dad0f5fe5fb01159894c1c13125db7209c9faece2a3be1ba23a8f0c0a8cd68d946f0f381f56d44feff789b2a SHA512 2890acf4b6dba35e3b273ad421866b47ed2c941c9c14a847b7c7bcf5293d706bd5ead6980f4a2d2f04e4ae0b83900079512402557c39c536e4e706bb2c13ad4b
 EBUILD rocclr-4.0.0.ebuild 1167 BLAKE2B 002e3d86ec49df944af061baa1a8489fad32e3dbb38a7638bf1530752a3f4c807a2b715a5796676d38c642571d777322981c782561222ad74506030d1328025f SHA512 bb4b7fa615e930fea24d233258b5a6822ae5e23d3a0ce6605d37dd489090ec0c7a5821bd12b8aea2a8615de5c8ccee0ec306287f39b049a912e23bcf8fcc90fb
 EBUILD rocclr-4.1.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
+EBUILD rocclr-4.2.0.ebuild 1156 BLAKE2B 0d5f9a4fa0a4dcf53be260c2dce9f1e560b38e44369f4b9395b9e2a48e746317826b7176666f9bd0b423a582a0ecb82fbb79168d6d3f263ad47306c8ea9db328 SHA512 d54d34e13ba0f2990ae2ac2144c2fac19b06f3b683711e0729194d8374f612bc7652af94231dbdece5dd83531e57ea706a1cfe0a063621229442aca2d33f8ed0
 MISC metadata.xml 511 BLAKE2B d2b374303172e793b16f6cb1dcd569e4f112ed2a2396f8ee85d053411b31688c2fac0c20ddf43205ad04aa36f910edcbc0de57b4e972615953b22e2475b3fd7e SHA512 349b4d3a8bc6414c5d015f8f50d4b09869e04dc67fe8317644cb148752dcdb767beb2d0eb18dc83bb50e9927e81fcbd1e43134e9a0ded14fd16bc109c8518365
diff --git a/dev-libs/rocclr/rocclr-4.2.0.ebuild b/dev-libs/rocclr/rocclr-4.2.0.ebuild
new file mode 100644
index 000000000000..46dfd99646dc
--- /dev/null
+++ b/dev-libs/rocclr/rocclr-4.2.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Radeon Open Compute Common Language Runtime"
+HOMEPAGE="https://github.com/ROCm-Developer-Tools/ROCclr"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}
+	>=dev-libs/rocm-comgr-${PV}
+	virtual/opengl
+	>=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/rocclr-3.7.0-cmake-install-destination.patch"
+)
+
+S="${WORKDIR}/ROCclr-rocm-${PV}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=YES
+		-DOPENCL_DIR="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+		-DCMAKE_INSTALL_PREFIX="/usr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# This should be fixed in the CMakeLists.txt
+	sed -e "s:${BUILD_DIR}:${EPREFIX}/usr:" -i "${D}/usr/lib/cmake/rocclr/ROCclrConfig.cmake" || die
+}
diff --git a/dev-libs/rocm-comgr/Manifest b/dev-libs/rocm-comgr/Manifest
index 57256aa0ce71..1d429de4499a 100644
--- a/dev-libs/rocm-comgr/Manifest
+++ b/dev-libs/rocm-comgr/Manifest
@@ -3,8 +3,10 @@ DIST rocm-comgr-3.10.0.tar.gz 98322 BLAKE2B a7245531eb7e5e7a306a91ca917f03b25a15
 DIST rocm-comgr-3.9.0.tar.gz 98316 BLAKE2B 424ff5152d99b1ea001985fbd9a6ca1a0925931579205b487505a6c3733d95fe4ee21d91453c538995b3696984acdf4d45cc77c43e1a7c75db78ad1164e3f9e6 SHA512 f49c91ba0db244a0f0d820edeb60013c8a09220e9e1a6be464c48766ac3322b18ed1d0f009e5b1df58340a6dd324a75717194696214e2bb7455cb85e516f071a
 DIST rocm-comgr-4.0.0.tar.gz 98316 BLAKE2B d96200d2fe8929631d1f40577a115b72e2341a66941e9de9de2e61c3d9eab9cb4a0cb51f3b2abc183be832ee86404b5f24d053396615038f4ca6bda23a7331d5 SHA512 fdbb334ff1cb2cd5eb40b9dcf1bbcb138b95d24fac80a90c12c9b5b2ac24226eed4f30ac2fa1923c274fae830e52542d5725436a77c404d1680266b103444549
 DIST rocm-comgr-4.1.0.tar.gz 101923 BLAKE2B 227317d3c96d577ff2df352721e3ffcf75e25548bfef29c425a3417af2b6fdbceeb80bc86508a9a510e9eb7f4dd2ff5c6da3c13af122dfb0dff6475d73a5c9ff SHA512 def3774072262ac6e5c836d7dcd23770045765882e76c8de87e21d04515a562ba213685736ccb4e5b01814de846b68aa9db77e40f0d834a68fc4a9b3301aaff9
+DIST rocm-comgr-4.2.0.tar.gz 101877 BLAKE2B 6796ab4fc7139224af9e26f6adc5ac3ef260b36d125517766bc4adf3dd819709e5aa816680ae073f00db635d15d2a3bde7bfc69bdfbea0f49453f75930fae90d SHA512 dffc00d166eb060c6cf848878cc6c7fc63858168cd20b5f22df2b7cbf3ac7a3253fbab5df4df055823028a06c3dca3e3f379246305ae9872eb94bcdbd30dd602
 EBUILD rocm-comgr-3.10.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-3.9.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-4.0.0.ebuild 1071 BLAKE2B ef1d2f0cce59048be48ac0b312dce8b7fbcd458133cb8d3bd5d9266d91117926760bba9baa6b1a86e2d894a41b83defee0f4b363a28436a739d7ba481fbd2904 SHA512 19351ad8d2202c7a180b29070d922d1f0305ce223aaa392ffa4419537fca181fe2084f6b5c377c94c8a14ab2f17ce7180d3f3004b76c9bd8c00b227d5f688ca7
 EBUILD rocm-comgr-4.1.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
+EBUILD rocm-comgr-4.2.0.ebuild 1071 BLAKE2B 4282f0fb3617b28a387e0446764478677fe929a71e1d99145bcf5df4058e018f9cf9abb2a8f4f68dc655a14c4bc81c58a19b2a39b9244f34c6c5f19c499ff7e2 SHA512 79ad997d3e711d111501efe7c276d11c9304cf4ab3c5d1bdf9f5919e2c282f5241c3f8b74207c05acdea70f522d1fb195f3650f5a244d0780f1c2465ad7939b6
 MISC metadata.xml 381 BLAKE2B 4b222ab97a88e12838ec3e04cf9934f75ced11c57f28d2eb59ab5eb130a63374ab8a6558e969b817ee7c21334de7bd4defc0c47774f71ba511e4b8c05969bc3c SHA512 b35903137fd3eb2a8a23143c2d41c586d086d34bb5611b65a46da4d22719055e918115885be7efae2b7c25d4caee024eccd4472d8b3011e0231ce707e49c530f
diff --git a/dev-libs/rocm-comgr/rocm-comgr-4.2.0.ebuild b/dev-libs/rocm-comgr/rocm-comgr-4.2.0.ebuild
new file mode 100644
index 000000000000..5b3f588b3d54
--- /dev/null
+++ b/dev-libs/rocm-comgr/rocm-comgr-4.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/lib/comgr"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-CompilerSupport-rocm-${PV}/lib/comgr"
+	KEYWORDS="~amd64"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-dependencies.patch"
+)
+
+DESCRIPTION="Radeon Open Compute Code Object Manager"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-CompilerSupport"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocm-device-libs-${PV}
+	>=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLD_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/lld"
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+		-DClang_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/clang"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-device-libs/Manifest b/dev-libs/rocm-device-libs/Manifest
index 3022088d7429..523e2b2ab1a3 100644
--- a/dev-libs/rocm-device-libs/Manifest
+++ b/dev-libs/rocm-device-libs/Manifest
@@ -4,11 +4,13 @@ DIST rocm-device-libs-3.8.0.tar.gz 228737 BLAKE2B bf75c3f50960af55cc743d41225978
 DIST rocm-device-libs-3.9.0.tar.gz 230477 BLAKE2B dba7f2dd57fe39c8c69f2a4de34f06f8347e73c760805cebf8690b11c5c0b4c919d78bc31b05b5d5f283aa5281131b0f7d3fbe9faef525a3117ebdbd4b1b9b35 SHA512 fff70e9426ff2e6b6cf59554c36831b3c24c24a51753ca0f3c9cb4e9961c24e7e7d7714b2e75785622c6dcff92e1cb7fa5d2be0a2a08bb17a157f484845cd276
 DIST rocm-device-libs-4.0.0.tar.gz 230486 BLAKE2B 17d82a29e03d558a408e39550acd9f7fc76fd79a0c68936cb76e3e14bae6e770c0f581a80429aaa86e1d51491c31ce8b02b03095604678d03aa844379cfa9282 SHA512 a35fdc74c17d87ae52ccc218d5098b50863316b88908c147017c3d378c3892411a3f51737c1d5a4d6c1db87b66e1aacc94361bee28f3cc2e984e6e00db1dd7ed
 DIST rocm-device-libs-4.1.0.tar.gz 230813 BLAKE2B 699c23f3b08989765e90d3168e1369d1bf627a51c1f606160e29867718ce237a78ed7b5859ab60b58bbe9790452e75192fb9407819f25cceffc2af94aa006582 SHA512 b4d7ec17711345de27daae7a0d9fc4bce7a5501cfdade51da41788d1a015a4688d47e60031317b2bcc6c395bb096b2cbd4ba35a07b62cc07fe4779ec531208ec
+DIST rocm-device-libs-4.2.0.tar.gz 231971 BLAKE2B 292798ec29b6feb268928a41d7a321b9cffeb2e624557fc4c04b9fa48347a29838f53217b3006b52db53db0981d87b8cc4df6d95578c17d8d10b00b24211d773 SHA512 78aa285f97916ad68aa6108fea22b2c5f223c0c36fd631a4c8f565cf3eb26c0ad58ea31b5e700369a8b13a86f1c076e6cfdb829952cdf03c88a7827c14371aeb
 EBUILD rocm-device-libs-3.10.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-3.7.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.8.0.ebuild 789 BLAKE2B 780c18e28c86fd1cda12a03d890eacc4e2410fab59cd19b80339a38726e8c62d97474ac8d8a145860e85b89ffbfbdbe316cf880a547ed44d912f633d92317122 SHA512 f0759b90c775788da7bb53be3ebc2bafbfe1d7d50b0a8737d3f7b58eb03cff879c325ae25ce9e91c64d182acd209d6c6ea0e57d301b739a5625e851966dcdef7
 EBUILD rocm-device-libs-3.9.0-r1.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-4.0.0.ebuild 992 BLAKE2B 69f88d0cca4b3bd54be1d9d97eef7941b2892d6301f83f52810474406c951dca13108ea1f63738d901eaf7d0ac701ac18315e57cd73bb73100a189206a02654f SHA512 bc21b9ae816795ab076fc763a7d7a62e1d0cc2902317a6afbb60f5058c02d0590dcf8577ea64c92ffe64b055d356653ad6045d8448ecb5c59a01f5053fb4f44c
 EBUILD rocm-device-libs-4.1.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
+EBUILD rocm-device-libs-4.2.0.ebuild 992 BLAKE2B 02897f1fdd8427b3ae26202b9b28f7ed029ae387a2c1e1c620eb723d839ca6fdd09f4cb869712e67302c248ffe7948960b7c3d74b636d9b2a45714b7a1182462 SHA512 0f8da526d5577a466b47e7dec0f29b2c9592884e83b2c7ed2b51a3ca241dff06142e6ab768eba1c886403889eebcaeff8743a0d7c4cb79f4c9018887f90b8e9f
 EBUILD rocm-device-libs-9999.ebuild 804 BLAKE2B 89a47136834feb8bebd6487d0fdc7ba0ca921764f01938812959bd6a006df704524acc14ccdb67a7d08bd032403837bfad358c5837bf4e6e8957293c3b159d72 SHA512 e76d6647cf9ecf6beebb15541503955cd469c50f39c462e1c45be51d87072cbff603fddc9979ad795ad5ec746d625485e24eb751d41610522fbefd8aad64496a
 MISC metadata.xml 377 BLAKE2B 70c60c2403ccd85e0aa3ddf762f7b7ac4e4c3f605b02007ec524afec9300c59927916f0169ad9e181bd4ea7491207ee8becde6320663bc5426b255da1941afeb SHA512 8f7ed414a90f2aaf8cf04368c24dc3b1f8360cedbc7474aa1249c29784c6dc8ad350cf47e717ee8c7662f129b8807c627bf825a5ebe8415d665a5bfe8ef15b85
diff --git a/dev-libs/rocm-device-libs/rocm-device-libs-4.2.0.ebuild b/dev-libs/rocm-device-libs/rocm-device-libs-4.2.0.ebuild
new file mode 100644
index 000000000000..94bddf83d919
--- /dev/null
+++ b/dev-libs/rocm-device-libs/rocm-device-libs-4.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCm-Device-Libs-rocm-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Device Libraries"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-Device-Libs"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=sys-devel/llvm-roc-${PV}:="
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/OCL.cmake" || die
+	sed -e "s:amdgcn/bitcode:lib/amdgcn/bitcode:" -i "${S}/cmake/Packages.cmake" || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLVM_DIR="${EPREFIX}/usr/lib/llvm/roc/lib/cmake/llvm"
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 915b098b4dfb..d97c4b2e205d 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -9,9 +9,11 @@ DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
 DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a5609dd4c0d475ba5fd6278a6c201e1ac72867a587d1ac6fa7d7a18a29ab708dd14b24abddd1326e1489e6aaa82d4b26be5f2f5 SHA512 913a135d693c133e17e6b3abaecac46a4fbeb5683ed7cf04060e04bec5f37d4ba5dd5ff4b357b8304142346dbde8acd3ddfdc1028f788550e0ca245f7ce665ea
 DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
+DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
 EBUILD rocm-opencl-runtime-3.10.0.ebuild 1991 BLAKE2B 02a1c528bf0e7f6af7859fa2d61c9902401ccc7f669fa2f1cf4fd0fc34c754dc75ae900ccb495f583f464030628617c14ee0c5179fefdbf77ce66a7544523de5 SHA512 bcf6e76c6fa5627d8f6db89221bf3cd6502207a85f742a0cdc0fd72564f8943c44c80debe7fdefb1587cf5ba18c824facddf4f01733fc3d515f06965be0e825a
 EBUILD rocm-opencl-runtime-3.8.0.ebuild 1990 BLAKE2B cc2505fab0d3b8c7f3cb811830adc6e5c29a6c936bd285fe4efdd2aa7ca23270835776e83fd779bbb38fdd12a58c325c6f77fa4da11bb1bdb658ff01c7d85421 SHA512 128038aae836ee3ac0835b479a1268d3a261f575a127e0c0f515d78c50c900856d37353f46e90e320202bbf5917c8380e1551b09cccb6259840eebbfc069d114
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1990 BLAKE2B ae0db60899859a06173de28df69df907a874e26e83961fe35773b5fe09fa9edf55ccf079da04cb014d422622185fcd4c3dfb1d9f6a76219c69b9443c7ebb42bf SHA512 a269a7dd54e293f331a79866d2de78e0778ffb8ce58206d335fe275b4cb8af31b65d909363463b0927d3c2356b172bd8ee952af36baf704cb80d1aee71516072
 EBUILD rocm-opencl-runtime-4.0.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
 EBUILD rocm-opencl-runtime-4.1.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
+EBUILD rocm-opencl-runtime-4.2.0.ebuild 1755 BLAKE2B 2c288100c3bae5b57548338a395185157d5b7ffe4529fb77ac2b8f4046747a8cf97cdfc9b90bdab9d3a91caca9833dbb016e3be773fa4265fd37fb49367a6ad5 SHA512 b2f6d2034da7e59d4d2ca20abb6d98049fd5de17441c1f1bed96bb7be164bbef672c525c02a0fe00b89205cd5d4eb43b0bacf9da9e0bd12ac00b30091cc877c1
 MISC metadata.xml 380 BLAKE2B ead1a4d03ea8079057819764408b0d70da70bfa15b374f448f82ff90dc31067d9dfd2a7f888bdfc72a331e2c35b606dde55dde89215f7d52fef8e73740b3ca68 SHA512 1dda9d4be917efcf0b0d447b5f6a2a1ac5f6815699269e0ff6cc0763f286a32dc6180a7a844be0534847511f847afbf12ee5c249f4dd0976f773107ec46859f7
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
new file mode 100644
index 000000000000..d3a5d3f5ef89
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.2.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocclr-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}
+	dev-lang/ocaml
+	dev-ml/findlib"
+BDEPEND=">=dev-util/rocm-cmake-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7.0-change-install-location.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+	"${FILESDIR}/${PN}-3.10.0-add-rocclr-include-directories.patch"
+	"${FILESDIR}/${PN}-3.7.0-amdocl64icd.patch"
+)
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
+}
+
+src_configure() {
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	local mycmakeargs=(
+		-DUSE_COMGR_LIBRARY=yes
+		-DROCclr_DIR="${EPREFIX}/usr/include/rocclr"
+		-DLIBROCclr_STATIC_DIR="${EPREFIX}/usr/lib/cmake/rocclr"
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cd "${BUILD_DIR}" || die
+	insinto /etc/OpenCL/vendors
+	doins amdocl64.icd
+	insinto /usr/lib64
+	doins lib/libamdocl64.so
+}
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index f98c10711564..d1c9bc6d77b6 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -5,10 +5,12 @@ DIST rocr-runtime-3.8.0.tar.gz 691209 BLAKE2B 0664b099a7ea4105e37cf42ee208c31dc5
 DIST rocr-runtime-3.9.0.tar.gz 691645 BLAKE2B c90cdba93be510532a65ebfd69322972c61603b23932b95982d9a2bea742979b14acd83728a37ecacd7ec540268311bd313801acece89ec02a234dee66155dbe SHA512 e117536300ad05db27ccd92d2f9fadbdb9711fc724953ef65609c7af1ef369b8cf132c8b0f72d33e7ffd43acc3e59dc5525bacaa1507fd01fab79685f6b8d86e
 DIST rocr-runtime-4.0.0.tar.gz 691835 BLAKE2B 328f7ea54767294036f435894d63354694447d964753de8b58b70ba5ae5f83561e5cda506890b43c80bdc480b1781d246ee77d5a0b08f74c5eb52d1ac5e8ddda SHA512 c95316cd8f221caee84f644e00b2b08d447b75ae4e5fe1871fa2ac6a879da57def497babfcabcaeb988d92421c165070e47d9fe846640b871249d66c82f82bea
 DIST rocr-runtime-4.1.0.tar.gz 698452 BLAKE2B fb1ca1219d2c59db4d8bff414f40eaf6e7cec899a70ed930ce3dc6e2906a173db4823ac4c445fc57cc297a932f83b140747e35ee3d77fa0ed11cec97718fdc47 SHA512 d2162f431adf0b8f8ae5bbfe43ed389d4d94db5897fc8d1b4eb9b152a74f605fa2cf5d80175e6f9cda45e39803ededef6151aa9bdea99f38a16ca2dea29588d9
+DIST rocr-runtime-4.2.0.tar.gz 701445 BLAKE2B 901c256bae823861813a7afdbd3e9f80b6f86cf2c7002815e04c762cef241a9f32274093067c97578e05fdf5c4e699287b7835d00917cb4997302c455e5d593a SHA512 44a798efd0121c7107f3f5df868eb83d0ff9aad1e11c01105d5852bef159c019db6d2aeebe02e8e187dc45a2542d72f145fb5390b27abf64e0b427e192772d6c
 EBUILD rocr-runtime-3.10.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
 EBUILD rocr-runtime-3.8.0.ebuild 1494 BLAKE2B 559ea5454433cf167cb1da2369700ace96729b1b4648f729e251b7e8f41368775766f0c2c288e986af26a5eb2655a9c35115497e8bf3e08e247c2237bca9556a SHA512 32986094590e367f61dc70a2be74716c81a95c03ee063f37321b9b579c5adcc72e1ebbdd71d1b23d6dc6e83a617d2d1ba6d0f3c0e65e6247414d8e7a0208cbea
 EBUILD rocr-runtime-3.9.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
 EBUILD rocr-runtime-4.0.0.ebuild 1510 BLAKE2B 196532ca9cb64ff2963ab08f06884eeb37b61fa5e209e12caba4ee4e2f1497795a8c73078ba8d482b438e7c06d1cf20b41797d218d2c3799bb10037aaaa54419 SHA512 d0c778bb535ac890f87914752fc4f3cee93e915e567c4bd7226bcc6c999293c7fbec89209458384330f33e3e7738dabdd495b27f4789666010c211c48bfe3387
 EBUILD rocr-runtime-4.1.0.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
+EBUILD rocr-runtime-4.2.0.ebuild 1482 BLAKE2B cc7b4573bcb3ed92b5d3c18907c55abee17fe9aa0571bbb5733ec07ca1d91d9b6afdd325f69eca968b38bd1b63fb02d636fc61e1e807450a34d4262f089eb046 SHA512 2474db935890445aaa02edcd5a236cb2bc3cfa7cd85a08397676c6c68c6555e34d8edae070ef07426b12a7058376bcdb32d6498b31ee0a0d8e89338d06d4cf6b
 EBUILD rocr-runtime-9999.ebuild 1628 BLAKE2B 16ac148adea537c587db359add7d324183b6ec4039f59d1c81905db332d37a225e84e5cd0f7b370f994637eda0698535263e61d3ff62896f5c232e7fc1d11e95 SHA512 2cd282faa8ef6417029ff002d75ac2c7fcff602239b82246496daaeb587b663399ec9e4250ed3f5dd922318f1ff83aa36448e3481766661602a3ac283494a199
 MISC metadata.xml 514 BLAKE2B 1f7548f78a4a22f8bcef72db68b93aa472b3b72377ac99f087325d7867f6276f9f03ab868cc6e3a2cffceca1ec77f9cfed0f4764955d6f45c04b2a6c50a539cf SHA512 4bdb670aabaff9f29a87129efce22ee5ab23c78c1b1e16534afefd4101e1eaa9338d9319b3b326bc6a7ba7f6e3b54f8eb576284306a0105fc0faedd18a5a5789
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
new file mode 100644
index 000000000000..75444f1b60de
--- /dev/null
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/"
+	inherit git-r3
+	S="${WORKDIR}/${P}/src"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCR-Runtime-rocm-${PV}/src"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
+PATCHES=(
+	"${FILESDIR}/${PN}-4.1.0-cmake-install-paths.patch"
+)
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+COMMON_DEPEND="sys-process/numactl
+	dev-libs/elfutils:="
+RDEPEND="${COMMON_DEPEND}"
+DEPEND="${COMMON_DEPEND}
+	>=dev-libs/roct-thunk-interface-${PV}
+	>=dev-libs/rocm-device-libs-${PV}"
+BDEPEND="app-editors/vim-core"
+	# vim-core is needed for "xxd"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+
+	# ... otherwise system llvm/clang is used ...
+	sed -e "s:find_package(Clang REQUIRED HINTS \${CMAKE_INSTALL_PREFIX}/llvm \${CMAKE_PREFIX_PATH}/llvm PATHS /opt/rocm/llvm ):find_package(Clang REQUIRED HINTS /usr/lib/llvm/roc ):" -i image/blit_src/CMakeLists.txt || die
+
+	# Gentoo installs "*.bc" to "/usr/lib" instead of a "[path]/bitcode" directory ...
+	sed -e "s:/opt/rocm/amdgcn/bitcode:/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 0d3730737496..cd62a8ca5278 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -1,6 +1,8 @@
+AUX spdlog-1.8.5-libfmt-8-fix.patch 483 BLAKE2B f0412cf6755ee0a73ec444e5d9bf614e8367f2c71e490af83ee321a242e3eaaed15b77b5da91858a8f90b02cfc1baa43fd89d8472be2d187640fddcfe5f5b6bc SHA512 08c2e0a639eba9b13ef01400d9cf538afc2dc10981b52064e811d89f49c861d29bff12fdb948215581f39a2e868353d478b5c24df8760f3f5d49c50355ff32da
 DIST spdlog-1.8.2.tar.gz 319010 BLAKE2B a17ac7691c74600e435cff9d45495a7f7e8ae5439400a9f0b02c3891daca232aa57b25ba6d619ce19d50bf053b28454a7e4f205ed439ca4345dd044390512a29 SHA512 7a0a2353a10187cc314253b366fc46be8f9fe2480d2cbac3a96a8e6825ee4b62b0a5ebb3add2b22b5d7ca8fe6dddd963926603e5296e3431c0a4f7ac42beda7f
 DIST spdlog-1.8.5.tar.gz 321229 BLAKE2B 2cdc1902a9e6f51da5c1af02b2961914a5437cfefec13aaaca8b996166c0990f602c811f69569a8812d880f995b401af44457ec4255bc5a0f9e46b51266d1b43 SHA512 77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c
 EBUILD spdlog-1.8.2.ebuild 937 BLAKE2B a9db146ab6298a6e26f4766688f44698c0481d92fbbbe4dc55d8fa3e9d49f1daa0e8700f57aef54a1058b12a54f4d2e3c1aa043aa564ea40dd341e736c65cc8d SHA512 00b74e07d570faab50f7ddd15b974eeb555da6bd497872d1b29befc141d7c6bb19f31557def0dd45f7d79c11f56a4e6adb71666c3d75b85627013b766b6437de
+EBUILD spdlog-1.8.5-r1.ebuild 994 BLAKE2B 6ef1bcad152f806226fb961fa9b104b1b6eefa6125d32e417fea3897e6d956f4c8db9285f5af0e09fd496015cce771beee8477f5ee53937e19eb2102c3a921cc SHA512 1b2f31d7a7e3318426d6d40a74979bb089ac37a087e213cfa999642166d959e0b50f97acaec467a3991a174dc52253170e27e26164a70e7f005604f6f206afd1
 EBUILD spdlog-1.8.5.ebuild 943 BLAKE2B a71c7a4086fcd802596747a90a598d9c5007c42fbe0fb350217f8695a4f591b254e4108d93ebfe412ffd60586b0e03021eb15c58aadafea889302347899ead5e SHA512 b8a1ea0a002c2e66fe9617d8779c3df8f69820e9380275c91292e2d86a38cdbdcb74a84f411e08997542faa785e17d4727b06a3f5b46bb14f93b6c7e9d4ac43a
 EBUILD spdlog-9999.ebuild 943 BLAKE2B c06210194d790813f2c9abcdcabcadcb0366311e0a99e5634ff77ed653aae9652cb043dbcbca81c5f99cada5c37822600b33b6cf6eabda365cd109b6f5265718 SHA512 04d53a75a7b52fffa42ed967d3ab857c27a3469d56033f3c179aee3fb8bc1d7850265371ea28a22c424082d9e59ecc5637a3d909e7388f3fb49230e0d62d5637
 MISC metadata.xml 474 BLAKE2B c66a689b156ede0e146807626045108496b9557afe1c24992f3314d1eba04beeb47e3048286df4c0a029410bd19892eb963910f3a505e3b609010a76a48bf223 SHA512 41ad4b9ee9d6803838d1f090616c4d6d2ecd754c62d6f271815aa77bf157366b659c2c78233a912d0b92dc372ff123b96ea77a6db37660b09783f6c5c2f02f61
diff --git a/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
new file mode 100644
index 000000000000..f59a9bca4b30
--- /dev/null
+++ b/dev-libs/spdlog/files/spdlog-1.8.5-libfmt-8-fix.patch
@@ -0,0 +1,13 @@
+See upstream https://github.com/gabime/spdlog/issues/1975
+
+--- a/include/spdlog/common-inl.h	2021-06-21 17:15:26.695992698 -0600
++++ b/include/spdlog/common-inl.h	2021-06-21 17:15:52.205992496 -0600
+@@ -60,7 +60,7 @@
+ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno)
+ {
+     memory_buf_t outbuf;
+-    fmt::format_system_error(outbuf, last_errno, msg);
++    fmt::format_system_error(outbuf, last_errno, msg.c_str());
+     msg_ = fmt::to_string(outbuf);
+ }
+ 
diff --git a/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
new file mode 100644
index 000000000000..26e7cb42bce4
--- /dev/null
+++ b/dev-libs/spdlog/spdlog-1.8.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 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}"
+
+PATCHES=( "${FILESDIR}/${P}-libfmt-8-fix.patch" )
+
+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/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index c67d65323739..f4eec4f1d99b 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,3 +1,5 @@
 DIST totem-pl-parser-3.26.5.tar.xz 1318700 BLAKE2B 18cea2edff1206ed9c77ac07fb018da0c9bc5550599b45e363d745166f4828adba6a2f77b763602af011c0a12e9f1f9765402fbafbe097fb69890ec7a9520825 SHA512 ce110d92f60da328272a8135a57ba60785ea4bca1fde3703a734969e7ba5b382ef19dc3b8930a5641d8f8effabf627f7e9b2727ee94e69e6144e0f085079e14d
+DIST totem-pl-parser-3.26.6.tar.xz 1503888 BLAKE2B b0768f54c77ff902ad20aeaa9162c616e0cc64ccfc2839d2db2e4c9076f82a611baedf127b0b74f84ec8698a5adc25c43fb9245dcb26a221da7024372a61896b SHA512 1a7aa69e147b55c3c9761328604821a7e40bac4e7b82492e5ce1b2405e3b6d5154e3b06687f2446ec923b34bf6ea96eef179ef8410c005a061d448fc6b3e754e
 EBUILD totem-pl-parser-3.26.5.ebuild 1930 BLAKE2B 5f16ca9d7d8ce0424eaf066f5dd811b8692a59cac9545d5774176e457f639e6d4db658b83ddfc3a01f6d662f1be575c5304560ab2d2fe3b003b41783ecad3f8d SHA512 3f9b54bcdeaf5e148a2f26cd549173de682c260239389301ec4a1736dffc2d52ed8d93e7b79ad452839443ee7d4e9390b5cc8247add116372887873e03a7800b
-MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
+EBUILD totem-pl-parser-3.26.6.ebuild 1918 BLAKE2B fa1a3e6d49c9c64b273ff184df888ebcfe18a770a01699219aba6e3a2d75ddad2fede9418dbf2da3a05b9f053fc7f9a3c590b4554282897912e9a056b996c2bd SHA512 5570b12db4c7dd00378ca6451263367e22e0cf4e78a235f82ba3bbaefebb43dbc8bd7e6cebc732157ad28cedce5787bfa68423f725671eef063d284bab05ffb1
+MISC metadata.xml 610 BLAKE2B 6450ce9dee5c71f013ea34ec9c494d908d2e05c1df48692d5d8f159988ec239df293f1ff171810789d6bff24cece7c973aeeb7acb7771cd38a9c26462ecef068 SHA512 c024b52f8c97629824ddf165eb169fa8e0da17b34a47eeaf37be6eef94230f274367b111b110700d5aee581ee9905efea6375b1b3c78abff99e750941f53e9fe
diff --git a/dev-libs/totem-pl-parser/metadata.xml b/dev-libs/totem-pl-parser/metadata.xml
index 085e8b59297c..aac38cae424b 100644
--- a/dev-libs/totem-pl-parser/metadata.xml
+++ b/dev-libs/totem-pl-parser/metadata.xml
@@ -9,5 +9,6 @@
 	<flag name="archive">Enables ISO detection with <pkg>app-arch/libarchive</pkg></flag>
 	<flag name="crypt">Support AmazonAMZ decoding with <pkg>dev-libs/libgcrypt</pkg></flag>
 	<flag name="quvi">Use <pkg>media-libs/libquvi</pkg> for parsing video links</flag>
+	<flag name="uchardet">Enable charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
new file mode 100644
index 000000000000..8b68d7150cd0
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org meson xdg
+
+DESCRIPTION="Playlist parsing library"
+HOMEPAGE="https://developer.gnome.org/totem-pl-parser/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="0/18"
+IUSE="archive crypt gtk-doc +introspection test +uchardet"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	archive? ( >=app-arch/libarchive-3:0= )
+	dev-libs/libxml2:2
+	crypt? ( dev-libs/libgcrypt:0= )
+	uchardet? ( app-i18n/uchardet )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.14
+		app-text/docbook-xml-dtd:4.3
+	)
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? (
+		gnome-base/gvfs[http]
+		sys-apps/dbus
+	)
+"
+
+src_prepare() {
+	# Disable tests requiring network access, bug #346127
+	# 3rd test fails on upgrade, not once installed
+	# Leio: I consider network tests important for ensuring full functionality, thus trying with them again */
+	#sed -e 's:\(g_test_add_func.*/parser/resolution.*\):/*\1*/:' \
+	#	-e 's:\(g_test_add_func.*/parser/parsing/itms_link.*\):/*\1*/:' \
+	#	-e 's:\(g_test_add_func.*/parser/parsability.*\):/*\1*/:'\
+	#	-i plparse/tests/parser.c || die "sed failed"
+
+	xdg_src_prepare
+}
+
+src_configure() {
+	# uninstalled-tests is abused to switch from loading live FS helper
+	# to in-build-tree helper, check on upgrades this is not having other
+	# consequences, bug #630242
+	local emesonargs=(
+		-Denable-libarchive=$(usex archive)
+		-Denable-libgcrypt=$(usex crypt)
+		-Denable-uchardet=$(usex uchardet)
+		$(meson_use gtk-doc enable-gtk-doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_test() {
+	# This is required as told by upstream in bgo#629542
+	GVFS_DISABLE_FUSE=1 dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-libs/tree-sitter/Manifest b/dev-libs/tree-sitter/Manifest
index 8ad921497c7c..cc55aa27b6b2 100644
--- a/dev-libs/tree-sitter/Manifest
+++ b/dev-libs/tree-sitter/Manifest
@@ -1,5 +1,5 @@
 AUX tree-sitter-No-static-libs-gentoo.patch 793 BLAKE2B 9f80752bff2b5d327889702b6d890a4cdfefc74965a8109e692ddbf576cdea62062df0b3757c2ac8264946e549bbc9885f1b52b870f932c4805b74f5171fa718 SHA512 8eb3e40f91ea5a23ae668a7208b697d6d8c67f34f5807c0c26e8ed56357a577b3f3e6e7138d32aa69f8d1865b274595341dfe77674abf8eea1be442ca023da9d
 DIST tree-sitter-0.19.5.tar.gz 2871077 BLAKE2B 487b846ac6ea4177d2b61721484cbde63636dde2dca0c15a35d4c4f0e18a9167aa11b750584d711632c2f42d67712b0818b57fb5815f62d95025022ecbc8cde9 SHA512 5d8669a2de6d261dfb083f0df07697156a703f56fea282babcaa7d391ef5538891b2c1103494a788bcb850cf494c184b05df5152f9276befab16f0fe6b23a9a9
-EBUILD tree-sitter-0.19.5.ebuild 770 BLAKE2B e01250e7154c53c3491b777b2ab5010efad99d9732fd744626c3a409ab9f6eba831d50cb1060cb44f01a0ff1e1c2a0696bbd2115fd864b718739057e50831b8c SHA512 c31c6470c56da0263c1531677486883fe9b798e446096921e310ad456ecdad9516ac1238456a72487e3a730ed59a9c0b15ba3abc7834a0ced0855efb252cda6a
+EBUILD tree-sitter-0.19.5.ebuild 777 BLAKE2B 43833ea5d0250dd2d8a0fc5cc9b7193b41f4d3f1ecfdcb9c0bb91e950d9e994a2105315b67f3911bf8ec38fb55c8e4fba0695333d2eb8ec7cf7b52913f21b98a SHA512 de14e983bf302da3394594f341f1fdb6e6ffaef60671e68f79a0c6c4b5f975e687f8aafcffb7e544b7fc16870c26e89083ac563c1b7861c351442f78b2e8b1bc
 EBUILD tree-sitter-9999.ebuild 721 BLAKE2B c4f01a037f3f9d80c88cceda4c99449b93c80095a6622e3d66dd5bcbda1b326da581aab1a7fe2b2aa5904282b6b41d73864bd00b2d17cb99b24fff8d776f0411 SHA512 a19b1cd1cefe444a461e78f1b3298a715f4b2dc0151e00b831bbf4e5387be5db91db2178d612dc2a613cb3efd5d9c464f61e68b41cf357d57ef0ce4865bb985c
 MISC metadata.xml 706 BLAKE2B 4e97ffaf578bae056a4b8d431c23132480064c4e523e03978dfc5b1ea471795ff974d2b9537d335f08369270c59cbaecf2cc2f2bca14b7b99a44ac82e25c3fd7 SHA512 df5252ea536d659a1a8382dfb0a399c666d2b15c24e706b9a0b2a9d58006ddc04739c0df37bcb9e767f8108614a5cc52e33cdf925e0bd03acbd00d390abe1d65
diff --git a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
index 72db00461619..3ae0a4de6290 100644
--- a/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
+++ b/dev-libs/tree-sitter/tree-sitter-0.19.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/unibilium/Manifest b/dev-libs/unibilium/Manifest
index d25f62c88f45..78fb9d96e047 100644
--- a/dev-libs/unibilium/Manifest
+++ b/dev-libs/unibilium/Manifest
@@ -2,5 +2,5 @@ AUX unibilium-2.1.0-no-compress-man.patch 576 BLAKE2B a99123e8be6e229c0661b2ca9d
 DIST unibilium-2.0.0.tar.gz 112570 BLAKE2B 95c24c53e11590faabf3d4b8484c344be0b2a0988f05bde785d03dac338d9f18fc65324f5ccc402723c9fabe2990083ce260d8fa57129591a1b2a1f8405eff9d SHA512 e93f319b7a85a4441c7f4e30d12d906805f066b14bff03331e48b6257da893f6447e257c8ba731077ad4b54d82d3ebf1ccf1fcf2d864273e0d4321a26ef7c172
 DIST unibilium-2.1.0.tar.gz 121971 BLAKE2B e035eab4343ee779218c302b3cae3ff5d443fc9bd723cade53a3d38dde3d66ee3d7374f7c69b85508a59d44d936601b24f33b01d923e55677d2bac71bd520fea SHA512 c0074ff8431f82c92072b8c0c9d3cf38d759b4de996b168c6ab00e475b0a6204d9c29b0a6e48e62dd4fa4898f82246150ef7cd5e246893d2c225c50ec4d4ac68
 EBUILD unibilium-2.0.0.ebuild 784 BLAKE2B f8decdab42671f3f9891ae9f019692f0c658c527c902ee2499395c1b0ec34b49f0056deec87396ed439ea1cb0a25d12b50d7727da739d4db5f4d9d11add57d43 SHA512 2c1f1edc2b1e0ace8f7dc54840636558873004f44d68ce0f434cfc403437d9fe5873ca1a66841febcaf4923bff2c82ac9d0c7937c180f11cddc721783d6eef66
-EBUILD unibilium-2.1.0.ebuild 871 BLAKE2B b89f7e59d5e3ebb9104293c138bab0a0cccc71063e139fd3089b5dfa0cd91592139c45960d7b0bfe8aee9bdbffe13e7cb4bf83a548804f1b821e2293c278f72a SHA512 75146a7a44f9343a17422ff02f2174934a792f2cab797c2c77aa499b04f5e4795052cb30ca73548f676c61963d390d0e613060dca5f7768e125265c793791c78
+EBUILD unibilium-2.1.0.ebuild 882 BLAKE2B 60502345df12d32b8746fca8c88235ec5a920cb1d0b4ac6768b939b09bdcc64dce54c6e5708a324e7220016b03af0f15349e93b1ae232eed0c756d7f90b28404 SHA512 12d878f21e6223afb26be5aca36a387bd5602dc9225fe14132cb4a5a4bfd53ab6dc24cd897d29018f15672a3038f2f41f102ad97a22aad34ca49080fc3efba3b
 MISC metadata.xml 339 BLAKE2B 36a1748f4030bc835201a0001ddf70b7ee4f1a73703c40a98650df0ef8b7e48e8acf3bb2272232ce528e2794310908214f1f9d9ac3ed75cf5bfadac1bd1cf19f SHA512 27c4da145b68654f559c956b5414a877ff9ca54a794390e690e1c11596dfda61d4d2ebfc3f891593f40c42f4070dd802ae7c73a9ece69e4c9ce0c1f76873644a
diff --git a/dev-libs/unibilium/unibilium-2.1.0.ebuild b/dev-libs/unibilium/unibilium-2.1.0.ebuild
index 54bebfe17a3d..819046b2707d 100644
--- a/dev-libs/unibilium/unibilium-2.1.0.ebuild
+++ b/dev-libs/unibilium/unibilium-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/neovim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+ MIT"
 SLOT="0/4"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
 IUSE="static-libs"
 
 BDEPEND="
diff --git a/dev-libs/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 29670ed1a870..f432c36bc3e5 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,5 +1,3 @@
-DIST uriparser-0.9.4.tar.bz2 174551 BLAKE2B b95f270685757052fca02fae0a029f08de8bc14bea733bd56e62f0bcdc6592f015453ed38c87171cea9054618328dc94a512ff816519f70594653451f751c4f8 SHA512 c5e671ce2589aacd2c562e66facbee9e1cad3101e840f40b7ebdb917fa669e0c3ae7ed75623692f601655c0b82c10bcfe3086ad628beac8f965e613228e67ecd
 DIST uriparser-0.9.5.tar.bz2 176501 BLAKE2B 5ec3d993e60c62f2478e4012354cf82f2e4155ea1a69e9a3d6611d1765fe0f3b8ba5382c928852a5fd215f51ebb0688c9d713e9f1208f18f5ce2d8b8f0fb1dca SHA512 44d36a33565b7724d721e2b5e689530227bc87e609ee78f1d23e7353480191313b1b91039c7a046566d14b83eb320c97d75e74c8ef4841e1b9c8559c3feddb34
-EBUILD uriparser-0.9.4.ebuild 1114 BLAKE2B eeef9c2c0dc64680be9608407af7eee2bf7dcc93acf558857acfdcb16bdf6cccbe8ef8653098c77e5db9851fb1df0383d8e272affd6eef9c30b6cf7db647ca15 SHA512 a53fb91fbf4a9b274cd78e6f592f191a51f17a8c80a4d3b9be5d0ad815a4ed2389e3fb54e6bfa95a2a1bcd9725fd9cdda6bf6a5d52b4720024cd632c9a7758eb
 EBUILD uriparser-0.9.5.ebuild 1410 BLAKE2B 34585430e663a8f5d2831271d16d2653688ee8924df945151a93e37efcfdf5785f077f872cd91e1e6b61c27b943615584da6c94d28281fa6b6fed4fcff7c002c SHA512 6581fee2794970dbe2f34542b51d3cfba32a94578b5797090a85e3de1ad876e5705ae7a829bafbfaa277cb47a7db6c5b16debf06556ab535d48b665a3d0e043b
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.4.ebuild b/dev-libs/uriparser/uriparser-0.9.4.ebuild
deleted file mode 100644
index 5eefe6b42f01..000000000000
--- a/dev-libs/uriparser/uriparser-0.9.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Strictly RFC 3986 compliant URI parsing library in C"
-HOMEPAGE="https://uriparser.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc qt5 test unicode"
-
-REQUIRED_USE="test? ( unicode )"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? ( >=dev-cpp/gtest-1.8.1 )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		>=app-doc/doxygen-1.5.8
-		qt5? ( dev-qt/qthelp:5 )
-	)
-"
-
-DOCS=( AUTHORS ChangeLog THANKS )
-
-src_configure() {
-	local mycmakeargs=(
-		-DURIPARSER_BUILD_CHAR=ON
-		-DURIPARSER_BUILD_DOCS=$(usex doc ON OFF)
-		-DURIPARSER_BUILD_TESTS=$(usex test ON OFF)
-		-DURIPARSER_BUILD_TOOLS=ON
-		-DURIPARSER_BUILD_WCHAR_T=$(usex unicode ON OFF)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc && use qt5; then
-		dodoc "${BUILD_DIR}"/doc/*.qch
-		docompress -x /usr/share/doc/${PF}/${P}.qch
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-29 10:15:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-29 10:15:54 +0100
commit	9aa80713372911cec499b3adb2cd746790920916 (patch)
tree	b8e99dc5dd60ac2094a27cc52f74aada8df38f05 /dev-libs
parent	b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (diff)