diff --git a/Manifest b/Manifest
index ae7f60ead824..cdeef8b494fc 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
-MANIFEST Manifest.files.gz 29438 BLAKE2B 009bd89c86738b044a9b995952e069c200e071afee7c2dba551047ea56eb96098e314efaaba3c3e6c11e5572f3d41c1bb52765020492d9bd89c9480ffd4d3c7c SHA512 c7cfab42e4e6c6b415a3a2c8b2ab12fbc8f6aa108c2033e9587230f7094c44e0ef2b7786a11f6cf1c75fd41f0e8363d2ceddffdba18c58c5ca01e7073c1738de
-TIMESTAMP 2020-09-07T21:08:42Z
+MANIFEST Manifest.files.gz 29464 BLAKE2B ec8ae9bbe6ab554d61bb00781f17a32b67b2775cb1850fc13e0a198ee5b6fbbf22b684ff74b624c1e6586094f6720f4f6b1d0bf657e1d77a31b70daecc447c93 SHA512 5e2ee2b42fa869a349eff8aa148e1ae3d7224a093ec96d7aeae79292d60d9ea9bc02dc8ecbf7e16d82caba6338a2958ac279b03215e9655cc59cbe44d83960bd
+TIMESTAMP 2020-09-08T20:08:46Z
-----BEGIN PGP SIGNATURE-----
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9WoVpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAl9X5M5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCS2hAAlfSbWCsUzhVuwzf8yB8rJ1hkIr9c8b39CRnI4rM5xlNM7/f8vJdt0dd8
-5RChbdG3+ieGYJ+DAdC+qs4LSNyr1NtjKLY8NCsIzRBdA20E5MLbG3BRtBfaHxtP
-IrMJRbv4za+UyRpZUjrTTQIFYsTnqmYmyRkFjJckxUD3cPXEyHe82evnIey41t9w
-+zDIlTHWPbxP6Qo+lt+C6O5kcvVL3jyPb9FIG2tf05di4HBPSSaeGQ9K42qTVN61
-GHtAWC9risQd7b+VQXsPUCHHtaWw9R+JCN+IGptigvVlmCKveCKflMzJht2c9NAH
-68ID8GCFHH5n2MT/oHR89V31VO8jDpPC/eXct9AZ0YczmZh1oLvNWHHIqindTOef
-oYocWi3XU1km+uuDWvXhZcA5q52OtqPYKTgLi/HVkoGxcNDW/nkQuzfF57zWhcxQ
-DY3SSNuHKUPCmwhHQWNjdPZoCYjFRFIhOahj2poXtvgz+mV4NBfaj8LXgrJ66qpv
-eZmJfoJII+Ef504InlmBS+jZiGKV36bInGT9avIngF1tXN03vc0ujVlQP57EyJkO
-4o0Z39SJIMBUyED1V+CQigre9FyChtWAJ90kIld6c02156O9V7BGyFoBfthgd4tO
-AFkvYUUjie68DDGuahVlXYZynI6wtL0RFbuqllvxTp1NbtrHb+c=
-=Zbel
+klC4dg/9FIEYZR96DzAdmLCypTHDcwhGZ2dCnPjepyn+aoRppQiBsDZORvm6/TEl
+t6JuGMqxAeKgSljIJQvdp33OWrsI4nIzN5s5iiqkHkrtdn8gd5U6TjGGluJlbn3R
+OGKelGqboUlt/h9oUmJ4Pl2KsaRqpCq2DxxEGXwSpTTxoyAegtp/VHQAkA/zGlfx
+ykQetRcborNREfvzvvU0k7UdhwDJyqXtPC/+tYK55VWnIadheI8mrLR/+pi3q7ER
+EXOKL7lHpkYqbZhd2JWyupWYHhmn0cH9lZenXVo42a5I89r+Y0uLdTeqoQx6tf7f
+uUPU2n2q/l2eQ7jVcSCb3qOOpfN36a6vjAd/2yq4qyt3x3K6wKbcJ05AbMCk5Xv9
+N4wqdLEYT/GtYSx8KGgOq9fJ/unaNG6A99pCZEb8ALd/QAyF8GgQfDPQfgd0nqV3
+jHp6mGFPc0vsye0Hr6iXHt838DKM4t8lGgd77cQyii8WhwNU08Cz+rvvBmjJnml9
+p+oo3jaWYbosAAWHlXAxe4PljWjhYcOGtihg3ZCV6/ny1XQm0LOVaPnOQqtOvVn/
+xgMiqTF9n7aj3MqnERSZHqzMxBXe3W4l4CwNwi09N0TSxKCaJk3Mu0WFfMPB7pJi
+NTeVGLsjHhFENJPpX6LTgJZnCXndIWGT1yHs5kpcTPPHKfrZITI=
+=a5Dg
-----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 313b41335487..01eb96e102f1 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/acct-group/Manifest.gz b/acct-group/Manifest.gz
index 2fea312a182a..cf4f2d1e6b29 100644
Binary files a/acct-group/Manifest.gz and b/acct-group/Manifest.gz differ
diff --git a/acct-group/mongodb_exporter/Manifest b/acct-group/mongodb_exporter/Manifest
new file mode 100644
index 000000000000..b56524fc34c9
--- /dev/null
+++ b/acct-group/mongodb_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD mongodb_exporter-0.ebuild 146 BLAKE2B e270af01bf868143b87fa65a08349ce9a48c4ed9980aeccea0211e8c8fa2e9427387ddeadf4640a7be867c0232159a879075f53ae756ea3f7cfe2f2377bf0ae1 SHA512 e7d0ff072fa4103d5f605410a51b636e538d1d32f6b7a84f0e8b1c42704550736fdb3cdef91e90ebe74bd51e0422a58d68fcf23482e50bc258928a775e21dad2
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/acct-group/mongodb_exporter/metadata.xml b/acct-group/mongodb_exporter/metadata.xml
new file mode 100644
index 000000000000..c36c37139fad
--- /dev/null
+++ b/acct-group/mongodb_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
new file mode 100644
index 000000000000..946813661ba4
--- /dev/null
+++ b/acct-group/mongodb_exporter/mongodb_exporter-0.ebuild
@@ -0,0 +1,8 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-group
+
+ACCT_GROUP_ID=277
diff --git a/acct-user/Manifest.gz b/acct-user/Manifest.gz
index b796d6376f8b..bd9e3e3b6e7e 100644
Binary files a/acct-user/Manifest.gz and b/acct-user/Manifest.gz differ
diff --git a/acct-user/mongodb_exporter/Manifest b/acct-user/mongodb_exporter/Manifest
new file mode 100644
index 000000000000..f5edd4b83229
--- /dev/null
+++ b/acct-user/mongodb_exporter/Manifest
@@ -0,0 +1,2 @@
+EBUILD mongodb_exporter-0.ebuild 242 BLAKE2B 7f44a0e6ee259bc39eb51b0d81ca6cb706c0c0b0d6902f25e09ab0645784ba29c48e1659efeec37281fc38f859664e71d80b6d2a49210d8a01500082203fd903 SHA512 df236caacf0c6c2cd867b9ab2fa4cfdaeaa10b921c83bb7923a5b8bae347fa022fc7310a084f55f5c56f9fa84dff3e630310e8eb300e3440bd5db3d478c74efe
+MISC metadata.xml 254 BLAKE2B 2080be28230af9420bfe91b10c9f0c31453e0b83b50a714da52d3c379a58e1758885b3506bf9a1a31c0899aba0e903e11e61217d52cf7cf135b61bc60521979f SHA512 2d8394c06ce9c195232dcee9d171639f460dc3ac3444d0a0513211f191b431048d72dc5c7e13e83532649be12a11113b0923c7a346abfe6b61709124567521b4
diff --git a/acct-user/mongodb_exporter/metadata.xml b/acct-user/mongodb_exporter/metadata.xml
new file mode 100644
index 000000000000..65da3dd78299
--- /dev/null
+++ b/acct-user/mongodb_exporter/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ williamh@gentoo.org
+ William Hubbs
+
+
diff --git a/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild b/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
new file mode 100644
index 000000000000..aadf83004efd
--- /dev/null
+++ b/acct-user/mongodb_exporter/mongodb_exporter-0.ebuild
@@ -0,0 +1,12 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit acct-user
+
+DESCRIPTION="user for mongodb_exporter"
+ACCT_USER_ID=277
+ACCT_USER_GROUPS=( mongodb_exporter )
+
+acct-user_add_deps
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f84af68feaaa..1fddea287014 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 790ec5aa9a61..3f376c0ba38f 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -819,10 +819,10 @@ DIST terraform-0.12.24.tar.gz 10427523 BLAKE2B 088d0cd249a065ef663b41690e0c1e27b
DIST terraform-0.12.28.tar.gz 10637713 BLAKE2B 218d8316c004c363bce39f1e4547cdf4a6d73cfd1b1c0e3810b5759ea509ddd6307f2694f9673c1b6b8668c1a869bc04a81be600a38c5d2c5868e2e1962a231f SHA512 cadd2a5527b4c4ee6dd0385d962435e15ac72f99bc0d3e8193f78a49a474e491dab73f9280c77f37f34e516873b12a7f1af23cd437cb2f9d0afb2bef9966c836
DIST terraform-0.12.29.tar.gz 10640549 BLAKE2B 877ef798dfe67d60a4030fd138a96eff796e24efeca451388f5c1ea7ec3fc9a1eb1824732a13dbb700342fab37296f8e4636de036f862a106bc2b6fc8cf10b33 SHA512 f1c05af299025b350f6748f832eb046156f97668f235281e446d9a2c400b7361c51e8195d8825a54558554cfbf907e562fb75ac27e296468c950e12f212979b5
DIST terraform-0.13.0.tar.gz 12804812 BLAKE2B 75b6514efa73ccb438726973d1c89021c2b25736e958f3f61c79e713b0dd2dd4e21d590db4c5d6eaf2e797d3de28d0b51b6b3857dac30ad3c6ceb7e9717aaf1c SHA512 9f789b89466b74128ad75dd6b34c1ccf0f7d2b233ea6a6866a09014dd8c7023c1e5c156bcc9e0834c8fdf06e62694d81d4585fee4829c6fd95129c6cd8645798
-DIST terraform-0.13.1.tar.gz 12837736 BLAKE2B 8dff2604a5827b916e17596f35909c65fad1be945a147f7d7e6a708d77363bde383ed19a36ceb87613c1004d04463f854b74794b92077e6a0777200302a7626c SHA512 10cb69d5eeeb692fe5c423c0326ee1248115de89c52e3e10e350108fa7e9bcfea1133fc7c3eb1ee3e3391608e9ab05bae6b0f00de68210ecdca8b13f0e4314a4
+DIST terraform-0.13.2.tar.gz 12810056 BLAKE2B c8e01cd3e3bc822cb3cc1158adfcd582642c9c6f174f21f1ba1b415f87527a9379231805731cf65de2071486598dcb9478f84cfa080125c9cd4c9e95e7f343be SHA512 db6ab93c4a6a07ef407ee97aa6e01acb937670c88225b0ad5ae1c51d99f69e863204a4b82c39dbd161f9af530997527c6aeee02c8b96fb33da91b9c4b472697f
EBUILD terraform-0.12.24.ebuild 777 BLAKE2B 686b38d1df4e28c19f03812fcad15802193f11fc1c8da7ba263513122952ccb9f9d5d469b9ed5e44e1d147c4f7d4d7f1e225ed6345d9d1934cfc062df1be6713 SHA512 4f2f3cd4b891778209a279cd62954cbc91e440422ac5334b88b09e274804c24c1ce9a898d4cfdbeb9623c5e370b8ec9c72ce56801386e981030d821939a7ed91
EBUILD terraform-0.12.28.ebuild 33302 BLAKE2B 9ca5f33aa00c5eacbb82d25fc06cc6a90d16474fe85e0e087dd91edac361188ffcf853b21fd543d07a2836c3d2b6cf47c0c367406c533fb19c5c9ecedc4ef230 SHA512 e521a4cc67ca85de383eb06e2bdace2acf1adba81a66999a744436ce42314c20a9aec78a79795a3c88ee0234e7eb481ffa3778b998692c26ad7783b01ae20bf2
EBUILD terraform-0.12.29.ebuild 33303 BLAKE2B 4c0259ea3d2abbf4339caf96cd8428128f6fe15a9dfe7290f00ac39997796867db7b3861f99e8c8a4ddf28a3382c3d443bbde7ae22cb0b04e74b41a7f20004e7 SHA512 9114f7a5a1f532d4302ba792a2721b8d6b3e5ebbff504b4f48f406fd3de9933b2d57bd888a53fe5cad165d99e1e26f05865e7a46139ab34862dc805f59929add
EBUILD terraform-0.13.0.ebuild 41229 BLAKE2B 5cf91bdb2608f3590790071ada4cf4b85ae0a85f69af276767385196a30734bbf0cbf71282ed75edb973b2a8cd6819157a859dfe98ecbc99f9c49a5b04a05753 SHA512 52a093e28f057f3da780e8559592e79051abf79754d9493f05216fc8654c25f0e4822227081df8b8a44eeaaf8218f946517e61a7b7a32298590b907e218bc000
-EBUILD terraform-0.13.1.ebuild 39892 BLAKE2B d51dab818c74e4c7bedba8521da79dda9562d59dd377982cd50f14f162305ac7a81c81a1620d27605b284571fa329f79a709539b7e87ff4ccbe2a6829a034cc5 SHA512 bc01136c15d20525276d25885f5de5d8588b5967de21fee7f5017df91fbfa91efa944a43833c0dd3fba89a08fd52176c277ecfd562e1a9694c20f6c1257b094f
+EBUILD terraform-0.13.2.ebuild 39892 BLAKE2B d51dab818c74e4c7bedba8521da79dda9562d59dd377982cd50f14f162305ac7a81c81a1620d27605b284571fa329f79a709539b7e87ff4ccbe2a6829a034cc5 SHA512 bc01136c15d20525276d25885f5de5d8588b5967de21fee7f5017df91fbfa91efa944a43833c0dd3fba89a08fd52176c277ecfd562e1a9694c20f6c1257b094f
MISC metadata.xml 1074 BLAKE2B f14c6ede900b616f5a5514adc9735d25fa834dc879712ab79b68fe15a927cb3e8e77a7b30ee8af3b44551be9ec2368476757c4ec5e5b44fcd266367b485fc8bc SHA512 2e28b3de2b512246ddfb76b547151683c4202620992f9453747b4869db1a16d92996cbf810bf82f09e6895ddc7b23ecc2e0ecaf43d9c3ba9e8a2fb53baa995dc
diff --git a/app-admin/terraform/terraform-0.13.1.ebuild b/app-admin/terraform/terraform-0.13.2.ebuild
similarity index 100%
rename from app-admin/terraform/terraform-0.13.1.ebuild
rename to app-admin/terraform/terraform-0.13.2.ebuild
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index eca483afa2ee..ef61994b1918 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/brotli/Manifest b/app-arch/brotli/Manifest
index 83361d6c5ab5..cbf994dba5ee 100644
--- a/app-arch/brotli/Manifest
+++ b/app-arch/brotli/Manifest
@@ -1,8 +1,9 @@
+AUX 1.0.9-linker.patch 1799 BLAKE2B b082af9af7eb8df80bf86717e9b9511952e77afd649de9bfe9cbf445216d4e9d6a6e34dc065008d0129892240c98bcb6e7beb5443d4c459a1bb77eff664f7245 SHA512 04d5505074e042eca46a8dfd9d9a3a2c9af901d9bf7d98c219e8e1f8c9b9071bccbddfa3e17e86800de2606a10b26dc05d69948cd84ddd3075d6c1c51991bcc2
DIST brotli-1.0.6.tar.gz 23827656 BLAKE2B 8d31eb1c4119de44702f2239fba9db72f1ae81801d06e51716432ff2f8aa78259c52cbd57b8fcd005c1bc14ada81b6e47a35c5d3864bb10bb02d113e30bd321b SHA512 b9847375471de3ae815ef4bb45a29653c343fad0a891a79d5132fcdee34c85caafd82289c8b413c3ef609049f2e8c4af9f9abd1736a2408ba44544c5fefc0010
DIST brotli-1.0.7.tar.gz 23827908 BLAKE2B b9fc554cd23c8387b648638b6f9bb2d29fa87035856d03cf284662f9281984f3bf8e40109e61155ece18673f4391bc0fff704f8ab800a2041d3ce1824478d2ae SHA512 a82362aa36d2f2094bca0b2808d9de0d57291fb3a4c29d7c0ca0a37e73087ec5ac4df299c8c363e61106fccf2fe7f58b5cf76eb97729e2696058ef43b1d3930a
DIST brotli-1.0.9.tar.gz 486984 BLAKE2B 8b9939d5224396ef33b43e019250ba4bc8949903583615e8dc02c85340fc0a1e2d1632161e00b0ee7355d77f05529ac772f482e05d2089afd71a0bf71e803904 SHA512 b8e2df955e8796ac1f022eb4ebad29532cb7e3aa6a4b6aee91dbd2c7d637eee84d9a144d3e878895bb5e62800875c2c01c8f737a1261020c54feacf9f676b5f5
EBUILD brotli-1.0.6-r1.ebuild 1688 BLAKE2B a5ba00d724c413a364167e80954354396c82697704bb7515af35ce1d0f39a06e19a676009483dcef65a6065eeb44bc681aaebaabdf808e07c40d780ac654dcca SHA512 4888fa16c494b1b27698268fd6c01a0736c1feb9b374fe5ab8f12321881205b5e3d78a2e8c24e9f438b9a51d5eadc1126720f79e7114785465f39cbd5f777b85
EBUILD brotli-1.0.7.ebuild 1650 BLAKE2B 5b7f5b52c2d3e44d794de6f4861ed4c590b3be805b46dfbdcd5bd9e617810afbe54996382d2ff79080f7d2d190a0e490597d3c4ada382be831f2fbd24cbcafa3 SHA512 12cc523630b741a34ad72b7f4c5a3c5a04de84055e73252cd5129a3b9f1ec77f7bfea9a6610464c3c80b18587f1bc131d6b1c4272753015be992c52ae351aef1
-EBUILD brotli-1.0.9.ebuild 1658 BLAKE2B 6045fbcf26a87d865c34c2f5264a8cd39b23b1a5c6e2dec319bc7c2604253cf67311796fee76819023b9f37e7f4d83a4c194e27463d26c5d4b3a29431d51bcb5 SHA512 1b5422cd44a1b22ba689b9589e19f4e6d3fa56b2921aefe639d5a13e1c83817f5db7cc389d350a0f34d8ec2c6f616d1bb1f2699b6d5dbc5262fd9888e7b98b89
+EBUILD brotli-1.0.9-r1.ebuild 1705 BLAKE2B 8b0ba70498301bb0147f4b23587ebe6e404a7c853f32a95eae2eb04296f679a4049dcc463a7f58e718bca2e0beafb46fb815f53b4412fef9f1359be56e477835 SHA512 796e677e6bedeb757ddf9254926b7137bac6ffa24553d7c34f69343cd16eebe7caaee3ba45fdfab0a930e677704d4c3442d1503bf99785692f907fa0ea13b5fe
EBUILD brotli-9999.ebuild 1656 BLAKE2B f9f9e46750995bc450b3be52e71571bc76d4d5b02157f1cc50f028c8c68659583cd84e0cdaeef395a9d84e0cd1e474e728ccab522a6a196b3d4cc98ab59c39e0 SHA512 0f54e7839f789f8b89a6fc66a1fe8e4dd845b2e8393ed8990a79d3fd67281ef121fbece382d8f21d4a629404625741763c9cfcb008f55b5a3eccb1bf0914e7cd
MISC metadata.xml 686 BLAKE2B 192c9019f79840dfcc409e8244eac99f3bd793ea91bb8f5f26fcf1a9dbb6ba34273ea2221e0e18322dccec1674929cdf1bfd7ca19628a3e69fc4bdd6f60ba932 SHA512 4057d0834db13baf716500e6d8fa80b9d6ee854f7e9620462ed1162d2bc6ff88d2bb2f81902c6730df337afc38c8eb378fa5b85debd2a5a57597c0faf58132dc
diff --git a/app-arch/brotli/brotli-1.0.9.ebuild b/app-arch/brotli/brotli-1.0.9-r1.ebuild
similarity index 97%
rename from app-arch/brotli/brotli-1.0.9.ebuild
rename to app-arch/brotli/brotli-1.0.9-r1.ebuild
index 89d52f2c2ec4..41f9c0f5016a 100644
--- a/app-arch/brotli/brotli-1.0.9.ebuild
+++ b/app-arch/brotli/brotli-1.0.9-r1.ebuild
@@ -35,6 +35,10 @@ fi
RESTRICT="!test? ( test )"
+PATCHES=(
+ "${FILESDIR}/${PV}-linker.patch"
+)
+
src_prepare() {
use python && distutils-r1_src_prepare
cmake-utils_src_prepare
diff --git a/app-arch/brotli/files/1.0.9-linker.patch b/app-arch/brotli/files/1.0.9-linker.patch
new file mode 100644
index 000000000000..8ecf2e4c9b90
--- /dev/null
+++ b/app-arch/brotli/files/1.0.9-linker.patch
@@ -0,0 +1,47 @@
+From 092446fafb4bfb81738853b7c7f76b293cd92a80 Mon Sep 17 00:00:00 2001
+From: Evgenii Kliuchnikov
+Date: Wed, 2 Sep 2020 10:49:49 +0200
+Subject: [PATCH] Revert "Add runtime linker path to pkg-config files (#740)"
+
+This reverts commit 31754d4ffce14153b5c2addf7a11019ec23f51c1.
+---
+ scripts/libbrotlicommon.pc.in | 2 +-
+ scripts/libbrotlidec.pc.in | 2 +-
+ scripts/libbrotlienc.pc.in | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/scripts/libbrotlicommon.pc.in b/scripts/libbrotlicommon.pc.in
+index 10ca969e..2a8cf7a3 100644
+--- a/scripts/libbrotlicommon.pc.in
++++ b/scripts/libbrotlicommon.pc.in
+@@ -7,5 +7,5 @@ Name: libbrotlicommon
+ URL: https://github.com/google/brotli
+ Description: Brotli common dictionary library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlicommon
++Libs: -L${libdir} -lbrotlicommon
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlidec.pc.in b/scripts/libbrotlidec.pc.in
+index e7c3124f..6f8ef2e4 100644
+--- a/scripts/libbrotlidec.pc.in
++++ b/scripts/libbrotlidec.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlidec
+ URL: https://github.com/google/brotli
+ Description: Brotli decoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlidec
++Libs: -L${libdir} -lbrotlidec
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
+diff --git a/scripts/libbrotlienc.pc.in b/scripts/libbrotlienc.pc.in
+index 4dd0811b..2098afe2 100644
+--- a/scripts/libbrotlienc.pc.in
++++ b/scripts/libbrotlienc.pc.in
+@@ -7,6 +7,6 @@ Name: libbrotlienc
+ URL: https://github.com/google/brotli
+ Description: Brotli encoder library
+ Version: @PACKAGE_VERSION@
+-Libs: -L${libdir} -R${libdir} -lbrotlienc
++Libs: -L${libdir} -lbrotlienc
+ Requires.private: libbrotlicommon >= 1.0.2
+ Cflags: -I${includedir}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 6b14ba285b29..865fc9c77eb6 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 90f37758d6d4..99bc339a3e7b 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -12,10 +12,8 @@ AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad
AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
-DIST heimdal-7.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.5.0.ebuild 4310 BLAKE2B 3a610d8f8a7630b88d005efa0064d47f012fdc9d9e8c6e9eb53dfd8fef464d08a7412cdc012128cc37d0f73ac68cba216c507e0ad47176f2a65ef679c2de74de SHA512 bf8ef7ff7b910d12935399eb1d58c939351d02461e25d1f262d7b6c4fc3ad247e16e5af6099d008e76e0f450d7bb71e32ad981461bf5ca03d3f538d19556b3bd
EBUILD heimdal-7.6.0.ebuild 4515 BLAKE2B 2e703f6d2c54621ac5f630759ed7d58a2f37f2a27a0398bbdde4b18004c9036ff439a0c590324269577f0b62f171b5a11d4ccdab28990b8cabb39a178960725a SHA512 762ae8f768791a57a4896d60ab568a89ca27d7ea48e78ad8a2ff04f289cb1c9f283e735ca4c975db64037bc481e2aebbe8093a24fe000b3f8388ded882017b2c
EBUILD heimdal-7.7.0-r1.ebuild 4514 BLAKE2B d68abb7b643f9fd4542b64f926d9ead25c451acd26787ae14aa3045226fec8995417bb9bd1a1a27e4da5e047e86c613b5673856e9110c545384612d48c8e794d SHA512 9ecb0137d1ac9e33448719f48a630c6b48499a02c5de1f8014d8e31ae7540f46ff3c15579b0126ae4583364a7caa2a2bd853ffc2c77e4b407aa2d04d12adc055
-MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
+MISC metadata.xml 641 BLAKE2B 780be7301a62a4d31503a531c616af03888f4208b55777a0d153dec9e9a911f457fb581c2bf51f18f65d3ffbe3fb3c25fc9f0923539b3f149f4f59ccd412a355 SHA512 324fcc38cf8a389dadc314d2a676e5e9d6b0960b28b2917a50c7b8d0f438114e4575295fcd6bd06ae4e00ab61423b539809dd8f414d3f1a80fe0e6a96579d648
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
deleted file mode 100644
index 0710a88ee3d1..000000000000
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
- )
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
- !berkdb? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? (
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
- eapply "${FILESDIR}/heimdal_tinfo.patch"
- eapply_user
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-kcm
- --disable-osfc2
- --enable-shared
- --with-libintl="${EPREFIX}"/usr
- --with-readline="${EPREFIX}"/usr
- --with-sqlite3="${EPREFIX}"/usr
- --libexecdir="${EPREFIX}"/usr/sbin
- --enable-pthread-support
- $(use_enable afs afs-support)
- $(use_enable otp)
- $(use_enable pkinit kx509)
- $(use_enable pkinit pk-init)
- $(use_enable static-libs static)
- $(multilib_native_use_with caps capng)
- $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
- $(use_with ipv6)
- $(use_with ssl openssl "${EPREFIX}"/usr)
- $(multilib_native_use_with X x)
- )
- if use berkdb; then
- myeconfargs+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myeconfargs+=(
- --without-berkeley-db
- )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake -j1
- else
- emake -C include -j1
- emake -C lib -j1
- emake -C kdc -j1
- emake -C tools -j1
- emake -C tests/plugin -j1
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog* README NEWS TODO
-
- # client rename
- mv "${ED%/}"/usr/share/man/man1/{,k}su.1
- mv "${ED%/}"/usr/bin/{,k}su
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${S}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- find "${ED}" -name "*.la" -delete || die
-
- # default database dir
- keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
index c31b6673e508..a2ba933709f5 100644
--- a/app-crypt/heimdal/metadata.xml
+++ b/app-crypt/heimdal/metadata.xml
@@ -9,9 +9,6 @@