gentoo resync : 12.07.2021

33 files changed, 88 insertions, 67 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index b5bf689286ef..ea1d041fc529 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 510308750f96..50b3a7b22178 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -1,5 +1,5 @@
 DIST dqlite-1.7.0.tar.gz 157454 BLAKE2B 3eeaaf5bbadfc09803e70d38fcd3ab23c212dc2700ad8ecdde720932b0ad2e32016503eaa8a738139a178bb926a7818497629699ec68eec8c2111f377b40b4a3 SHA512 bf94568b1b52b0d94ddf78a3f975e277a5baa0f553c5c1d175b7e58db3d44478a1b3f8ef962259175b29d774b2eb6ed6765874dd0d461126b3268abbdd57949e
 DIST dqlite-1.8.0.tar.gz 158026 BLAKE2B 0e3bc8badf6b7e0447eebd86069785dca51c4dfda527ee7b838da971830ad65e443c130484b25c901aee5ac4e14c81df84756734aac3fd58a2fdbc67a664c1fb SHA512 4b32a8f8414aabfcc53d7f6ac0d121201076d7021a7d244b7cda316c3e3349e1b4da04cca31f2e3ca7605a9357895374fce0cce076b40eaebfc29a94d42fb38f
 EBUILD dqlite-1.7.0.ebuild 812 BLAKE2B bc674d8d9d5527bde955a7b37881b4ae06f5c7e70cd5ac41ace2f61a446639744042537919119ba1b9411743e265080472c051bf9f928815fcd4944e24fc018b SHA512 d10191b3fcb221d1302f2acbd7ed1632e4a5c077094a9b53a8c3e1315dd083e373e3e3ae3c4bc8da1eb0f6b08b7ac2510a37ae288a463203b0824a7879dfb9af
-EBUILD dqlite-1.8.0.ebuild 826 BLAKE2B ecadcdbf953b9b3c607232aba6a9c6a9c27d1978aa73d200024a0bc10de755961d9f9b309cc8ce0930e1e043e875b979d0ad233125124c91e3c15db277e90c55 SHA512 79a20f793a41fd852ffdb729651a2e6ebc92a27188fd90976fd45b47b23d08c61e771543d0a50e6acdf4320d0af144305701edf9d386f0801c8a4d2e5ce5c5cc
+EBUILD dqlite-1.8.0.ebuild 825 BLAKE2B 626c27cbab3ecc4404db2a11be24ef9580d22fdf591cee5cde46f96af5cb22b8e342c4fa61dffe9cbd93ce2950e528a7ad7749451a27f85ef100697278539e4d SHA512 7f8be2214215586c26ababbdfb88a9ef65ed5bb95b308223ab0accef58391ed7baeef49549380515ca6c36a9f6d2f99a300e020aae257962f72939c13250d7f1
 MISC metadata.xml 864 BLAKE2B d4b41f296b83ca318affe7df6ae3eba7b470d75bcdf343ea701890e43d62de317aefc1b4f47a939cd909ddc002201a6f77cb7662afdd8ad601f010ba0a8d16e9 SHA512 086eea8b0a1e5c58b26321bc4db1466437bda4e7129757efadc49b751a9ff2b9472b72ab83881c8e9aea171a052f9434723f27b4ccd3ae4ca15f21f165a1ca92
diff --git a/dev-libs/dqlite/dqlite-1.8.0.ebuild b/dev-libs/dqlite/dqlite-1.8.0.ebuild
index 0ed80e62b489..c59ef97f9b95 100644
--- a/dev-libs/dqlite/dqlite-1.8.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index df47ac0209b0..35bfb8e1d68a 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -5,5 +5,5 @@ AUX elfutils-0.185-static-inline.patch 361 BLAKE2B c480f9a4024922252c9917c5e69eb
 DIST elfutils-0.184.tar.bz2 9185468 BLAKE2B 8e45aa603a039fb128b96a1ffee4a0137fd1808d7087a2ddc8682a9bec1d65a56e6e6ad1419ac5e9f4490cc258c8ac0ee3e49775aab278efb1889bdceaf842bf SHA512 5920c354edd6b28bb7e713d674bf6f2221e8ee91b90d582de39b1f45446aea1e7e3d4b6671024c391675b5e7530fe952c1320d730bb625c02d4c647ceb938bc8
 DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a92f7069c060db1ac2fa4da5a9d34e8bddd07c7ce376b5c28b5670ad5b8c1df795164cbcfb600a44cf1db60c20c4af SHA512 34de0de1355b11740e036e0fc64f2fc063587c8eb121b19216ee5548d3f0f268d8fc3995176c47190466b9d881007cfa11a9d01e9a50e38af6119492bf8bb47f
 EBUILD elfutils-0.184.ebuild 2367 BLAKE2B 0a3544424f08f2fc6cc603490b24a3be0f981f5ea459d97db81ee6b212fbd130d0acbe2556f6f33accd3b0a3812c10a1ba4aa5686cfb4e9174b43e9a0795d133 SHA512 92fc6617eb49b7f3e8952357497a3430a6750f28e4b4e8543e568cd1a17127aa296940b9ee7b366a0919bf3d065fbbd86273d09e04dc92919fe68a11252350b0
-EBUILD elfutils-0.185.ebuild 2422 BLAKE2B 8722db7c34a6e74ba835bc1a839bb32dfe88b9f9fdc55dcb487b136465951e7d1b9ee5f12724ebdab9a57e4d8c14a3b043c8d8cc7369c61ad3a5e929b9ee7de3 SHA512 84d9a249517f2e7a7504774546f6f2e80c83ef45a84de0d5a5e086c87d5c89136049d6f76387750fc5fe867c19fbcdf8d1c436387fae4511b30a5d7cb49ae95b
+EBUILD elfutils-0.185.ebuild 2416 BLAKE2B e59b6be97fcbc278f0713bac6c79d09ccc48655293337239e1b8ddd3d20c93e41dc69d4de550f12254680ea75de13eb7fac72bb2ccb9773a89201b51c384167a SHA512 82f28d2d1fa3eadb693a00da64baad0f79012808f293f94e864edec539065c17348b1580f9b834a0ffcc59a55f8b1c2f36ec0633ddb41521003cdbf61c6abba3
 MISC metadata.xml 729 BLAKE2B 7fb60c690ef99ef62b4cd4fbed802a48141b90e295f84fdad09cf18d061dd94a63086be119d733249b91fca67a1588bcea9ee442e3dd142921cb9c163d65a726 SHA512 2e5c223aad3d51f6ae770ae7feacd3731821c9de0b68f6ad2d89a4c7c8360ba6decbd6d73416648186f19d19b4aa6516302cba6554c9f4955024a19c082d0f85
diff --git a/dev-libs/elfutils/elfutils-0.185.ebuild b/dev-libs/elfutils/elfutils-0.185.ebuild
index 38edee45ed96..c02044855553 100644
--- a/dev-libs/elfutils/elfutils-0.185.ebuild
+++ b/dev-libs/elfutils/elfutils-0.185.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 lzma nls static-libs test +threads +utils valgrind zstd"
 
 RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index c6dacc60f358..23aea2d7f258 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -2,5 +2,5 @@ AUX glib-2.64.1-mark-gdbus-server-auth-test-flaky.patch 842 BLAKE2B 6b2eb57b8923
 DIST glib-2.68.2.tar.xz 4944192 BLAKE2B d35489dcfe9d57d8bd6ecf4f893b7c8e93a5b8108765791071fc811598d1f41287e03d95f20591d50d51a78db34f11833cc7970b1bf29299385357a14977ba0b SHA512 74d481552629cab67d22f8a440a7263a4e4b83adb6f3b772d368e255c17321b206aafd3af4653e5efbb2c3c14ca67d35f453728cbc5cd68728275d0b56789019
 DIST glib-2.68.3.tar.xz 4945236 BLAKE2B 6086b7490f418cb98119ab25670766e3a84de81fd180dbc6e8f929d8f8ab748b0ae7ad6a85f5419ab3c00589c3afba95972d8b4541b310acdf6b6dc9b460a07d SHA512 fb120105c4cb582491a53a0e4c61fe4bdd1f94b279bb7c362afd591369ede50a196c706375564ededf3550d4062a285b038e20b605e6d5dfe36f5d208f4bad3f
 EBUILD glib-2.68.2-r1.ebuild 10165 BLAKE2B 70156b306a52ff61a7f0c998849d28bd088b118e560029b73d9f163b180f02e45d63d9093d78eee4632ee34fb899900fa480b2bd456754c8855f221ce430d28e SHA512 33b9630d5ef59b88f39c62fb1f23c571b7ddb04f46417099037e89565a04f981b611e7b81c99075b8c6bc2c6571792d1dce25459484d1577ab7444cc18e2c2f2
-EBUILD glib-2.68.3-r1.ebuild 10162 BLAKE2B 34afd300b42e3fa43c3d816264099316ca77bf74b1644dad402bec53f6b37fb93e8dc8c8894bafee18ed5f524598fae4e9e236f4586d220e4371c4fdfd0708a1 SHA512 c4c29491e548a17c2b5db11fc205618fcfef72c35ba24d1a683506ed5aa5710e562d8be3958b7ab3c0b4497bbcc9bdefb57d47302e1ec9066b0ccdd6b262e672
+EBUILD glib-2.68.3-r1.ebuild 10158 BLAKE2B 6389016649044a32b581f89a70d16b47cee76085fbc3720527fa43c2abe4194f96def593382880713e01b6d36fdc9e34af4f8f321a3ad54166bb2318d81ad119 SHA512 614ae63f6fdb9b8935db9a81115e4b0dbf869c6ed953f655e98c0d815b4b24c5c5d7dbaea910fdf9082ddc7678f7d1267dbece61c944eb73cecba1bf2b4748cf
 MISC metadata.xml 1220 BLAKE2B c3ee6985e9ad87e30da951c79a900c6b0284a84b11bde92d4bd345c679e49b084cb1dac7f1ea4b9f1d0d8170a067565f1758ba5fc51c9e613372f0b72643effe SHA512 541b49b565499a9cbe4062a0270b08d60ee9d9cf36ca53d3339f7ae1d406db825b84c193f363181afeaaea7ab6560d7aa0d62ca85d02e5521bd6c12f14a9ba56
diff --git a/dev-libs/glib/glib-2.68.3-r1.ebuild b/dev-libs/glib/glib-2.68.3-r1.ebuild
index 499c8da4b0ac..6f3ad8f65d70 100644
--- a/dev-libs/glib/glib-2.68.3-r1.ebuild
+++ b/dev-libs/glib/glib-2.68.3-r1.ebuild
@@ -15,7 +15,7 @@ IUSE="dbus debug +elf elibc_glibc fam gtk-doc kernel_linux +mime selinux static-
 RESTRICT="!test? ( test )"
 REQUIRED_USE="gtk-doc? ( test )" # Bug #777636
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # * elfutils (via libelf) does not build on Windows. gresources are not embedded
 # within ELF binaries on that platform anyway and inspecting ELF binaries from
diff --git a/dev-libs/judy/Manifest b/dev-libs/judy/Manifest
index 73fa169097d0..e2d12d752a10 100644
--- a/dev-libs/judy/Manifest
+++ b/dev-libs/judy/Manifest
@@ -2,5 +2,5 @@ AUX judy-1.0.5-gcc49.patch 3112 BLAKE2B 36550790454e36ddb1c13a3e2addce7aafe126d8
 AUX judy-1.0.5-parallel-make.patch 6736 BLAKE2B 4ba894f81e98a02a83700a061c9fa1f4670ad0b880635fb7812f5a109c14b518598f65c3221cec35bbe1f148b2ab3bf48142734bc74baa15e86604cd6b75f985 SHA512 80f5f361f4cc9f8d5e433ac40f3f4371186025d4fd33b15ae5e80db9d80460c4db94bd6e24d83cfaeebb82328a762d5560464112c7d3f80c5601a7a98f6c5765
 DIST Judy-1.0.5.tar.gz 1147847 BLAKE2B f5f31af2b7d1db5524ff035e9f9b733a4c5c23de76cd4c55bcdc59f7474ee02d7c7ec9341f087736ff6e39a139d20d9ab8298397aaf17f7d48a851037b8677c5 SHA512 1a0d59b092c80d95270a3089cd25ee0ddad1d591101b03784e2e46dfc73bce445a7fb495b449043544a366c09b35b833556053bf3bf65dd00abbd786d26c6980
 EBUILD judy-1.0.5-r2.ebuild 872 BLAKE2B e06791a078ffea4e1fa25e3227bccaa09122c42ef84cdb1746f80abbd532f1bdae86f0491d532d91ef0280cd77d5c19d96faf58759b8535981692eb00dbf810a SHA512 5f042295feac44af7fd58445b77f6f22e2e2a5c3c60944d5dd8dc2d212db5cf992d18219cf18f1d032191679ab466bf9b61cfc631e1942535233c6dc7812c52a
-EBUILD judy-1.0.5-r3.ebuild 879 BLAKE2B f03e9d81ea0450b59dcd81200fa76c8b60ad11bad8aa039600a233194ab47ca547d9add2f8deec4943fe90ec5beca198a12eabddc9c543b006218e8bd59f3e62 SHA512 5a3c7e55569d77f42e9e755ee73326a5fb11c0f6258c82b8d3e7e0de98969b70c2903e535f907556f430fc5a7d6324bdbdc0580e71b7bbaa466f1f3f5537b45a
+EBUILD judy-1.0.5-r3.ebuild 886 BLAKE2B da9f19b25f3e646903ea6bf76628ba1cfe8baa594e282d1ea208c9bd035beaa12abf27e8b64f133b96986f7ab92e415b816b618f7f4018e5d45e608a246639d0 SHA512 66f6a675209e20e7d81f4c2e55e7c89fcabfa66d233c57ce4220a895a7ba5f74f452c2424864e87a49c8c18bcfc5c1ca3a0f244d900856d3aca55444624b0b65
 MISC metadata.xml 320 BLAKE2B 7fd7a64eaec80ea91157624ff748afed6e8754407b8a0e261aac3022e2b69e2e6019ccb025c5a739f9bc005d81e41bb14be0add7323366422499aa96c8162e84 SHA512 ab0598eef76bffcdce226c8d0c20e70c723771835f20505119ea1fba9484293a28e5862f9227738284ce7a53809e4fc68fea31e2335764934e8e36b983366a46
diff --git a/dev-libs/judy/judy-1.0.5-r3.ebuild b/dev-libs/judy/judy-1.0.5-r3.ebuild
index 30329c63a52c..b730c174159e 100644
--- a/dev-libs/judy/judy-1.0.5-r3.ebuild
+++ b/dev-libs/judy/judy-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/judy/Judy-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="static-libs"
 DOCS=( AUTHORS ChangeLog README )
 
diff --git a/dev-libs/libappindicator/Manifest b/dev-libs/libappindicator/Manifest
index 4d666af32317..569d448e3896 100644
--- a/dev-libs/libappindicator/Manifest
+++ b/dev-libs/libappindicator/Manifest
@@ -5,5 +5,5 @@ AUX libappindicator-12.10.0-vala-inherit.patch 561 BLAKE2B 481ebe7b58af89df6a326
 DIST libappindicator-12.10.0.tar.gz 535562 BLAKE2B a05dc839aaea9fb3fda118d16aac0eb5c35e6c5095a83eb5e8a2af4902bc1da14960fbd57d3cda5d4d5d874023549ce83657a515aa9ee16a54cadfa81062d993 SHA512 317a22a23c8ed84e74207b64b2e9683992d1fb7208176637a051dfe925974f966d1cfa31e650b45eaf839ab61641dee8fbebc8a07882a09b0dd766d88b8d5b9a
 DIST libappindicator_12.10.1+20.10.20200706.1.orig.tar.gz 75204 BLAKE2B ccc7909f25946413cf39275d8565afca253b3a2676272e4d3833f030a114e7be695fe958d2d99868a20d03a2b9c4a1fcd7fdfba07325b7a9f7f39879851e0366 SHA512 cc60875b1c4ab06348eece442a59a4057d7e13f25605435902242558e8dd5e66aeeee6725b9bd2662ef89052d3614dc4577ed8c233e9b84236a75e771aa67352
 EBUILD libappindicator-12.10.0-r301.ebuild 2120 BLAKE2B 1463512cb7bc35e86a3aaa486f85637aee8269931b2385d2a6006743be5f7055b16308137631c7f867d5b7b3c7986b94c5736ec2ad7aece1b3f8b8f0d90f67db SHA512 a7aa23d5998bbf8e8e8c8d278fa0ab6acd3ddfe3e4f9a5513f2cec1e14cc2cdee062d76990d248add697f5dc01dd178fc53e0f0a18d16d5623f0a07293f5171f
-EBUILD libappindicator-12.10.1_p20200706.ebuild 2030 BLAKE2B 24807e5ece0a6e7dfce50b86a5b52f11fa83519a3e4d03693f2a5cd222dc7e80e3a718f9694b47b81d63e754ac77c13973f4b2d8d4cc956f05adad71ae2a5b24 SHA512 eafd8178943734188a3179d0b6d1c49a3ba217e354aadc7322ee741b17300904d95cf439f180b80262ac36ace4014ce7f005d17b5b90b2026d2d783fc2804184
+EBUILD libappindicator-12.10.1_p20200706.ebuild 2028 BLAKE2B a0e61804ae5355d152193f40a1ae2f30f24ba27024b712e64fc6e4f77f03bcc57756dae9f5da9b4ee44675578aad14b4dd3ef48297aa28e6b39ccae4fcc419ce SHA512 4a3484cb2ef071fe48fe3f0ebd53afef26f061649e11cc6fcf630739211574f32466138416add7374f42485f6a20c4aea291ee0e054e17a721f0c36546e9da9a
 MISC metadata.xml 250 BLAKE2B 8bd202d452582a51ddf3c4bc92840531d0fee0262d112e5fc1173c8fb95a0776efe14ff15613373fd4acab6082ad6f672e278a9b942e072a643b351e8af4d467 SHA512 161da1b732e0f23b06e0732db24f27cb486e7c673e8585d2f6403dc23147b56b5a64dd09978e3dd2db20e9e6a462daf50fe8bc73774d52445d1f6549d82104e0
diff --git a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
index 68a9bedb71df..77712202c0be 100644
--- a/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
+++ b/dev-libs/libappindicator/libappindicator-12.10.1_p20200706.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://ubuntu/pool/main/liba/${PN}/${PN}_${MY_PV}+20.10.${PATCH_VERSI
 
 LICENSE="LGPL-2.1 LGPL-3"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE="+introspection test"
 
 RDEPEND="
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index 8aaea10d0383..782a98608958 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -1,6 +1,8 @@
 AUX libfilezilla-0.27.1-gcc11.patch 220 BLAKE2B 5743c8ed2df0d117aee62975bed5ebffba16d22c6eed428fd9f87538197ae7c567108c3176fa04d22f83fddbead71243316d2ac983430d7e32691779f8cf3a38 SHA512 4f0fb68280d4f2ab583bfb7239451449b4b32677c3294bdc21d68565898c003939441803b5ad3a002e2bdbd7224e014ece4ce5f3d68d47ead09d18933ba63d4f
 DIST libfilezilla-0.27.1.tar.bz2 568252 BLAKE2B 5ab11e60a3df1e56275b0a1eeb94a91a5e036306c8d65c95ecdf26737ad5c73782d69e50f81749864293bc827b2502988b45a2268bb8020e685a4c864168af5e SHA512 30db720a8fbc806f498aa94ca9bdbbfa6ef04b4b4853e2c38744c2ba26dc8e34d3b006a057dcb527f6d745bf594ccffbb424f9b59dca6d1cb028b0f13bdd466a
 DIST libfilezilla-0.28.0.tar.bz2 572028 BLAKE2B 579881b1bf127f709cdfda61efb71cce3df741152124b74a2f7d718e43d7d71ce678ec6ba10ff61926b275d5b9e69f8df0f9741a0ba1e9b5ff2c51d35472d10a SHA512 e14bc3d5d20c62f0910ab55aa6466590a0d55aedf534e7eb67481a65b372c62fd0015506a1acdc476811aa2c0ce7561f30e79a10f994dfd98014e4ed4b4f471e
+DIST libfilezilla-0.30.0.tar.bz2 578592 BLAKE2B abfef274989b0ba31d9237394aa1e88012e9fe9d071c11e7350e0ada8d5da54d7cdc93f46f65b38fa9a811a638210238f42de99fdd6832f97ede3808723e5d4f SHA512 f05a1ef2be7a6d32a6c5adf8e02f2b17e83deb67bf7c67b1bc1fec539a7235903d91dd3e98412aa1b90f1fcb322cb9ab54d3a1ff4ec44889b4dcdda6984300c9
 EBUILD libfilezilla-0.27.1.ebuild 1241 BLAKE2B bb00084913fae7dae260d3ecff107d4bdfd27fd8b8a5338c05fcbe9cc521a022b2daeedb6e341b97ce529646f0a415190bcccc06564ac017150c28436e959330 SHA512 edb4e98d5d68d6848984eb58c09605ae170f19f7be44bfa183f880364b40363c14dc2a937634696e941b3981f23a1274df731f4864f054f1409b693fa087cc16
 EBUILD libfilezilla-0.28.0.ebuild 1195 BLAKE2B c437655e4fff0fbc8a2b04316f48d0294c3679a532c337af8fe4fb6a521bf79febd33ef366ef1c46746202f01a8b43cef68d65b84da9f1dbe72461d229b50d56 SHA512 00c1b6556ed183280ed87e7c73529440043582ae0e818b06de66e614199c293117794e23443c2870c787ba22f5b7c0b20cc8a95681dc818df7d0fc203a84a48e
+EBUILD libfilezilla-0.30.0.ebuild 1195 BLAKE2B 6542369e8d9785df7603b283e63bc14cb0cbdcc208b4eadc367a89fc286435c62e5763fe6be8de6aec9f17cb9b6a4b52c14f342d95e642a949cb26a89ccfb052 SHA512 e60c681739a20877635e88cad841942eed0192812be10ebfc30022fe9781b3924a635418bcf89099fa02892f196c8366e6596fcd1f2c8fd123b432447d2bbb96
 MISC metadata.xml 1135 BLAKE2B 403d46fc71d4b6e9bdcd741cbf6ac8f911e35f998253495834db8346fec1fd58066949877e4d14e1bba895db0d05690ad9e499d5772a82fc08e99ee7ae8f23eb SHA512 87e61d89897246499ad56b231afcb9beda85d6b1f67c5c9dbdaa754e82d556a94a6df77836c11c5d5fd7c0a6926155d0cd77f17acaecd2e279fd9a63fc915404
diff --git a/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild b/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild
new file mode 100644
index 000000000000..f0d6428c3e3c
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.30.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic
+
+DESCRIPTION="C++ library offering some basic functionality for platform-independent programs"
+HOMEPAGE="https://lib.filezilla-project.org/"
+SRC_URI="https://download.filezilla-project.org/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0/15" # libfilezilla.so version
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-libs/nettle:0=
+	>=net-libs/gnutls-3.5.7:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cppunit )"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		if ! test-flag-CXX -std=c++14; then
+			eerror "${P} requires C++14-capable C++ compiler. Your current compiler"
+			eerror "does not seem to support -std=c++14 option. Please upgrade your compiler"
+			eerror "to gcc-4.9 or an equivalent version supporting C++14."
+			die "Currently active compiler does not support -std=c++14"
+		fi
+	fi
+}
+
+src_configure() {
+	if use ppc || use arm || use hppa; then
+		# bug 727652
+		append-libs -latomic
+	fi
+
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-libs/libjcat/Manifest b/dev-libs/libjcat/Manifest
index 7f276d4cdc13..26ba66ebcf0c 100644
--- a/dev-libs/libjcat/Manifest
+++ b/dev-libs/libjcat/Manifest
@@ -1,4 +1,4 @@
 AUX libjcat-0.1.1-disable_installed_tests.patch 1131 BLAKE2B fdefa9b78c1c8fa80ef35d1eb1d1f5bfa9f6d6434dc517e5c84affde5de8fe195d4ad605b59c45acaf73fb5bc75fb6c57bb0a95ccace0b67e3480b9157a6a704 SHA512 171b9c60e4afff59cb25bd6f94ece92e3e80dc1267395415d3d283ab429c3a2de49d43c0a0efce1b9b9f4d217e01a08ce4458c691ad270d427284ed45a88a1cf
 DIST libjcat-0.1.8.tar.gz 64828 BLAKE2B 86ebc635364cd78c05694baf3d5fe7d9bf6764629f4530f5ab8a9502887884b3d5369860806a252493a7a3208367b848e470730fb8c32d4c66cc8eb92df51990 SHA512 058bcf7ddddc7a3cedefcfcef9947c5f318fa806c8673b991be29f36e4fa0e09e51e972c0bebe0404fd92060715f8a497a0c0566d743bf6f3fa71bc3d94688c9
-EBUILD libjcat-0.1.8.ebuild 1447 BLAKE2B 7838b66cc1db2b3df022dfb4e7d9a4eae6db247d0eaeda35a622d915187241d47138391a93482e300b7d177669c07575029e588d596fc05849002aee7cccb61a SHA512 a90d18c2ecad02c3b5b1a8af67f476ff63f98c4f7445da332d36f6bb2e706ce6ec1999b941fe75bdaa365475068b51c5dc074a12a77222f5ed1f55d1adeefdca
+EBUILD libjcat-0.1.8.ebuild 1449 BLAKE2B d842f87eee4f697912bbaaa0d53d8187e7744f3cce27011325d3de3998998f5535021da9a27f40a9c23d7ff689b165824f38ccfc570140bac98eb0a824715977 SHA512 a189876bbc5073d2466498b378cfd2c100c358a953681ed473185c60d9cab962e369587b0bbbb888348e6336f15cdeeca857422d0265059e82bce5b24aba7474
 MISC metadata.xml 936 BLAKE2B 168ebcae536147919a800bac65d1a35f32ee57283ea8f5d21554df3ea38565db39c8c8332f0f0d165f52115887e68201a305f31483cae5e2b8f33dfda12ab159 SHA512 82a1d7c6a84cedeb6bd580d3917c33aba7e55d1f4f17982aa2fe0f6c9f4eca9289ed5a67340f02004b4a704c3666e546ce64abe3f2bb3f75e8a56bddbf90084b
diff --git a/dev-libs/libjcat/libjcat-0.1.8.ebuild b/dev-libs/libjcat/libjcat-0.1.8.ebuild
index 20c253ee26f3..11fd5361f10f 100644
--- a/dev-libs/libjcat/libjcat-0.1.8.ebuild
+++ b/dev-libs/libjcat/libjcat-0.1.8.ebuild
@@ -15,7 +15,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"
-IUSE="gpg gtk-doc +introspection +man pkcs7 test vala"
+IUSE="+gpg gtk-doc +introspection +man +pkcs7 test vala"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/json-glib:=
diff --git a/dev-libs/libmateweather/Manifest b/dev-libs/libmateweather/Manifest
index 573719de6143..e5e84c59e62f 100644
--- a/dev-libs/libmateweather/Manifest
+++ b/dev-libs/libmateweather/Manifest
@@ -1,4 +1,3 @@
-AUX libmateweather-1.24.0-fix-tzdata-hints.patch 1101 BLAKE2B 484b389062d7f3d61085c3d937862dac48ca26c338fa21f72e0a189349834efe0bf5583fc6a54fc80d8514786d20a4130ca1b91331367d8762ffb3a241f31237 SHA512 97afd9cf53e35370b86b09d2414ca0b784d3b7e571d39873045f47b67f851a22be4181f8160007cc16f3037f8838868a4fd8f4dc4a06cb4ccdb403206f6e94d2
 DIST libmateweather-1.24.1.tar.xz 2223880 BLAKE2B e9d86e66755760937e71b983adbd61a5d71a311b1550e7ed445e94d4f74efc4f5d4cf1af17558035c74a0c56b598cc7f464f4a011a873a2d00a26ad4c37c8209 SHA512 1e653a167b12593171bb3dcfae3a5e57b3f874b220c34ca4ad2e575da7df424ce8a71f88088f53ec53cf9614d40ecda48b088ef6bede680c0ce81dca35ee1156
 EBUILD libmateweather-1.24.1.ebuild 852 BLAKE2B 188d06090c68f8550f57994fb90d3127baeb91aa631fb9be35ac64e7b501190c38f6d55a6a3020a3389011d43ec0b4deeea2b108ec74aecca372fd14154e841c SHA512 3dfafd7cf927ac8f0ab3e7475881afb568d5017712ebbfb33bd2e3a8cd8c64f7f4002a9ab588d966e35af19b3f7de8aa99335c530bef316e0f15bc9e1130b386
 MISC metadata.xml 343 BLAKE2B 2c44370234b1e71de86ca5e1fc09ab633185cd1401071d3487b8d4c582115f92e30ace26aca5d3dfb89b8c4aefade6ae4bf6b93776fa123206e638b83e0df9d7 SHA512 1bc3a926850df9eabb80136639bc47809b0c49bcefc37c990cb7941a3629c7a0b2b4e6b538c5af7dcb2187239792b500185349a1ba6befe5b85f191b73467a2a
diff --git a/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch b/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch
deleted file mode 100644
index d1c3cab11651..000000000000
--- a/dev-libs/libmateweather/files/libmateweather-1.24.0-fix-tzdata-hints.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 354086a51ea676b6575dbb3ec62d749ec0a7c607 Mon Sep 17 00:00:00 2001
-From: rbuj <robert.buj@gmail.com>
-Date: Fri, 22 May 2020 20:19:57 +0200
-Subject: [PATCH] Locations: America/Godthab was renamed to America/Nuuk
-
----
- data/Locations.xml.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/Locations.xml.in b/data/Locations.xml.in
-index 5488867..62529b9 100644
---- a/data/Locations.xml.in
-+++ b/data/Locations.xml.in
-@@ -6482,7 +6482,7 @@
-             -->
-           <name>Danmarkshavn</name>
-         </timezone>
--        <timezone id="America/Godthab">
-+        <timezone id="America/Nuuk">
-           <!-- The primary timezone for Greenland, although sources
-                seem to point towards calling the area "Western
-                Greenland" rathern than just "Greenland".
-@@ -6502,7 +6502,7 @@
-           <name>Thule AFB</name>
-         </timezone>
-       </timezones>
--      <tz-hint>America/Godthab</tz-hint>
-+      <tz-hint>America/Nuuk</tz-hint>
-       <city>
-         <!-- A city in Greenland.
-              The local name in Kalaallisut is "Uummannaq".
diff --git a/dev-libs/libqtxdg/Manifest b/dev-libs/libqtxdg/Manifest
index ce8347a13d20..dde9dfbf10b6 100644
--- a/dev-libs/libqtxdg/Manifest
+++ b/dev-libs/libqtxdg/Manifest
@@ -1,5 +1,5 @@
 DIST libqtxdg-3.6.0.tar.xz 76028 BLAKE2B 138f0f8bf9889c7f6aa0d4016c52d4c7745a9f3b34b53babba5d0be457485157d66884395488d4e978ba953332696b977bb60c1d04b6b0a53086ab7f3b0b4492 SHA512 8574bb6834c0a44c983e906c3d84fb5cfd6e2f40ec2ac70f4998ec5fe213aeb0d4439ff294f56c1988cb9d1b311c4e074906ba66b21d24190a911d0e643d1a16
 DIST libqtxdg-3.7.1.tar.xz 74832 BLAKE2B 92b0f47412e04fa3100f1045a0ceb69ee7787634ab02883958156b96e756aecae1e916fa9963ef072e1d78f337102b2bfb7a42a1dcd9481fd158dde73e57fcef SHA512 764fb953c5c5564a8f5e189f3fa867b82e1da215e0734d2fb995bb29ba163936a38cf68c6c812ff3c183b7ab4fce59d1189c68885b65f103accb5446e71682e7
 EBUILD libqtxdg-3.6.0.ebuild 971 BLAKE2B a4471147a7ae1f92b03f04c85b65d7950f6b4f26dbc7241583eab924ff53372e588f6a0f02c54e5ad9d56f0c34424b070ee229bb584cbc54c9169c1d3ce97ac3 SHA512 5953b841cef2438a9d47c8690a18e9d80160bc6117baf3f982a7fdbe51d542ba385e88896cb9df1dcd7608f6fafe6c6df286113e79ddb74584cab155e2df48f1
-EBUILD libqtxdg-3.7.1.ebuild 1113 BLAKE2B 8ce8b2f980ace15c2eea33d1c0b52cb508a1fa437fdd16d41706d8b6437114b760391b804f19dec693df5808662c5daeb4ecee7a30315cfc419778353ff69bf3 SHA512 e7d365d49b2757673661a98a555e2a88ba3cb35eb90ecda03caee1e9be5fc59c4d93804ac4a65df85b7eef21c49db0f21a77f5b08135d7c4421329eddbe1772d
+EBUILD libqtxdg-3.7.1.ebuild 1111 BLAKE2B 558ff09e38b19532c006872e148efeefbbfcd78b539d0357d491e176822a8520f4a0db8032d14cbc15298f01f94fe8230c5f73b7e84d2e95616c90912dc8ca35 SHA512 491c18257f663d6d68f0c1337c50f4f95ccb27956cc7c4da6451ad46e4e230e26bb1a870cd04fe32d7dfd50a424ba5a18997885a1fc1d33aae7060ac63a10258
 MISC metadata.xml 422 BLAKE2B 4ca2bdd5f3838e970ebc585ece3d8e922613fdd97713a24f441683ebe54feda53707db50ed90edc1d5475fe468510e4427b95567aaecd0c2a3371d9c6884c640 SHA512 49878c043d764fba09b368154c08959be049afdd30301da7c864c549ef1df53a81d9f0999c2c00663130a5348c26bc072d377ef3cf704774aa30d3bbbcc0918b
diff --git a/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild b/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
index ef6c277b7552..8abbc9b1723b 100644
--- a/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
+++ b/dev-libs/libqtxdg/libqtxdg-3.7.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 fi
 
 LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1"
diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 1b8c6bb25a38..1d0858ea5344 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -3,5 +3,5 @@ AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9
 DIST raft-0.10.1.tar.gz 318911 BLAKE2B 42ef22dfc89f05a3a9f130011c0f906201126a1615f9a60648587e014bbb63e038b3afd1593c2c07b046c3c35ef07deaa45cdce58062707409e4dbd3a9f7516e SHA512 6fa99d9dbb5895299c5124f5c8cfb544cf1bccae4ee196bc8011cd4cf9c632cd896f8cd93181409fbaf7da115235c72a4e10568080dd9957eceb978784dc0f9d
 DIST raft-0.11.1.tar.gz 324285 BLAKE2B 10e62a392bdbb98f262068ad2bcfbcd24488918fbb7d4c3b13101c3d771ff8b9d592bad31bfe69cfcb4d6e9c93e1d38da24d11a3167d37208906af4e354c9280 SHA512 5afbf0f7e325ed242c5a37a39038818395c1b39184e2440bf89db6662dee73b9abaa8fac0efc28dbc3478267aa66fd94e908e320a061fb5b343735e111dbea86
 EBUILD raft-0.10.1.ebuild 947 BLAKE2B e4d3e25da43405151a90881c85258f31ebe2c3ec6c96815dc0c087b5194a01ceba99b4f35f0de7bae722748250c4bf49fff722faedf69df053d476bc2fbaef03 SHA512 dabc7bf8de129eb4846d76a22b3b8c8a7035d1bacc5046ef62edbcd984512dd64a721a623cc447705c8ace934528146f667e22e1e00fc7916bde9abd24e46c02
-EBUILD raft-0.11.1.ebuild 995 BLAKE2B 29e8f04d211ee58fdfc468597d9f72d030c4a58d100af5b1acf936dd146f67273a4830de15b24f39480c7fa4726ddbbb1fa7beb173bcb14a98154c640363c2fd SHA512 1fda61e71df519c691f0ee66fa15f627940c1a6712a6bd24d932dcdb9d65630c307c91a5a73b3ead72d4774fb1e051cefcc218507d29ef950543bf42b3840b41
+EBUILD raft-0.11.1.ebuild 994 BLAKE2B 7c284762875ea9e977a7f4ac566aafff54b97e0fca8689b9393a1978a26cdbf63dbedef15649b239e68070b5bf9a5ab8465e1deda62d4b420cc276c489b11c39 SHA512 f7fa73af072b80fd5dfef7eb7ded840a8780bcaa37b03f3cd8e88ae9c1557da7af117d70e2f60c2a7c921b087c20b8378540b093fc195757a26b625799b8e46b
 MISC metadata.xml 812 BLAKE2B 677320549c30e675db900f01856b6ac4b86f18de7efd42a6008574edd7a14b762246b81aead5184e060734a53eb1eea007ecc5f79c9bae704763e483fe7fb7f9 SHA512 890676653a112bdde09b86488b99415f4cc10658809dd5e63ea3cecd197ba66b225d487f0f9557f38ccaedb50058940ab141871fc4a3e880dd8118e4b49d3fd6
diff --git a/dev-libs/raft/raft-0.11.1.ebuild b/dev-libs/raft/raft-0.11.1.ebuild
index cbf81fcbddb9..9d2be2004ed3 100644
--- a/dev-libs/raft/raft-0.11.1.ebuild
+++ b/dev-libs/raft/raft-0.11.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/raft/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="lz4 test zfs"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index d1c9bc6d77b6..1226b706abe9 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -9,8 +9,8 @@ DIST rocr-runtime-4.2.0.tar.gz 701445 BLAKE2B 901c256bae823861813a7afdbd3e9f80b6
 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-4.0.0.ebuild 1530 BLAKE2B 065d3d28d95d8832f8630496e023b264b28e25f7a99d253be765251047472a3bd4364cb0bedce6b7025221e3b6e92ed1964713884f08bd595017597e8b904bba SHA512 099d1810b5ea7d2fce49e4914b0f4453fd7c202dcee62a2e83875f7e0b47e59c6741e6c21a648f422b6d4c28aa5ccd18d6aa93a6b32d10705b6fac4f5aa68151
+EBUILD rocr-runtime-4.1.0.ebuild 1648 BLAKE2B 6e654ed96e97b9a60e25db92eb8ab80ace4d773dc7c4082adffc805f20dff9ea8b0b139e421df625a99764f1b61d22700864e25296011848bb91f8025b373362 SHA512 abc3ab62999a8e3bb6c6d0616e528b3e2c3914a67e1b40548d71ff31a409ed53f81dfb2c9e0dfdfa23e9d5ae8ca4f092d575bb003acef8695d373dd7fca36c01
+EBUILD rocr-runtime-4.2.0.ebuild 1502 BLAKE2B 6f7d48bc7bcc89ae585b202ad2bd4b523142fec9d00418efa297248548867bd02ddff6812fb01572d03bdb70438837437d777384a78e706d1eb420a12d61eae7 SHA512 df94dcb2549a9da7048b7a9d22ec4c4e5a617b85e95d0f5d576a770ee5f1ac3d1a71504e9b1a92752904568cf1dd11ec0fd8a35b11d17d8329c07dd0aae762fc
 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.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
index 256f7ffb9e4a..6326a7e4b20e 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.0.0.ebuild
@@ -38,10 +38,10 @@ 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
+	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 ${EPREFIX}/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
+	sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
 
 	cmake_src_prepare
 }
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
index 38fc7decb01f..e91c230b519a 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.1.0.ebuild
@@ -39,10 +39,10 @@ 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
+	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 ${EPREFIX}/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
+	sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
 
 	cmake_src_prepare
 }
diff --git a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
index 75444f1b60de..c9bc5602a203 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-4.2.0.ebuild
@@ -37,10 +37,10 @@ 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
+	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 ${EPREFIX}/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
+	sed -e "s:/opt/rocm/amdgcn/bitcode:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i image/blit_src/CMakeLists.txt || die
 
 	cmake_src_prepare
 }
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index f4eec4f1d99b..8490eb1da313 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,5 +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
-EBUILD totem-pl-parser-3.26.6.ebuild 1918 BLAKE2B fa1a3e6d49c9c64b273ff184df888ebcfe18a770a01699219aba6e3a2d75ddad2fede9418dbf2da3a05b9f053fc7f9a3c590b4554282897912e9a056b996c2bd SHA512 5570b12db4c7dd00378ca6451263367e22e0cf4e78a235f82ba3bbaefebb43dbc8bd7e6cebc732157ad28cedce5787bfa68423f725671eef063d284bab05ffb1
+EBUILD totem-pl-parser-3.26.6.ebuild 1915 BLAKE2B 2b78c72ecc6b92e19341cebd4711652f011d709eb4eadb0776125e91278cb1987934ae456e1c3e819ac02b5757b298d0de662453882bc71891d892d942c616cf SHA512 fb6a300a858e0706970d0040c582275b9e08dfcee727ddcfb95eeb5c0b15b0893f1334aa3937e91df28d9bd952bb728ae019c16305bd326abfebe0f1d83a467f
 MISC metadata.xml 610 BLAKE2B 6450ce9dee5c71f013ea34ec9c494d908d2e05c1df48692d5d8f159988ec239df293f1ff171810789d6bff24cece7c973aeeb7acb7771cd38a9c26462ecef068 SHA512 c024b52f8c97629824ddf165eb169fa8e0da17b34a47eeaf37be6eef94230f274367b111b110700d5aee581ee9905efea6375b1b3c78abff99e750941f53e9fe
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
index 8b68d7150cd0..41eae294ede1 100644
--- 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
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.56:2
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 84519ce55005..402a60d4e93d 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.52.3.tar.xz 3575936 BLAKE2B bef10fdca6af1db5d8ff7b01b624fee5879d82ceb35ccc84d847f9ce26445194d4fc7ec8c3f8177534c0144e9027633ed1b00793e4e2edbe3df51f55f29129cb SHA512 5b757c6a9d1a2e9615fddb014c64a92f6a7c231ba964e449a43e9ad19293d415b66642625aad98d18e436ab438a4530d00bb670c7c7eaae56f43b407f4035bd9
 DIST vala-0.52.4.tar.xz 3577796 BLAKE2B 20f541f5429ef52cdcb4b0c5559dc312f62276ac6d91b3ca97f5bce4b954f7d0407637131e16db5a9f059f5ee3e7d44a414cc06311d49c294f22789db821ec79 SHA512 3c7daae4d26e6940b0735cee84f1a25f2aab12c93d2a8a9e9edec45c0c9dc9184cc790acbae19aba0fb31dfd7115afddcf8b9f09b0423b5b6950900641f4c527
 EBUILD vala-common-0.52.3.ebuild 645 BLAKE2B c2aaa245d9dc1670a714656177d4fb4e1ef5e9b6858d68636977e198f783151b17958feafbede1a79c45e222e8dd7a67b0d679ff0b7eecd9404611439cbb22c2 SHA512 b44a9a161a22a33a821e5cd3d10b97d7c6390de583eb4708b17b80f6a25143be7a87d26d754dc2e4963655c32adf1e0ce38710df29bd20367a10cdddc17f5815
-EBUILD vala-common-0.52.4.ebuild 651 BLAKE2B fc2398ebd59d35bc306cee1e05a492a9224d67bd1dace25a374d1bd47514f2798c0f431c440d076ee5e8f705f90c6b699aae390a962173896eda606a275b2c9b SHA512 86df93e3adda99ed9bf09194c03575667d18521837fe2cc9383bb72c70981c45b5971b4182e7ee49eebb492f39764a99727acfa81b9a6525dfef396597aa4ad9
+EBUILD vala-common-0.52.4.ebuild 647 BLAKE2B fa5e9ec87d657f28722b5733f2a435e38a2f168b35327315fc8a63e3ddf9dcea48feab6156a3312c0bfb194337f9d0f5581e7911ca6ee441088b768858a8be1f SHA512 b11638f4c7c39288dbdcaf35225efc7fdf14fe332f2d1210d30e3d601c99740a3ebc2df7ec47ed7f0e0ab411cea402dbdefb124c238ac4e098b83d6b98a3ac1c
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.52.4.ebuild b/dev-libs/vala-common/vala-common-0.52.4.ebuild
index 1101d60deef6..a2d77e324096 100644
--- a/dev-libs/vala-common/vala-common-0.52.4.ebuild
+++ b/dev-libs/vala-common/vala-common-0.52.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 RDEPEND=""
 DEPEND=""
diff --git a/dev-libs/xapian/Manifest b/dev-libs/xapian/Manifest
index 55778f3e1459..3c038d1f3386 100644
--- a/dev-libs/xapian/Manifest
+++ b/dev-libs/xapian/Manifest
@@ -2,7 +2,7 @@ AUX xapian-1.4.17-gcc11-missing-include.patch 185 BLAKE2B b06ab13c3fa91ed34e98c8
 DIST xapian-core-1.2.25.tar.xz 3253292 BLAKE2B a130e26188c949d0433d017e8d13e7ecf6241a232d00125699ba8ed63eab9cb1651e02182fcc152f960f4e122709958632779daaaf5760fe50953a3b5b07a243 SHA512 a15b5d9b5770337519f671732f53f0642b31f08206824500d589ba309c9e91a05a30353d66ebf70a4c1cb1824b44e1c7b7630e799de3b15d645cf951a6017bfe
 DIST xapian-core-1.4.17.tar.xz 2997700 BLAKE2B 882bc28c9a55731212a5c3ac6da3ad2082e3345cb473eb2c09b80fdd05e700bb31cff6c9a0524b27da015b14655c30548e92a457b48af43279bfd3564cf3c3fa SHA512 3eaf45d31eb9318e292fa052b32b1d9e1035651bdd3c366a0134f4b39d03d987083c19426a3d4b10f60078190fc3388f05b332cba958263bab1abf236c7a3ca7
 DIST xapian-core-1.4.18.tar.xz 2984508 BLAKE2B e5d680578e0a4605a8e99470921fba29cdd3d137d017608b8bf571951726055d2a1d49e9649829f0df92af3d27d0565f90baaca5a4eb5c67cb368f5d1e592d28 SHA512 ba6240054c0d2f92b9f1059aa934cdf35388ee7c7e05f4ef6f9856bdaed8ad821095a348ed9a892afdf18c3c0ad20e163028ad0ed3a9934bd69b861e814678ef
-EBUILD xapian-1.2.25.ebuild 1974 BLAKE2B 9d9fc21e0f06e17af35b0c3fa26408c247ce1517bb12c21074ce63bd4fef7f384bec6ff34829aac8449a267d2c4975a0387e4264991ec2dbae993eb0c2784257 SHA512 e015e54b13c1a2b6f3a40ed40bfcb6494264896106bf3b6a69aafdda2748be9a3fbacd8c1ffae5cb7a3492de6da75b0654499a7330ec38f671d6f94a1337df49
-EBUILD xapian-1.4.17.ebuild 1880 BLAKE2B 368ba58fc611bf232f8a91da11a18b069699374bbd001eef86459a9b2158f87588b8ca46fcab5d6807619e08a5aa126995d8fb48e57c5a8c9b2832ca914d3156 SHA512 9d8de077dc2d2d8a2507e24561a16df38870893a486ff9df917c54bfb7cf63d460cbee945eaa50e129b929f4da988f109f51c9a2180eac1060993ee8db748be6
-EBUILD xapian-1.4.18.ebuild 1815 BLAKE2B e21bf3ad34a8fb74953764c938ed335061d24562b939fc1ebca54606db1f4180c9cd75d30038d2944ab76ce56be71d45b95fd583575aa1222097911c13ad4487 SHA512 a2aaf52d01b415f9330feffc27c75ff15295eb113fe88b3a3815f5b71bef64697559b1a08caae9e47e962ccbb86f3760dec7bc4ce0e04087c76348dfc0a0cdf1
+EBUILD xapian-1.2.25-r1.ebuild 2035 BLAKE2B 0bd199c71ce17e0c01eb702679a3e356d35fe8150c3aec92cbddc1127487638443aacc19d6cd0b1cd84725a044e61ceff288f331efeb2ea581e48d12e38a336a SHA512 2155f4652a2f6581aef65bf635aedcce76b7d3746cdcb270c97a34d3e5c6c386900d168fd2880b31fe50f1be2751df3e8b5f25ee74de3c1fea1e259deee190b8
+EBUILD xapian-1.4.17-r1.ebuild 1941 BLAKE2B 2cd45961ad77e56c60f906e7e49afc5287452a2b5f0e8abc51e5c0740ade9eb5ac5978e9ca9394af7b418e8a03eff83d482278bc64780957cbc8879198c49c7f SHA512 cc0aec3d3d555d28cba486f92d5bf8bf00fcd7b52c890ed6d3af11c8e9f8e0ec403dab41364a22f841953a554c40b58f0825808a04a48f1e34cdf9833f223141
+EBUILD xapian-1.4.18-r1.ebuild 1876 BLAKE2B 199a3357f54aa02e5a38fd17cb17bbc6fbfd7a8fef9de29e8d08638be3d2fd3ffb2ca2411aaf29c666f703c56d65877ab38d341c5d3fc2fc55b135d8d3e48dd1 SHA512 c9fd7ce34b47b5ceee02b3b0bfdd24f0f79d40fbade0e3fe69130b8cd4d27bdcdddbb46f9de365aa3471dae83049d23ccb487fba175c98bea76cb3b9977ccffc
 MISC metadata.xml 934 BLAKE2B 2117e395836430d6d356b226e9b4f487141974aa36c36be8505a9e077cbaed2af0c77097be9f2426940b717f2d56200cac6715da50e95c6d6aa1c9db84c0cee7 SHA512 dd16bbd4e60c8ba983524471d0933d3578e932d982777ce04bebfda0a1cebe67be9de76b11b85240f719b24299453c1051bcc6149ec8e2476337249c309cf585
diff --git a/dev-libs/xapian/xapian-1.2.25.ebuild b/dev-libs/xapian/xapian-1.2.25-r1.ebuild
index c756a3c880b6..8dc1dcb06fb8 100644
--- a/dev-libs/xapian/xapian-1.2.25.ebuild
+++ b/dev-libs/xapian/xapian-1.2.25-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2.
 KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +brass +chert +inmemory"
 
-DEPEND="sys-libs/zlib"
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/xapian/xapian-1.4.17.ebuild b/dev-libs/xapian/xapian-1.4.17-r1.ebuild
index 28d37a143933..25d39cf439b4 100644
--- a/dev-libs/xapian/xapian-1.4.17.ebuild
+++ b/dev-libs/xapian/xapian-1.4.17-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0/30" # ABI version of libxapian.so
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
-DEPEND="sys-libs/zlib"
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/xapian/xapian-1.4.18.ebuild b/dev-libs/xapian/xapian-1.4.18-r1.ebuild
index e92a0c0daef0..8d6ddbd3218b 100644
--- a/dev-libs/xapian/xapian-1.4.18.ebuild
+++ b/dev-libs/xapian/xapian-1.4.18-r1.ebuild
@@ -16,7 +16,8 @@ SLOT="0/30" # ABI version of libxapian.so
 KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="doc static-libs cpu_flags_x86_sse cpu_flags_x86_sse2 +inmemory +remote"
 
-DEPEND="sys-libs/zlib"
+DEPEND="sys-apps/util-linux[${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"