gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /dev-libs
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
236 files changed, 3000 insertions, 958 deletions
diff --git a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
index 9920bcb5065a..b4f12bd147aa 100644
--- a/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
+++ b/dev-libs/389-adminutil/389-adminutil-1.1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -40,7 +40,7 @@ src_configure() {
 		--disable-tests
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc README  NEWS
 }
diff --git a/dev-libs/389-adminutil/Manifest b/dev-libs/389-adminutil/Manifest
index 506a2f92b47f..f31f9c80dfe7 100644
--- a/dev-libs/389-adminutil/Manifest
+++ b/dev-libs/389-adminutil/Manifest
@@ -1,3 +1,3 @@
 DIST 389-adminutil-1.1.15.tar.bz2 283825 BLAKE2B 170797066b25303c6c582c95a935cf1d47b09b28a0c530588322fca2547416eeb5dba48561ccd06b7862dd5066e15abd1dcfeb168a9331e9a7f081bb5a14ae2e SHA512 5ed8d758ee47a2e276bab73696067dd2acd36f15ea5b93b32e3e244530920d74d95a4a4ff96cd325f22ae4ce2cc764fef03c90497c0181cbc1f0291f260d8ddf
-EBUILD 389-adminutil-1.1.15.ebuild 848 BLAKE2B 29411b696588dfd063e7dcb1a36e625d5210750b54f2f81bc36777096bcf544190bbe05c9c281e35f4c3f84c520966e24f8431021b2de31c1543cb567ac78e40 SHA512 4f53deab2a2070d6a3125cba0601a1f4a9635f8d37adec60c07963d0c3622c088cacd0088292bf8b343d61c1a1a57fbe5bbbda7c974cbe1266488c98ff3568cd
+EBUILD 389-adminutil-1.1.15.ebuild 844 BLAKE2B 89392af41b1c564fa9f5d92d1121256d6c135098b0601eeafa0d1de8ae8c189ed281e951783cfc2fb336aeb93d26049ff8a3aba901135c9ff6442bc01283c03e SHA512 576637691dfd37501186e096cfc17c7ba5e785f6e0a2fa7cdf0eceacabe93d1a7e889c6cdcb8ae5ca68bc40ba5c524f633d42099d25eb7d83e7ab63d4a86688e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 05308bff2553..cfb205a8f19c 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/argtable/Manifest b/dev-libs/argtable/Manifest
index 255a15340b49..c42bdd9e3170 100644
--- a/dev-libs/argtable/Manifest
+++ b/dev-libs/argtable/Manifest
@@ -1,3 +1,3 @@
 DIST argtable2-13.tar.gz 3326444 BLAKE2B 8c78d56c2e1a53747cf480808064cb006644db50a2cb38adddd71eff07d4d7f6e5467c54eec4e5cbb729a7f639927b2d3283c6995bde54134d7a85e39788b87c SHA512 3d8303f3ba529e3241d918c0127a16402ece951efb964d14a06a3a7d29a252812ad3c44e96da28798871e9923e73a2cfe7ebc84139c1397817d632cae25c4585
-EBUILD argtable-2.13-r1.ebuild 981 BLAKE2B 2db639e2821c2f2ceaedf116db422aa42c3d83a9107f891d3b722d3b505f7746a7773baede26e7aa89a37daf42b3d22dc695bce586e5f5093fd5bc7ada791d46 SHA512 c8fad5446dedfc74a87c30a8339a61688e5b602470d3490b519117f5394f672a1ad66f8cf021dcdd15fede29d79668753001e1c2e66682eb39f88d429c6c85f0
+EBUILD argtable-2.13-r1.ebuild 985 BLAKE2B daea5a4cbd65927931f152122c6ca8325c5be166666713b9a003f6b0c065a4f8e61cd9218f5e1a7e7f1ea71281b18ae2b82a9f0ced2d2a509b5d2050abf28172 SHA512 e26ddb6b3aad108ee674bded3155b30061b26ea07b5481276f433da9b8af7345ceb198e6b97c8bd67de5a02df5652bc29cadb72ebbcbd505fe3570fb310e7f12
 MISC metadata.xml 243 BLAKE2B 511d8df17d176cde00906a1632ded7f6c0ec20365b356b94f64c68639c12a17c9c9a8073fc96b1c317b87c7bcfbbf0dd19136207002e810ad8012785f347e1a3 SHA512 16366e8cb41b7dad2327025b380ae289217bfd7dea66e1bf4e37a1c850e566b2485e23b2f06d1d5f5e974fb4910ac6ea5f07767c1dee6bf2621572a7f0639b74
diff --git a/dev-libs/argtable/argtable-2.13-r1.ebuild b/dev-libs/argtable/argtable-2.13-r1.ebuild
index bebef16f0f4a..584844fac645 100644
--- a/dev-libs/argtable/argtable-2.13-r1.ebuild
+++ b/dev-libs/argtable/argtable-2.13-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~sparc x86"
 IUSE="doc debug examples static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index ea7e916708aa..32be9c193605 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -3,7 +3,7 @@ AUX check-0.14-xfail-tests.patch 310 BLAKE2B a4b3e9a58ca841cffffa0754ef429db19cf
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
 DIST check-0.14.0.tar.gz 303471 BLAKE2B d602bb56d205eccf06e4177e3f6d3f7270c3a0cba0e1d397480f0409a916ec4118c48340ad6f6a8955ea30d9e22252ff8381a687d000c3f8e62828cf656f1245 SHA512 54ad175c00cf0c73b4386cf6b3d6a404a5da4f57897d099e772f148f410108c44767c3266a940113be73a6861b3f3ee1706c558cc71ec51df99687f19f3a3bb4
-EBUILD check-0.10.0-r1.ebuild 1793 BLAKE2B de8d5422d52a2485db549ef85e5c7b675850f576b41d8529c4e9f1fbf4e163b70037f39a9e08602acf7504389d2d36ef1f7b9bd7ece908bc90b923ca728cf2a4 SHA512 04bfc2874ebeda8d692afc9fab479c02f5327edccec5bbbfa71048ed7d91f4429fbd1adb244897666d139867eb0c78176a06eafee2475562115887de0f296bae
-EBUILD check-0.12.0.ebuild 1784 BLAKE2B b40c29ef7c3ca9968922293a1085dbc2f13b5b07241c8104bdc564024bb0c37f20bffc82eb2ad84038df0d493b42236d229559c39b7b6a11483ca5b8becd19b5 SHA512 cf958f1ee4850b3f9e5063c6260d907520835a7acff2b5bdaad4c4b45189630aa0a93519f78a255ad436609b28dd65bea7b86b55e5028147324dce6bbd514001
-EBUILD check-0.14.0.ebuild 1599 BLAKE2B 2a03604f1bbdd9e915e97991c8d8dcf8f5ed28108c1050aa77e9640d603fee88a1890b1acbfd64c2b11df3fbb03d2d6280d4bc5e39bcc7dc9de516772e3f64e6 SHA512 adaa122d38ddaf81261dede3a4dfeb89a0be4a90cd95f8acf47970f9feda3cbe66ce7722120ff82651363bf0d178c6b82bc5d70b686beacce80750a12f4b259b
+EBUILD check-0.10.0-r1.ebuild 1761 BLAKE2B 1889f3a4e094cb47427656b61316c40a13d7a3fa955d4ccd4ccd6bff18b3506060978810e207435b2624386425f4eb8e20a50000e906f3701790ba881bac8f38 SHA512 4a8d61fe93a71d1b96e36ef198a75e9618447ef00f83b08b1ef73193e4949c2005842fad0fee5d4a6035736a6c28b17a459b0b827dc65cc614399e73a7181ce9
+EBUILD check-0.12.0.ebuild 1752 BLAKE2B d07bbaacefe842f7645d4c02a139807d6da55eb0e1d8d6ea2047600d4c2a34643b3fdd73681b16b4b4bfe07537d680aab5856df538d24e715d1f6898df801a19 SHA512 6ea8c75a193147f7e6251206ccad634bd514d8e225e0d0b5c99cf8cdd86ae9e1561f5487a2ce1d8c4a2a142e72888f73a1b19d0afb2c341bf8824db64f818eb0
+EBUILD check-0.14.0.ebuild 1565 BLAKE2B 8ddb5bd5873146ef0d6eb9cfe54d0e2d362c6e60be36befa7a0f91be0c53b110d3dc1a88c6738ac5c3a83fc09593b20097ea22f7cb72b0830443a01f5df67ebe SHA512 47f8b8e3244b743737526722d586eacb014b0c3f4470307131cf6057a0bc8e31034dc9e50400dd55cb301fa5c55511356c536bb01348edc2d6006b756e005d2c
 MISC metadata.xml 488 BLAKE2B 27eb0323a4d7cac50b2f4ee935c75e7a35c34066a0dbc5bf21f8b4fb93abe82aa79a5fa1fafed0e623417ceaa553dc8395f201a24c3e0123df3104be44106bb7 SHA512 4b69b4b1ca91bfe4b04d03935d3d6e9b8ca10ecaa538884834f357708db5380a90e9cf1fdcef7996b7c4d8a23c0cb8e1d9eb9d34faa584637804ebc67657be69
diff --git a/dev-libs/check/check-0.10.0-r1.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild
index 7ff7e07cf87f..5ebd3f07b8cb 100644
--- a/dev-libs/check/check-0.10.0-r1.ebuild
+++ b/dev-libs/check/check-0.10.0-r1.ebuild
@@ -43,7 +43,6 @@ src_prepare() {
 
 src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		$(use_enable subunit)
 		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 	)
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index d7156aabdd46..5650c9493137 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		$(use_enable subunit)
 	)
 	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
diff --git a/dev-libs/check/check-0.14.0.ebuild b/dev-libs/check/check-0.14.0.ebuild
index c1de319b23d4..8f03514f7580 100644
--- a/dev-libs/check/check-0.14.0.ebuild
+++ b/dev-libs/check/check-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs subunit test"
 
 RESTRICT="!test? ( test )"
@@ -33,7 +33,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-dependency-tracking
 		$(use_enable doc build-docs)
 		$(use_enable subunit)
 		$(use_enable test timeout-tests)
diff --git a/dev-libs/cloog/Manifest b/dev-libs/cloog/Manifest
index 247f1f7dc147..3b84af4c9941 100644
--- a/dev-libs/cloog/Manifest
+++ b/dev-libs/cloog/Manifest
@@ -1,6 +1,6 @@
 DIST cloog-0.18.1.tar.gz 3857324 BLAKE2B 5898cb8d8f36e55dbe38e7866e07c0abaf8ca0b9e619a5ff963ae975148166fc9bb1c77a33aef1ea2014e739e4ea1c37e4bc2ce5e7411d900fb472192e6fed7b SHA512 0b12d9f3c39a2425e28e1d7c0a2b3787287fe3e6e3052f094d2ab6cffeb205ce19044100cbfd805659b3e6b3d21ac2f5a3c92848f476de54edfe6b1cbd2172e9
 DIST cloog-0.18.4.tar.gz 4796456 BLAKE2B 9d1f281abe48d40f726c3fc66c58c0d7cb90f6d3ca47af02c8f00b5cc69c6de6b0362b2dc406a8cb6310e07c6b2991f6de3b6b407ad7db0190b9bc69ac82773f SHA512 d35d67b08ffe13c1a010b65bfe4dd02b0ae013d5b489e330dc950bd3514defca8f734bd37781856dcedf0491ff6122c34eecb4b0fe32a22d7e6bdadea98c8c23
 EBUILD cloog-0.18.1.ebuild 965 BLAKE2B a4fe7196a3dd7d28826deebf962d69b4838d1c1d5a44801f8bd81f581c8c1cba69092507726d681b78b67e0b244dcbe95b5644f9337d0faeab407ac540a0e91f SHA512 6da4148b48455c58a0d747e22c29fd832005401f44fce526a3862eddc78fd08ff20752660c1532523d11f5963d5dfd26070e244853ba6936e07da4e4462d1db8
-EBUILD cloog-0.18.4.ebuild 1389 BLAKE2B b351f559bf71b61a13c7276ccbb3ced5dbd5383e796d942092270f69fac3229fa87bc2eb6b8aaf8ae4519eb2b5a183dcd6d05c7790e306a632b50ef2c8e8835a SHA512 ff484050d26ccda5da9f265c11347c850c09fd361f2567ecadd6636a7dc86af09602aa3063caa55442df52dc5dc2c684c49425719123958c1dd995051432aee9
-EBUILD cloog-9999.ebuild 1423 BLAKE2B d49b09e116b2def2833c51cb36368c4de5a6a93028c4bec106a5fe1b1196db363b621c0be13d1f2183cf45e91e875a41f26af01a62d3c2ec41e1494153453d28 SHA512 c4926861ae72ba72f661140986c2da1fbec32bdc169f7bdc4455ce73e0539741b1f764e94a921aa7061832718d3e33f89384c602dd9338de755613f368adc931
+EBUILD cloog-0.18.4.ebuild 1388 BLAKE2B c0d9d3b84f9a8ce1c85bac64a569be4350d968e39cc5b7b5d5ab1926bb4ba4c045166f7158b0a66cc20dd0842629cd2aa9577e128adffee19eb75a4745f4cb39 SHA512 84115d8527048c535232d1f9642cb7addec06ab6f14b79f64b27609ece154da5605c0116d2caa00426cbe3a4d87d31ac6fabc4504b2ba1f87d9149f9d656b5f9
+EBUILD cloog-9999.ebuild 1422 BLAKE2B f320e80035b1e1995f537e919fda84d0053255aa91882c1951146ab5861af7560038acd2b45defab84685add84b066d117cd499e6da60a1ee0ca178a04c86612 SHA512 c6d6d790c3cfaa59d1dd86df9d39499b70767c91cf09ee46e3b8c818b569c9ffb977f47a56e9f2119bc3e14ed9ec28acb77e8f45e3465a81bce3e2089e16d487
 MISC metadata.xml 221 BLAKE2B 79f6de476af31c1da59c7aeebab26fa0db49c902398f6f73beeca03d3077820240bc51a25d2945642d9a07470470f2ca9548c2d8f1c63a8592966f6df9955926 SHA512 edb14bd2dae6ad57f77c07fc601cf2782589165c7e48e1e123eff7e47044febfdb1e19d18cd0b240fd2ca494e3401b5aa1f1243480769e0faf5dbfa377d20a3b
diff --git a/dev-libs/cloog/cloog-0.18.4.ebuild b/dev-libs/cloog/cloog-0.18.4.ebuild
index 8f6da941a169..32de5f518041 100644
--- a/dev-libs/cloog/cloog-0.18.4.ebuild
+++ b/dev-libs/cloog/cloog-0.18.4.ebuild
@@ -50,7 +50,7 @@ multilib_src_configure() {
 }
 
 # The default src_test() fails, so we'll just run these directly
-multilib_src_test () {
+multilib_src_test() {
 	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	emake -j1 check
 }
diff --git a/dev-libs/cloog/cloog-9999.ebuild b/dev-libs/cloog/cloog-9999.ebuild
index 87fbec10982d..e7da11ae632b 100644
--- a/dev-libs/cloog/cloog-9999.ebuild
+++ b/dev-libs/cloog/cloog-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -52,7 +52,7 @@ multilib_src_configure() {
 }
 
 # The default src_test() fails, so we'll just run these directly
-multilib_src_test () {
+multilib_src_test() {
 	echo ">>> Test phase [check]: ${CATEGORY}/${PF}"
 	emake -j1 check
 }
diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 29c5a287ca13..3f082438a8ec 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -4,6 +4,7 @@ DIST cudnn-10.1-linux-x64-v7.5.0.56.tgz 471291852 BLAKE2B 966a84e983631c827d7852
 DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844a0b5df22420148bcd9092b9ad81a45560f901d36e3ab228e7b5fed85519094f4b68be46cbb631368d67166cbef2546b94185a9058d SHA512 c8d2c6efdb79940f5d475057b1e11246038b894990f58a620635e03d561ec3987806c0bccee8c12d0d3d8c4b5bf5211e46faa2c12918520af61f36bd36eb1738
 DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244
 DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
+DIST cudnn-10.1-linux-x64-v7.6.5.32.tgz 523418497 BLAKE2B 28febb24382d411faa870cd42e999431d1ee1d083c09903ee4a8f5bee676981c60f6daf6cd256978db69345397db743a7a6f6187376520f5c4f968f6177e0201 SHA512 1073bc42c2c36fce6b710882a04a4035d66d95c410200b9d50953e993d7b801cc3a837e42843ad2447e62ea5dfc8ba22c8a803464716c56ffb811aa278645771
 DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6
 DIST cudnn-8.0-linux-x64-v6.0.tgz 201134139 BLAKE2B a7e616c671272a3a0f0c51b93646c8c60302c3dec85b71144e011bc3460d0ce80ff75d39869c05c4ef183d2d09aff31bb470a3fd3fd3d79b581a7a2d5a349279 SHA512 ddeeacb5b449920d942a26b98c353d78fd6f7d7fb3b3ce42a078626473efdda25c7ae641232702d62eb5749e39ecfd03e88346119c920c19348ac3ee82d3ff47
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
@@ -17,5 +18,6 @@ EBUILD cudnn-7.5.0.56.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c1
 EBUILD cudnn-7.6.0.64.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.1.34.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.2.24.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
+EBUILD cudnn-7.6.5.32-r2.ebuild 858 BLAKE2B ce144c670e508c53d1f3d1621616dbf49c1493445058cd027f1920942a5f254c0133fb39e7aef9514284e2fe3a87b0a36770167176c25dc133be945525f3619c SHA512 18c3b7686ab6242a6a6fb5883d0a5484a37fb040be46ffc7087da28a4b1d7913b3eaa6ef9ce2d52194592b4b6a6b79aee302f1c9c9f79c582ea99f853219a9dc
 EBUILD cudnn-7.6.5.32.ebuild 718 BLAKE2B e8fec9a34ff7103a60c8ec7f226d29054c711c13cc127a41abde7620344246edb06139147a769a3b3b0a7fd007765177ed781726a297bd9d013cc2e44e86bdff SHA512 d435be66ef4be1c40885016c5e13d5fd11dbadc4d109f06da5eef3608bd3d57e7b66b54d3f6ea12c6a94a4d91aaf8b8b6fd3872aab7205d4473ea61281cc8182
-MISC metadata.xml 259 BLAKE2B dfc879984b6adce945d0e0a50f6ede2bca87147b9db99491359cdeccc2e74a20d56e14ae8903dbb80c94854f89bee539f14a4e3ce864204e277accf3f124a748 SHA512 19fb78cf4029c154954a40df40e28fc8d98a8b7e6b42f97259f664d44c29b284feffb9d073cadc7f90b5654a64b2466e186cb677d3a11830206f173eb9057706
+MISC metadata.xml 384 BLAKE2B 6c8db23046a505ae05111e6cbba3493cba9ce481b633291c5b43af091c760fab3873b864661e04b2e2850b7fba875358cab7782578166b33e474ee6c52b5ce70 SHA512 059d9339b98bf62a46c1f909e2ef7004f85ca62c04b4a21158d433f062327ae9d55405218e0f0df9b3a3242677f0bda3e9892193c6166897c4b53acc547ce537
diff --git a/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild b/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild
new file mode 100644
index 000000000000..e4c0526676b3
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-7.6.5.32-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+SRC_URI="cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
+	cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )"
+
+SLOT="0/7"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+IUSE="+cuda10-2 cuda10-1"
+REQUIRED_USE="^^ ( cuda10-2 cuda10-1 )"
+
+S="${WORKDIR}"
+
+DEPEND="cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
+	cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux/include
+	doins -r cuda/include/*
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib*/*
+}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index 8425c0d53cb0..f40517d5d330 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -5,4 +5,8 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
+  <use>
+    <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
+    <flag name="cuda10-1">On nVidia CUDA 10.1.</flag>
+  </use>
 </pkgmetadata>
diff --git a/dev-libs/cxxtools/Manifest b/dev-libs/cxxtools/Manifest
index bb9b07974394..4fd68577b521 100644
--- a/dev-libs/cxxtools/Manifest
+++ b/dev-libs/cxxtools/Manifest
@@ -1,3 +1,3 @@
 DIST cxxtools-2.2.1.tar.gz 821324 BLAKE2B 95139a3862a7c2e6652b475527bf0946e0921e0e80fafa0731c3a9ca3dd57a9383ebde080eebdfb80ae572aa5638316ddcf81e032195e162e3aa58289675e643 SHA512 b6dc3f63c39fbbc35af973eea668a44d30673140c72bfa7efbdc21a71816be2983e85312b9213264d4f5162c3e420eedb41974bacb7fe8176f2a069b6f8f6f7b
-EBUILD cxxtools-2.2.1.ebuild 561 BLAKE2B 300a09103623db20c927d1f63839d7832d7c14398256ca1fa24e403e0c90e9c755f4b4809c9555686475e7e5543b755f4b8a5c73d0724f351a80da3e8d330df6 SHA512 372a14580f6ac5e61f43ef44cd4485465cd8b249d32e55e60ca49949c3ac24182e2a678c5ecc76fa2da65e3bc18d03adc77af19b590d6ca2764cd7e373f7aa0f
+EBUILD cxxtools-2.2.1.ebuild 527 BLAKE2B 93a451544631790caa015e69682d33cdd35a8227300a1bb45f9db233450a6cc47da2eaae2be2bf17d620eda62d5abec10d967dbc1cccb7511d5d4ef13e8c2dc8 SHA512 9e191e97d2ddfb7e02843896d3c3e191e0b3fa7628e4a417e980bae2320774bbcea0c391f8b32eeaf8dcdee44068e6a849f9fc863daeee814d56a7fd6db6d3f3
 MISC metadata.xml 243 BLAKE2B 6287033e852823666551691771936aead83e7394d6c41f6f5a43a4c21309300e6fcfd90e8a87a82eb90433f86344426c07f2fb7833e7226d2e3c4df9fda1d2d6 SHA512 f7d6e467a5a96c0afdd42df3c0f3866240defc5bbea5ccddf4c0b1a3c004225af5d46dab67d45a5ac34535391584f3b3727fe79ef6cef1a11413636bbc35cf06
diff --git a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
index 073a9fc92cfb..70a5b32243c0 100644
--- a/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
+++ b/dev-libs/cxxtools/cxxtools-2.2.1.ebuild
@@ -17,7 +17,6 @@ DEPEND="${RDEPEND}"
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		--disable-demos \
 		--disable-unittest
 }
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index b5f9c13993a3..cef7e825cb1a 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -16,6 +16,6 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.27.tar.gz 4111249 BLAKE2B 82c9acce8534521ce5c5806f093e927f1854b4bc4b83ea7db1b32ceaa811adc1a5b6fc16d03233d729194cd603836f6e58de67f915abab2cb74561a80d03f5a8 SHA512 d11549a99b3b06af79fc62d5478dba3305d7e7cc0824f4b91f0d2638daafbe940623eab235f85af9be38dcf5d42fc131db531c177040a85187aee5096b8df63b
-EBUILD cyrus-sasl-2.1.27-r2.ebuild 8126 BLAKE2B 93cc3c17917e5f7e91a690fb26fa6b73f9a353099e735d1b278af1185aa9901b6d20b390e697445f572ceb4f2b42502746f7aa1427e016c776ccdfa14e26fe35 SHA512 7fd236d552cea227efed038acb3b4a6ccc2a9e462fe36756c2d272baa7879b0a5e41fe465ecae3636d4abdb8eb8f81e059b36594ab1c74e103810600d20af6ca
-EBUILD cyrus-sasl-2.1.27-r3.ebuild 8166 BLAKE2B 18f115ba643109c95661f1664c3d8da53f46457abcefa02c5ccf5020121475c3306fb1eaff08671348cf5d5d23a736252c4152d79ee6d309e78abe37eb99e8b1 SHA512 ead3284e2c2e2634ccdd01105d0e77dcd18d2358f644edf728fdde364264fd6e1c661e2010b89162b735c27714eb99da85b2c4ea91c1a5edfa3a16f8e05cbfe7
+EBUILD cyrus-sasl-2.1.27-r2.ebuild 8125 BLAKE2B 1f31f5224c241aa0abbced3c4229da440792cc46c1bd3daf4993a0345fdc87533759ca808022d000e3a617e458a659cc982a6f70cf854f2de6561d6e24edb1a6 SHA512 be797cc879f380e17ce00319e32b33979cf4392d7204bd2f503cc06d5f2ab05af596d60ccd1555ed6ea11bc796394462650b4e639e10a5adfe4cee89e9b6235b
+EBUILD cyrus-sasl-2.1.27-r3.ebuild 8165 BLAKE2B cf0ae484a2a0cb8b2694adc8f5e44b632e5392199eb84e767486d3c2568e940dafb89518688196935189fca297ec05c052ed544fd42a751cb02664a1cb161250 SHA512 0cf1315e43cf5a7c0baaee21766ce001f169948b1a7b360d732bb299f58a968de0a18aed981f5a2b4a23f36d811f56df529c62acbbe87ce77d38004ddd94ef79
 MISC metadata.xml 630 BLAKE2B b24d644395a824cc17a25bef92679a2dd50656722223ded02b3311cd9b386470f4f2dafe8c8d604fd042a096d8f0f2d532e2bbc261e3c0affe4dc8d7a1db816c SHA512 45178682e8cfab5eda20e3244f42ce37be7f0e16c87405d0a1e198f561a73f8105df384055f6f228864030f4a196dcdd6b2eaf51b65b7e49f84827df9b56fba4
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
index 56229e40dfb3..073334c252cd 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r2.ebuild
@@ -232,7 +232,7 @@ multilib_src_install_all() {
 	fi
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Generate an empty sasldb2 with correct permissions.
 	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
 		einfo "Generating an empty sasldb2 with correct permissions ..."
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
index 6db032431f6a..c27466f0e5f7 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.27-r3.ebuild
@@ -233,7 +233,7 @@ multilib_src_install_all() {
 	fi
 }
 
-pkg_postinst () {
+pkg_postinst() {
 	# Generate an empty sasldb2 with correct permissions.
 	if ( use berkdb || use gdbm ) && [[ ! -f "${EROOT}/etc/sasl2/sasldb2" ]] ; then
 		einfo "Generating an empty sasldb2 with correct permissions ..."
diff --git a/dev-libs/dmalloc/Manifest b/dev-libs/dmalloc/Manifest
index ef96158fe2a9..0458d41a22c2 100644
--- a/dev-libs/dmalloc/Manifest
+++ b/dev-libs/dmalloc/Manifest
@@ -4,7 +4,5 @@ AUX dmalloc-5.5.2-cxx.patch 546 BLAKE2B 6f85a3024d417c81f3a4dd4f50cf444f09eb3b53
 AUX dmalloc-5.5.2-string-macros.patch 367 BLAKE2B 7fd3e6ae9b4564ec519da953c5116b9a8d19fa446c1d3e24ff736ce3725fd7425881dc07272a3f5dbdee1202e1dac8f68f19266296f5c8335976e5287fa90ddc SHA512 61d0015e7997ecad97e722a1b308ec90e996e9d53b9f475c911f1d9eb929d8007881e52699e9f3427c5cecb9f0b2d202d12a7d607d23434913afbef455f08617
 AUX dmalloc-5.5.2-threads.patch 165 BLAKE2B fee0be1573996dc7460735a94c645989db6fb9570e1140ec64e87e4bddd6b84227d072454bd64c4e0f261e81da0dd27a6ebf310b60e8a74539a21f83370e291f SHA512 b561c715c19604128c046b36bfe09794922176ce1cd12947da277631a410bbc19c5a1f7e998f0b61d7564e3b7516bee0fb4deddb13e036bb9e667f3502e56d0e
 DIST dmalloc-5.5.2.tgz 666608 BLAKE2B 9371b35b9a39706215ff2fc4e31510dafa30a86dccb2290563a2c8a0e7211372dca419dd7d549011548853f1e168fe15c55361d763d27230c547c93113de823e SHA512 96bb94aeb2bc3220f652b5294bdf8592b984cb2a53e5f02b2b8d52450c3396d18651f334644cdfff9c85a8c0d0cedc7f6a18b9d70497b2c6b5f85dbd1e827b93
-EBUILD dmalloc-5.5.2-r4.ebuild 1748 BLAKE2B aef0033cb619ecc10d33f9df522511cf474fe301dd13744296f47e63cee8ed8b0c3260ec9b3f72d6f9f1ac43e8a3969d38266033503e55ae2062925300a24d6b SHA512 71f332fac105c7b841f3423780da48140085a869fb9fb4900fb7dba1611ab5366174ab0f4a5283e065d2ab7dc66529edf1b93acbd3be94e7d6ba84eea8972788
-EBUILD dmalloc-5.5.2-r6.ebuild 1917 BLAKE2B 6dbf2c082f2df90608a33b1fa4a50061aee3508566984db4528c160ebe178eba2d2ebae53d9743078dfcbed908042012dee5e4552fe236f01a9f4d46d3c0edcc SHA512 1ce8b6da26b199f499ad88101b3392e998dd52e05c9fb30666221a146833eeebf03a8bc1da47a8867358abde0ac0a4bf7441bbc77ab072d66c7c68290f8c5fde
 EBUILD dmalloc-5.5.2-r7.ebuild 1857 BLAKE2B dceabac7feac1a370db5ac445857b8631bd33e3887f5020392cf86e22632a60aaf283cf57dc8fe8a463423606b67f57fb55f28fe35f74ae3ed4275c90a32e870 SHA512 03698f59a9e72ba87bf6bfacdf182c24485a2fc1afa3ea51ebe79d2500241da161ab1c8fb311b83b3305981617439590491219667a580fd755f8ac9624de9d12
 MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
deleted file mode 100644
index 0e973b234971..000000000000
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r4.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils multilib
-
-DESCRIPTION="A Debug Malloc Library"
-HOMEPAGE="http://dmalloc.com"
-SRC_URI="http://dmalloc.com/releases/${P}.tgz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="static-libs threads"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-DOCS=( NEWS README docs/NOTES docs/TODO )
-
-src_prepare() {
-	# - Build objects twice, once -fPIC for shared.
-	# - Use DESTDIR.
-	# - Fix SONAME and NEEDED.
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch
-	# - Broken test, always returns false.
-	epatch "${FILESDIR}"/${P}-cxx.patch
-	# - Add threads support.
-	use threads && epatch "${FILESDIR}"/${P}-threads.patch
-	# Respect CFLAGS/LDFLAGS. #337429
-	sed -i Makefile.in \
-		-e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \
-		|| die "sed Makefile.in"
-	# - Run autoconf for -cxx.patch.
-	eautoconf
-}
-
-src_configure() {
-	econf --enable-cxx --enable-shlib $(use_enable threads)
-}
-
-src_compile() {
-	default
-
-	cd docs
-	makeinfo dmalloc.texi || die
-}
-
-src_test() {
-	emake heavy
-}
-
-src_install() {
-	default
-
-	newdoc ChangeLog.1 ChangeLog
-	insinto /usr/share/doc/${PF}
-	doins docs/dmalloc.pdf
-	dohtml RELEASE.html docs/dmalloc.html
-	doinfo docs/dmalloc.info
-
-	# add missing symlinks, lazy
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*}
-
-	for lib in cxx th thcxx; do
-		dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so
-		dosym lib${PN}${lib}.so.${PV} \
-			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
-	done
-
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN}*.a || die
-	fi
-}
diff --git a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild b/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
deleted file mode 100644
index 89f15be52534..000000000000
--- a/dev-libs/dmalloc/dmalloc-5.5.2-r6.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="A Debug Malloc Library"
-HOMEPAGE="http://dmalloc.com"
-SRC_URI="http://dmalloc.com/releases/${P}.tgz"
-
-LICENSE="CC-BY-SA-3.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="static-libs threads"
-
-DEPEND="sys-apps/texinfo"
-RDEPEND=""
-
-DOCS=( NEWS README docs/NOTES docs/TODO )
-
-src_prepare() {
-	# - Build objects twice, once -fPIC for shared.
-	# - Use DESTDIR.
-	# - Fix SONAME and NEEDED.
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch
-
-	# - Broken test, always returns false.
-	epatch "${FILESDIR}"/${P}-cxx.patch
-	epatch "${FILESDIR}"/${P}-ar.patch
-
-	# - Add threads support.
-	use threads && epatch "${FILESDIR}"/${P}-threads.patch
-
-	# strdup() strndup() macros
-	epatch "${FILESDIR}"/${P}-string-macros.patch
-
-	# Respect CFLAGS/LDFLAGS. #337429
-	sed -i \
-		-e '/libdmalloc/ s:$(CC):& $(CFLAGS) $(LDFLAGS):g' \
-		-e 's|ar cr|$(AR) cr|g' \
-		Makefile.in || die
-
-	# Run autoconf for -cxx.patch.
-	eautoconf
-}
-
-src_configure() {
-	tc-export AR
-	econf --enable-cxx --enable-shlib $(use_enable threads)
-}
-
-src_compile() {
-	default
-
-	cd docs
-	makeinfo dmalloc.texi || die
-}
-
-src_test() {
-	emake heavy
-}
-
-src_install() {
-	default
-
-	newdoc ChangeLog.1 ChangeLog
-	insinto /usr/share/doc/${PF}
-	doins docs/dmalloc.pdf
-	dohtml RELEASE.html docs/dmalloc.html
-	doinfo docs/dmalloc.info
-
-	# add missing symlinks, lazy
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-	dosym lib${PN}.so.${PV} /usr/$(get_libdir)/lib${PN}.so.${PV%%.*}
-
-	for lib in cxx th thcxx; do
-		dosym lib${PN}${lib}.so.${PV} /usr/$(get_libdir)/lib${PN}${lib}.so
-		dosym lib${PN}${lib}.so.${PV} \
-			/usr/$(get_libdir)/lib${PN}${lib}.so.${PV%%.*}
-	done
-
-	if ! use static-libs; then
-		rm "${ED}"/usr/$(get_libdir)/lib${PN}*.a || die
-	fi
-}
diff --git a/dev-libs/editline/Manifest b/dev-libs/editline/Manifest
index 63b8eb6080a9..494eecb895fb 100644
--- a/dev-libs/editline/Manifest
+++ b/dev-libs/editline/Manifest
@@ -1,4 +1,6 @@
 AUX editline-1.16.0-rename-man.patch 466 BLAKE2B 0fa3edfe0733d2a72fe2bed1c03dfb0ff3f14cac9b33d6258a19489cb5db3b97b2fed3d6fd9c2fe3b350db102f287ade6006627ec92a3e956309550e3af218a6 SHA512 2226b4312f13d433248d705d6abf6ba77e71bebdf1774af131909139856541bdcac4e7483a8e2e38b3e9f009016bc6b36838519fcf423ba9562020d97dd6cfcf
 DIST editline-1.17.0.tar.xz 252508 BLAKE2B 4e59de72a7c8e6d538685b01c32b55283ec9244927d79848bf5277beb8095fc125289c61c6c6e02cda8821df481d5f926569512030c42cd50bc8f5a050bb89d8 SHA512 e8a519d5380a84913e1438ac0cd52400078457be5dcfa4eadc7112d7c2c4ff6601b8e3da4eef55296b42c6e9b5ed5fb269698dd62c4542eef824b6dd262ddd5c
+DIST editline-1.17.1.tar.xz 252196 BLAKE2B ae25ebc8efcc5ddf7d68553b6a5d93738e4fbf67c556b4089ace7386cb70058f36137d99df2385e324b36a285aa319b49e1c2eb82059d99d511c43c70f55ce11 SHA512 9b3f5f4a833e9e38c4f99d2e7f8d2716d4db74b6a2d3362e6c513505ff17a79044496405458835d508efd79cbe9046f3c1db602aaad210926312c22057145d35
 EBUILD editline-1.17.0.ebuild 779 BLAKE2B 720abc5941aece6f32b6380f048aa093ebfddccbbea9f7180ee96946be614eef95248981d53f3c993cf7c83f0eea22e52b7f16653e4e6ba87b2bbf6fc7332774 SHA512 16b833462f06fe21d320a0e74aed88958e5992fd73a6dd6b061a2fca604bd8a8b10a81c17acb1268aac69a3571a9fc66c6e3a899c909b19518c242428904a699
+EBUILD editline-1.17.1.ebuild 779 BLAKE2B 720abc5941aece6f32b6380f048aa093ebfddccbbea9f7180ee96946be614eef95248981d53f3c993cf7c83f0eea22e52b7f16653e4e6ba87b2bbf6fc7332774 SHA512 16b833462f06fe21d320a0e74aed88958e5992fd73a6dd6b061a2fca604bd8a8b10a81c17acb1268aac69a3571a9fc66c6e3a899c909b19518c242428904a699
 MISC metadata.xml 214 BLAKE2B 0a2601c4b6c8aa8569cb5a07bd8a19ec844dea5b7a16b8f8c7ad700e280d9ecdecbd79ab5aa27dddde5f03a6f6c2b2ca46187b695bc93eb1454a58b9976fd4d1 SHA512 9995eb1c11ee28d6d8cff9eda811942251d44756be7438853ccac23f92da6ab17d9502ef4e259728a11e6627dc7d2dcaadb295895db2cf87436dd8a6330bf1f1
diff --git a/dev-libs/editline/editline-1.17.1.ebuild b/dev-libs/editline/editline-1.17.1.ebuild
new file mode 100644
index 000000000000..2846c63aa397
--- /dev/null
+++ b/dev-libs/editline/editline-1.17.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="line editing library for UNIX call compatible with the FSF readline"
+HOMEPAGE="http://troglobit.com/projects/editline/"
+SRC_URI="https://github.com/troglobit/editline/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+PATCHES=("${FILESDIR}"/${PN}-1.16.0-rename-man.patch)
+
+src_prepare() {
+	default
+
+	# To avoid collision with dev-libs/libedit
+	# we rename man/editline.3 to man/libeditline.3
+	mv man/editline.3 man/libeditline.3 || die
+}
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+
+	# package installs .pc file
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/fcgi/Manifest b/dev-libs/fcgi/Manifest
index 2dc30c4bcf1c..e5bb29e1581a 100644
--- a/dev-libs/fcgi/Manifest
+++ b/dev-libs/fcgi/Manifest
@@ -5,5 +5,5 @@ AUX fcgi-2.4.1_pre0311112127-gcc44.patch 202 BLAKE2B e1c215ce690abb22799050b562a
 AUX fcgi-2.4.1_pre0910052249-link.patch 850 BLAKE2B e56ffa28035ecc8892d64dc097560068c61d7f6f9cd3b84a23b92f22b646cb73eeb5b81e2275e86ece868f9c7d83757a7fc0366596a718f170c6da0b7fdd351a SHA512 6180201e3ac7e9fe659b281cc612ed7d6d58acc17f670feba843931c5b038a7d08e75a9f24b098413bc309cb1cdbc6b96ba77f6f1fb43e47066815937d622b52
 AUX fcgi-2.4.1_pre0910052249-poll.patch 2469 BLAKE2B b1c16bf0ff35d1ccb62d006e4e846b55a1ebafd549c53952784fd3fdd744574a2db332ed06740e3a5d519515355335df1e2310bb3744a95753b821a434721bcb SHA512 3c00be90012bb7b9aabcce0eb014b2b0a8ec0bb8d4a44389237ae1c88fd46129e7686b035a427177545762275c30151c8a1037258b409486706a7f3a64db70b1
 DIST fcgi-2.4.1-SNAP-0910052249.tar.gz 614929 BLAKE2B 243125c2e815ccc505b23ea1be153c304a3174e5285583bb8be5411f624bedba76ebcb61389c0c4178a497678af6aeba4b8b840dda2d83c4638de6e1dc85b69e SHA512 7ae7542ef0934f44d8c7a120366a5cd92639d0bc283a16be320c9218a73a0302c961cc004074e3915209690f1e2b67fc234c9ba55d35af11e31566d79f081c87
-EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1286 BLAKE2B 6a9ce31957d134ab12dd2141dae4078f90ae6dc71be83e1aa80df1b3a90aad5b8f19cd75a76a27341b2051a42401dc4e7f82b9b638218969d928de79fae1fa8f SHA512 cf52c3e99793ef4b2308b77c179da14ec67a3ec0bb5f3a0e78092e5b34e74bd0039580ae0bde3033ae9659023727b3f63c87b8c915a005b188fa37c6ef45dd39
+EBUILD fcgi-2.4.1_pre0910052249-r2.ebuild 1265 BLAKE2B 9d708272f141b7aa74e5021872c7574a4f3c16e6b54f8eda02f7d7d5708796f955fd05e4c55755ae997d578e14b5eaed5e4dde400a52890bb7632594228e760f SHA512 7d2076a522f4358ba92644ed79be59564d3b6cb1e8d430831444dc3006423231f4c485813161905f5bbd6c528cad495de7125054a68e3dbae82b60a1d35b940a
 MISC metadata.xml 322 BLAKE2B af18d8a4fc584c7512d4967123df7e5785e1efde8475c8d73277a244b67c00e0b80b30ddc8de15844beedbb454aeda583bb6021c8d3e2c681ffd529fbd9dd01f SHA512 d4d683173a6acb775871efc762823f186867e446c931714e8b04475a7982845e2d8152d871f123a1c8b08e7af307c7d1453c0309c26f7e6da131f120e1c29c7b
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index ce2b68111c93..2cf2e56dae2c 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit eutils autotools multilib
+inherit autotools
 
 DESCRIPTION="FastCGI Developer's Kit"
 HOMEPAGE="http://www.fastcgi.com/"
@@ -14,38 +14,43 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="html"
 
-DEPEND=""
-RDEPEND=""
+S="${WORKDIR}/${PN}-2.4.1-SNAP-0910052249"
 
-S="${WORKDIR}/fcgi-2.4.1-SNAP-0910052249"
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.0-Makefile.patch
+	"${FILESDIR}"/${PN}-2.4.0-clientdata-pointer.patch
+	"${FILESDIR}"/${PN}-2.4.0-html-updates.patch
+	"${FILESDIR}"/${PN}-2.4.1_pre0311112127-gcc44.patch
+	"${FILESDIR}"/${P}-link.patch
+	"${FILESDIR}"/${P}-poll.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/fcgi-2.4.0-Makefile.patch"
-	epatch "${FILESDIR}/fcgi-2.4.0-clientdata-pointer.patch"
-	epatch "${FILESDIR}/fcgi-2.4.0-html-updates.patch"
-	epatch "${FILESDIR}"/fcgi-2.4.1_pre0311112127-gcc44.patch
-	epatch "${FILESDIR}"/${P}-link.patch
-	epatch "${FILESDIR}"/${P}-poll.patch
-
+	default
 	eautoreconf
 }
 
-src_install() {
-	emake DESTDIR="${D}" install LIBRARY_PATH="${ED}/usr/$(get_libdir)"
+src_configure() {
+	econf --disable-static
+}
 
-	dodoc README
+src_install() {
+	emake DESTDIR="${D}" install LIBRARY_PATH="${ED}"/usr/$(get_libdir)
+	einstalldocs
 
 	# install the manpages into the right place
 	doman doc/*.[13]
 
 	# Only install the html documentation if USE=html
-	if use html ; then
-		dohtml "${S}"/doc/*/*
-		insinto /usr/share/doc/${PF}/html
-		doins -r "${S}/images"
+	if use html; then
+		docinto html
+		dodoc -r doc/*/* images
 	fi
 
 	# install examples in the right place
-	insinto /usr/share/doc/${PF}/examples
-	doins "${S}/examples/"*.c
+	docinto examples
+	dodoc examples/*.c
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index e3410fa0056c..dca58927fdb9 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,8 @@
 AUX 0.12.1-conditional-tests.patch 1342 BLAKE2B 6e6724ecd63771c3ff417d82cced0230d4e7ab4efeae57af193b4b6310bdaf6239a8341067619c96495a2a81c2868f563d1b0961aa7850b7500f9956043260cf SHA512 6098ea44375d56c3e178e9f3c0cf563ecef5aec5bf2a8e6ec5f0da067b9174b2a0d3cb1f99fac2985976324bca1859429d64545790807f948a5b0b6f8bf071c5
+AUX 0.12.1-meson-0.53-compat.patch 1381 BLAKE2B f1fc6a54113dcac1f3a76970d1b3a2558fa48971e5f7e2ef8723f91aaf423fa383aefb04a833cc507057982e8305475068b58dbcdf1c1ec0711c520ede591bff SHA512 da08c17dc2ada2ef48970f30859f42b7117e765294349137651ccf46006ddd465b89dbacbfd41c6fefb4135f691d37146708250f060e9d4089d4f20c6cbb42fb
+AUX 0.12.1-meson-0.53-compat2.patch 763 BLAKE2B 280b3b9801de593136006c1129a68b05db3e8e551d4286c081906a7c254c1dbebf0afb7a35a4839792b19bdaa620a5b77904e4193bcfeff54edffc821270f21c SHA512 33fd46de823df0f0ad27402b0f69c72f41da6c6f9ecd382dc84454ac413781e884dc349c72c5ee5db0a3b24d4828a70a2af5e0f2574f80f6718a679eccc789b7
 AUX 0.12.1-no-tracker-tests.patch 633 BLAKE2B 80f324c784248d5a25ddf70f82ec57c7ff4699f83805df96700f4013795afccd3dd098b4fae86c60381f31b6196d4beebbbd5f196663bda1796ffbf556e4b8d9 SHA512 3e37b6c6abc17aa0ae95f0d33042dc454328cfdc0ef4ebe035f7eacee65bad69db01fa6bc6493026d2a8ccd7ab030d1736cea2247b246f7296eefb1740a838df
 DIST folks-0.12.1.tar.xz 522688 BLAKE2B 584957b628e286b850ee45c3f79d942ae602124e0130eeddc8806ae6fc12accd26c140df5caa0a1a68c84bff707df785d863d2f69ee9a0b6b450b8159c21fb39 SHA512 f60e993508137b33602ccc814bde45ad780d61afb0566f8175fd01b3dcaa5f5771e11d98156c4ecfd85f920a7adc140a5b2582eaaa97568b8fb3b3761668decb
+EBUILD folks-0.12.1-r1.ebuild 2642 BLAKE2B a7659b25df6c548b8d09d4996008023b78da9a594173bce759b3577c8661c2d02c0695955b2f00d5ea6799408654a87308a7044b12420546f28420dea350c1e4 SHA512 3090da11ad71eb9dbec0a4b43a34de3300e2473e52a792918df3a9ecc22e329dc0902a0c8f4947fd19b81969b3eb9fb9cbcf0ccc7e3f71d7adc86ddd5203e4d7
 EBUILD folks-0.12.1.ebuild 2418 BLAKE2B 5535c5ab78643462090c1613e028f0976d512a837788c3f07347cfefbd7795d5b5c2288d6bd38b0b9c0f8bccba4f7ba63b629fdf8bdc2451c86962964e5b6849 SHA512 9780b550f38d7178a3c4b429db12e505974942a858a3e633a711a67eea4dcc66bb1962c954717f6ea710b182a01a9fc227d7de01badab7e6e19245456643b900
 MISC metadata.xml 477 BLAKE2B 59650bcd983e214f924509b128b6bfd45cd015bd3f98417716d366f9a05d932b0feacff410381db14afa18da12fcfaf09c0da2fb2f122e110a6a0858c6f2bd6d SHA512 eb009ee1180b529978596f9a838454f9226906ebd7f0218e29545326222cf04b08efad06e88bd6ab66fc7486022e4f27bb234f4709ac499f1b7df77276709423
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
new file mode 100644
index 000000000000..56f9543ba40a
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat.patch
@@ -0,0 +1,47 @@
+From 1853567d79024c6ce960d9dc187cff8aaf9a37ce Mon Sep 17 00:00:00 2001
+From: Niels De Graef <nielsdegraef@gmail.com>
+Date: Mon, 3 Feb 2020 08:57:52 +0100
+Subject: [PATCH] meson: Use python.dependency() correctly
+
+From https://github.com/mesonbuild/meson/issues/6470:
+
+> So, to further clarify, passing an argument to
+> py_installation.dependency() should be an error, since this method
+> will only ever return a python dependency (for embedding python
+> itself, etc.) and not dbusmock or anything else.
+
+Fixxes https://gitlab.gnome.org/GNOME/folks/issues/119
+---
+ meson.build | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index d5115e28..f3644457 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,7 +1,7 @@
+ project('folks', [ 'vala', 'c' ],
+   version: '0.13.2',
+   license: 'LGPL2.1+',
+-  meson_version: '>= 0.49',
++  meson_version: '>= 0.51',
+ )
+ 
+ gnome = import('gnome')
+@@ -132,8 +132,11 @@ if bluez_backend_enabled
+   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
+   # Needed for the BlueZ tests
+   pymod = import('python')
+-  py_installation = pymod.find_installation('python3')
+-  python_dbusmock = py_installation.dependency('dbusmock')
++  py_installation = pymod.find_installation('python3',
++    modules: [
++      'dbusmock',
++    ],
++  )
+ endif
+ 
+ if import_tool_enabled
+-- 
+2.20.1
+
diff --git a/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
new file mode 100644
index 000000000000..40c3ca601f05
--- /dev/null
+++ b/dev-libs/folks/files/0.12.1-meson-0.53-compat2.patch
@@ -0,0 +1,31 @@
+From f8a59fb6bf12be06595c94d0b00afed4e1d2f1ee Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Sun, 23 Feb 2020 19:28:51 +0200
+Subject: [PATCH] meson: Conditionalize dbusmock check to tests being built
+
+---
+ meson.build | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 74320634..64f28d2b 100644
+--- a/meson.build
++++ b/meson.build
+@@ -131,12 +131,14 @@ endif
+ if bluez_backend_enabled
+   libebook_dep = dependency('libebook-1.2', version: '>=' + min_eds_version)
+   # Needed for the BlueZ tests
++  if get_option('test')
+   pymod = import('python')
+   py_installation = pymod.find_installation('python3',
+     modules: [
+       'dbusmock',
+     ],
+   )
++  endif
+ endif
+ 
+ if import_tool_enabled
+-- 
+2.20.1
+
diff --git a/dev-libs/folks/folks-0.12.1-r1.ebuild b/dev-libs/folks/folks-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..633ff457fbe2
--- /dev/null
+++ b/dev-libs/folks/folks-0.12.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+VALA_MAX_API_VERSION="0.44" # tests-utils fails to build with newer with v0.12.1
+
+inherit gnome.org gnome2-utils meson vala xdg
+
+DESCRIPTION="Library for aggregating people from multiple sources"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/25" # subslot = libfolks soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
+
+IUSE="bluetooth eds +telepathy test tracker utils"
+REQUIRED_USE="bluetooth? ( eds )"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-libs/glib-2.44:2
+	dev-libs/dbus-glib
+	>=dev-libs/libgee-0.10:0.8[introspection]
+	>=dev-libs/gobject-introspection-1.54:=
+	telepathy? ( >=net-libs/telepathy-glib-0.19.9 )
+	tracker? ( app-misc/tracker:0/2.0 )
+	eds? ( >=gnome-extra/evolution-data-server-3.13.90:= )
+	dev-libs/libxml2:2
+	utils? ( sys-libs/readline:0= )
+"
+# telepathy-mission-control needed at runtime; it is used by the telepathy
+# backend via telepathy-glib's AccountManager binding.
+RDEPEND="${DEPEND}
+	bluetooth? ( >=net-wireless/bluez-5[obex] )
+	telepathy? ( net-im/telepathy-mission-control )
+"
+BDEPEND="
+	>=dev-util/meson-0.49
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( sys-apps/dbus
+		bluetooth? ( dev-python/dbusmock ) )
+	$(vala_depend)
+	telepathy? ( net-libs/telepathy-glib[vala] )
+	eds? ( gnome-extra/evolution-data-server[vala] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-conditional-tests.patch # Allow not building lots of test executables when tests are disabled
+	"${FILESDIR}"/${PV}-no-tracker-tests.patch # TODO: Tracker tests fail; this removes them for now
+	"${FILESDIR}"/${PV}-meson-0.53-compat.patch # https://gitlab.gnome.org/GNOME/folks/issues/119
+	"${FILESDIR}"/${PV}-meson-0.53-compat2.patch # Don't require dbusmock if tests aren't built (with our downstream conditional-tests patch)
+)
+
+src_prepare() {
+	vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use bluetooth bluez_backend)
+		$(meson_use eds eds_backend)
+		-Dlibsocialweb_backend=false # not packaged
+		$(meson_use eds ofono_backend)
+		$(meson_use telepathy telepathy_backend)
+		$(meson_use tracker tracker_backend)
+		-Dzeitgeist=false # last rited package
+		-Dimport_tool=true
+		$(meson_use utils inspect_tool)
+		$(meson_use test)
+		-Dinstalled_tests=false
+		-Ddocs=false # Needs find_program sedding to specific version; only dev docs, don't bother
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index 178eed2173e9..701cca0c26e5 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -1,5 +1,3 @@
-DIST fribidi-1.0.7.tar.bz2 2074943 BLAKE2B 9f2fccf46073c097ce89ab0b4ba640440b285e538a15a0ec3f8aba62ee5e892431e909c29fdcb793167eaea09fd4673ac33fbe12c7306ff9d26cbf871b9f565d SHA512 c7a1834eb5e79e337b31c62b75e9ab61f761cc5d6eef5c9ac9610f69ed044ce9d2d2efac150cad167eea3e1d573b27765e5d01abc4b4f9e43c7903d5980ba8c0
 DIST fribidi-1.0.8.tar.bz2 2077095 BLAKE2B 2b9a0887a02bf6bdd7f285aa1df012e5e8f675fc930b612f53a2cce5ef4ef275610ce9a1aec9debf4c5239164fdab4b175e36f8f07288949adf2496d01c95f67 SHA512 d66b1524b26d227fd6a628f438efb875c023ae3be708acaaad11f1f62d0902de0a5f57124458291ef2b0fcd89356c52ab8ae5559b0b5a93fa435b92f1d098ba2
-EBUILD fribidi-1.0.7.ebuild 839 BLAKE2B 5f947437b5bc37327ffc6ac2ba15d06b8e5de9565b8cf4c4cc5d237d9dd49601dcd76c9e17d1b853d5e635e24cd4906eda2ed15d67449fbc20145713f96e74cc SHA512 a82c413dda8e8d5e2aa335c23f72ea5dacf47877d707942cc2babfb619889dafc4732937429eb915059d88d59ac698ee2d1e537260f231d0e041e388c0f01295
 EBUILD fribidi-1.0.8.ebuild 1006 BLAKE2B 3df89a6817664b4818861fcf53456c0e99868f80ea69bb2bd42d6c941495d6bcd16ca49029657e553beef4b2cb4e744a3c74efd06c0956416c09ec9249d08384 SHA512 d3d16c12a225057fbe8f73ac436a7c40a27dd2dcbd293e2e4942e8afaef3f5e33403a06b0ffd72b160941a3435a800bc896eaac1ef8b16e5cf1257888a98b320
 MISC metadata.xml 341 BLAKE2B 5270be41f2666b559cee776629574ac71d81f82d273992d8377febd5c22418ef3ed933214a02a39a8de6cdbd4730d2abf547f001cf1d86c9c40b1a344880d276 SHA512 70b910d1fc10d8c0750618d8e6c1b2722a377f71042539f2400d6364a61483bd270d58e3a8f4f4f46f1a018d239902157b0a1d4aaf9e32b33346136f093f40a8
diff --git a/dev-libs/fribidi/fribidi-1.0.7.ebuild b/dev-libs/fribidi/fribidi-1.0.7.ebuild
deleted file mode 100644
index 132e07ad38de..000000000000
--- a/dev-libs/fribidi/fribidi-1.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
-HOMEPAGE="https://fribidi.org/"
-SRC_URI="https://github.com/fribidi/fribidi/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha arm s390"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND=""
-BDEPEND="
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-"
-
-DOCS=( AUTHORS NEWS ChangeLog THANKS ) # README points at README.md which wasn't disted with EAPI-7
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-shared
-		$(use_enable static-libs static)
-		--disable-debug
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 17a372902e20..734ef4e645ec 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,5 +1,9 @@
 AUX 2.60.7-gdbus-fixes.patch 10740 BLAKE2B 0e42e8444c6308aebdeb240c935969015758bef744a21c4fa9d87eec6e52c0422660ad8ce6f2a2c1caf66369b66e8e7979345449a5322f37bed54f607df82473 SHA512 dbee2969935cb3d24d9bd518c78a02b815ff3bb468d1b04acef50ccd8dd5c38b7121a12f69df51d8a6f9944342e3101fe0bf5b3d87e3ae9e65257238769548eb
+AUX CVE-2020-6750.patch 29371 BLAKE2B df3061eaa5de4115143d52fac6663c791bd5f1d1d3272d4311f49119896bee94fce9035b315dafd267164664bc9fb11798edb6f98975df2ce26f742acf00b1d6 SHA512 6f3da1db841503072d6f88b188ffa869eb07bfb918286ddbce780f114cae2da0024202a166a4b3913b51aa070cd1a98a9993f2516762e2bc2114122731a9720d
 DIST glib-2.60.7.tar.xz 4590568 BLAKE2B a3f2a3bd0443a27326e8359c2ad1e6022ca1634f5c7cb4502a8011fbe85df690fff7d67665cf160bf4ed426214b87f6501a69158fb1656bdb86cacdcf076ee15 SHA512 d56d805a5abf6f7aeb8bf5be06b60ad049177ee23f78eacef4ce2ea88a8be49966a95e48fed17c752649f6e80937fd0ebc8f959709f623ec1f2f43ffd42d078a
+DIST glib-2.62.5.tar.xz 4702492 BLAKE2B 03e04cb149b3301959013c5db20b1f3606951ed80105e0580d40177586a5834afb975ace0d25d5311fd63d29a48129128bdddf29a808e371f1400c00033be1a3 SHA512 2f99422ff8245524aabdb52f5d388ef4bde0fc075eab24499b4023f6ca143b80a74e265117b9e7a9de68a347b0c7eaa8655c836d7bbb63d54cad5c6dda630371
 EBUILD glib-2.60.7-r1.ebuild 10217 BLAKE2B 9e5876c643608eaf57768487a465d4951e208b1b4e636d2bdf13f2b1c846199a049f607911a302a30736dfa9357db26dbbdffc93751ac8a05f063c2df4c4dbe8 SHA512 b5e050362d94e3f7729c0cd05c66535c159224966c952de4310dbd2efbff71925e173277e9da73c5cccb3a43fb8c82c5a550648dc7c3231065c6547726cf495a
+EBUILD glib-2.60.7-r2.ebuild 10260 BLAKE2B 2ff6270ad53d0bbc49eab6a9451784d6918d38174522c760153a824e5dd1a597b39b8a59327f3adc48634835c7b0166a1911bfb9abc73a2aaf47e8f66442ce9f SHA512 dcf8db458d27f6e9eb92a43d05033353b86ce05ef21179aa516e87f07b17f46b51fef283ee499c4bc44b2fd32e430f7fd0ffd211996e256ccd810c916822fbe1
 EBUILD glib-2.60.7.ebuild 10139 BLAKE2B bed62a53ad8276a891f54acf41ebf6cbced7cd942dd5af0e5a49f3a13057457d9186487a9ea30aafce9c7a04e4d514b3241e41166ef3ddec48a0e580b41f0a7c SHA512 1b3de610aa4102181d8a8c7f0dd47086aa2c51b85a187f002224e5a04d41a0b56510958917c60b3df2f3607ad5f431e322681f1e62ce5b96c1223e23a5eef09f
+EBUILD glib-2.62.5.ebuild 9791 BLAKE2B f6ad592e6b12ae7eebbf5a7722467b21b85fdbef82782069466d089e47f1b39b481a6ddb875de755472b4cede6e7b4cb9786aa49cdbfbefcadc5b199a013dc85 SHA512 0b84aa2cf7aa0f6eaa61478343c4e5981c4fb5d0146b443f76684c097dc05172f8c8e42bf822e43f33ec8cb369f31aaac2ef9c3b97da23392c13a1e96683158f
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/files/CVE-2020-6750.patch b/dev-libs/glib/files/CVE-2020-6750.patch
new file mode 100644
index 000000000000..fe39914f9204
--- /dev/null
+++ b/dev-libs/glib/files/CVE-2020-6750.patch
@@ -0,0 +1,763 @@
+From cc3cf6b8b2ad12d54f3474113f0ccfa7dcf66b7b Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@gnome.org>
+Date: Sat, 4 Jan 2020 20:46:25 -0600
+Subject: [PATCH] gsocketclient: run timeout source on the task's main context
+
+This shouldn't make any difference, because this code should only ever
+be running in the main context that was thread-default at the time the
+task was created, so it should already match the task's context. But
+let's make sure, just in case.
+---
+ gio/gsocketclient.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
+index 6adeee299..81721795b 100644
+--- a/gio/gsocketclient.c
++++ b/gio/gsocketclient.c
+@@ -1794,7 +1794,7 @@ g_socket_client_enumerator_callback (GObject      *object,
+   attempt->connection = (GIOStream *)g_socket_connection_factory_create_connection (socket);
+   attempt->timeout_source = g_timeout_source_new (HAPPY_EYEBALLS_CONNECTION_ATTEMPT_TIMEOUT_MS);
+   g_source_set_callback (attempt->timeout_source, on_connection_attempt_timeout, attempt, NULL);
+-  g_source_attach (attempt->timeout_source, g_main_context_get_thread_default ());
++  g_source_attach (attempt->timeout_source, g_task_get_context (data->task));
+   data->connection_attempts = g_slist_append (data->connection_attempts, attempt);
+ 
+   if (g_task_get_cancellable (data->task))
+-- 
+2.24.1
+
+From d4fcf91460696b09bb2b55c352a023f6dd71c7fe Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Thu, 23 Jan 2020 19:58:41 -0800
+Subject: [PATCH] Refactor g_socket_client_connect_async()
+
+This is a fairly large refactoring. The highlights are:
+
+- Removing in-progress connections/addresses from GSocketClientAsyncConnectData:
+
+  This caused issues where multiple ConnectionAttempt's would step over eachother
+  and modify shared state causing bugs like accidentally bypassing a set proxy.
+
+  Fixes #1871
+  Fixes #1989
+  Fixes #1902
+
+- Cancelling address enumeration on error/completion
+
+- Queuing successful TCP connections and doing application layer work serially:
+
+  This is more in the spirit of Happy Eyeballs but it also greatly simplifies
+  the flow of connection handling so fewer tasks are happening in parallel
+  when they don't need to be.
+
+  The behavior also should more closely match that of g_socket_client_connect().
+
+- Better track the state of address enumeration:
+
+  Previously we were over eager to treat enumeration finishing as an error.
+
+  Fixes #1872
+  See also #1982
+
+- Add more detailed documentation and logging.
+
+Closes #1995
+---
+ gio/gsocketclient.c | 459 ++++++++++++++++++++++++++++----------------
+ 1 file changed, 296 insertions(+), 163 deletions(-)
+
+diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
+index 81721795b..c9943309c 100644
+--- a/gio/gsocketclient.c
++++ b/gio/gsocketclient.c
+@@ -1337,13 +1337,15 @@ typedef struct
+ 
+   GSocketConnectable *connectable;
+   GSocketAddressEnumerator *enumerator;
+-  GProxyAddress *proxy_addr;
+-  GSocket *socket;
+-  GIOStream *connection;
++  GCancellable *enumeration_cancellable;
+ 
+   GSList *connection_attempts;
++  GSList *successful_connections;
+   GError *last_error;
+ 
++  gboolean enumerated_at_least_once;
++  gboolean enumeration_completed;
++  gboolean connection_in_progress;
+   gboolean completed;
+ } GSocketClientAsyncConnectData;
+ 
+@@ -1355,10 +1357,9 @@ g_socket_client_async_connect_data_free (GSocketClientAsyncConnectData *data)
+   data->task = NULL;
+   g_clear_object (&data->connectable);
+   g_clear_object (&data->enumerator);
+-  g_clear_object (&data->proxy_addr);
+-  g_clear_object (&data->socket);
+-  g_clear_object (&data->connection);
++  g_clear_object (&data->enumeration_cancellable);
+   g_slist_free_full (data->connection_attempts, connection_attempt_unref);
++  g_slist_free_full (data->successful_connections, connection_attempt_unref);
+ 
+   g_clear_error (&data->last_error);
+ 
+@@ -1370,6 +1371,7 @@ typedef struct
+   GSocketAddress *address;
+   GSocket *socket;
+   GIOStream *connection;
++  GProxyAddress *proxy_addr;
+   GSocketClientAsyncConnectData *data; /* unowned */
+   GSource *timeout_source;
+   GCancellable *cancellable;
+@@ -1401,6 +1403,7 @@ connection_attempt_unref (gpointer pointer)
+       g_clear_object (&attempt->socket);
+       g_clear_object (&attempt->connection);
+       g_clear_object (&attempt->cancellable);
++      g_clear_object (&attempt->proxy_addr);
+       if (attempt->timeout_source)
+         {
+           g_source_destroy (attempt->timeout_source);
+@@ -1418,37 +1421,59 @@ connection_attempt_remove (ConnectionAttempt *attempt)
+ }
+ 
+ static void
+-g_socket_client_async_connect_complete (GSocketClientAsyncConnectData *data)
++cancel_all_attempts (GSocketClientAsyncConnectData *data)
+ {
+-  g_assert (data->connection);
++  GSList *l;
+ 
+-  if (!G_IS_SOCKET_CONNECTION (data->connection))
++  for (l = data->connection_attempts; l; l = g_slist_next (l))
+     {
+-      GSocketConnection *wrapper_connection;
+-
+-      wrapper_connection = g_tcp_wrapper_connection_new (data->connection, data->socket);
+-      g_object_unref (data->connection);
+-      data->connection = (GIOStream *)wrapper_connection;
++      ConnectionAttempt *attempt_entry = l->data;
++      g_cancellable_cancel (attempt_entry->cancellable);
++      connection_attempt_unref (attempt_entry);
+     }
++  g_slist_free (data->connection_attempts);
++  data->connection_attempts = NULL;
+ 
+-  if (!data->completed)
++  g_slist_free_full (data->successful_connections, connection_attempt_unref);
++  data->successful_connections = NULL;
++
++  g_cancellable_cancel (data->enumeration_cancellable);
++}
++
++static void
++g_socket_client_async_connect_complete (ConnectionAttempt *attempt)
++{
++  GSocketClientAsyncConnectData *data = attempt->data;
++  GError *error = NULL;
++  g_assert (attempt->connection);
++  g_assert (!data->completed);
++
++  if (!G_IS_SOCKET_CONNECTION (attempt->connection))
+     {
+-      GError *error = NULL;
++      GSocketConnection *wrapper_connection;
+ 
+-      if (g_cancellable_set_error_if_cancelled (g_task_get_cancellable (data->task), &error))
+-        {
+-          g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
+-          g_task_return_error (data->task, g_steal_pointer (&error));
+-        }
+-      else
+-        {
+-          g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, data->connection);
+-          g_task_return_pointer (data->task, g_steal_pointer (&data->connection), g_object_unref);
+-        }
++      wrapper_connection = g_tcp_wrapper_connection_new (attempt->connection, attempt->socket);
++      g_object_unref (attempt->connection);
++      attempt->connection = (GIOStream *)wrapper_connection;
++    }
+ 
+-      data->completed = TRUE;
++  data->completed = TRUE;
++  cancel_all_attempts (data);
++
++  if (g_cancellable_set_error_if_cancelled (g_task_get_cancellable (data->task), &error))
++    {
++      g_debug ("GSocketClient: Connection cancelled!");
++      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
++      g_task_return_error (data->task, g_steal_pointer (&error));
++    }
++  else
++    {
++      g_debug ("GSocketClient: Connection successful!");
++      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, attempt->connection);
++      g_task_return_pointer (data->task, g_steal_pointer (&attempt->connection), g_object_unref);
+     }
+ 
++  connection_attempt_unref (attempt);
+   g_object_unref (data->task);
+ }
+ 
+@@ -1470,59 +1495,63 @@ static void
+ enumerator_next_async (GSocketClientAsyncConnectData *data,
+                        gboolean                       add_task_ref)
+ {
+-  /* We need to cleanup the state */
+-  g_clear_object (&data->socket);
+-  g_clear_object (&data->proxy_addr);
+-  g_clear_object (&data->connection);
+-
+   /* Each enumeration takes a ref. This arg just avoids repeated unrefs when
+      an enumeration starts another enumeration */
+   if (add_task_ref)
+     g_object_ref (data->task);
+ 
+   g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_RESOLVING, data->connectable, NULL);
++  g_debug ("GSocketClient: Starting new address enumeration");
+   g_socket_address_enumerator_next_async (data->enumerator,
+-					  g_task_get_cancellable (data->task),
++					  data->enumeration_cancellable,
+ 					  g_socket_client_enumerator_callback,
+ 					  data);
+ }
+ 
++static void try_next_connection_or_finish (GSocketClientAsyncConnectData *, gboolean);
++
+ static void
+ g_socket_client_tls_handshake_callback (GObject      *object,
+ 					GAsyncResult *result,
+ 					gpointer      user_data)
+ {
+-  GSocketClientAsyncConnectData *data = user_data;
++  ConnectionAttempt *attempt = user_data;
++  GSocketClientAsyncConnectData *data = attempt->data;
+ 
+   if (g_tls_connection_handshake_finish (G_TLS_CONNECTION (object),
+ 					 result,
+ 					 &data->last_error))
+     {
+-      g_object_unref (data->connection);
+-      data->connection = G_IO_STREAM (object);
++      g_object_unref (attempt->connection);
++      attempt->connection = G_IO_STREAM (object);
+ 
+-      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_TLS_HANDSHAKED, data->connectable, data->connection);
+-      g_socket_client_async_connect_complete (data);
++      g_debug ("GSocketClient: TLS handshake succeeded");
++      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_TLS_HANDSHAKED, data->connectable, attempt->connection);
++      g_socket_client_async_connect_complete (attempt);
+     }
+   else
+     {
+       g_object_unref (object);
+-      enumerator_next_async (data, FALSE);
++      connection_attempt_unref (attempt);
++      g_debug ("GSocketClient: TLS handshake failed: %s", data->last_error->message);
++      try_next_connection_or_finish (data, TRUE);
+     }
+ }
+ 
+ static void
+-g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data)
++g_socket_client_tls_handshake (ConnectionAttempt *attempt)
+ {
++  GSocketClientAsyncConnectData *data = attempt->data;
+   GIOStream *tlsconn;
+ 
+   if (!data->client->priv->tls)
+     {
+-      g_socket_client_async_connect_complete (data);
++      g_socket_client_async_connect_complete (attempt);
+       return;
+     }
+ 
+-  tlsconn = g_tls_client_connection_new (data->connection,
++  g_debug ("GSocketClient: Starting TLS handshake");
++  tlsconn = g_tls_client_connection_new (attempt->connection,
+ 					 data->connectable,
+ 					 &data->last_error);
+   if (tlsconn)
+@@ -1534,11 +1563,12 @@ g_socket_client_tls_handshake (GSocketClientAsyncConnectData *data)
+ 					G_PRIORITY_DEFAULT,
+ 					g_task_get_cancellable (data->task),
+ 					g_socket_client_tls_handshake_callback,
+-					data);
++					attempt);
+     }
+   else
+     {
+-      enumerator_next_async (data, FALSE);
++      connection_attempt_unref (attempt);
++      try_next_connection_or_finish (data, TRUE);
+     }
+ }
+ 
+@@ -1547,23 +1577,38 @@ g_socket_client_proxy_connect_callback (GObject      *object,
+ 					GAsyncResult *result,
+ 					gpointer      user_data)
+ {
+-  GSocketClientAsyncConnectData *data = user_data;
++  ConnectionAttempt *attempt = user_data;
++  GSocketClientAsyncConnectData *data = attempt->data;
+ 
+-  g_object_unref (data->connection);
+-  data->connection = g_proxy_connect_finish (G_PROXY (object),
+-					     result,
+-					     &data->last_error);
+-  if (data->connection)
++  g_object_unref (attempt->connection);
++  attempt->connection = g_proxy_connect_finish (G_PROXY (object),
++                                                result,
++                                                &data->last_error);
++  if (attempt->connection)
+     {
+-      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_PROXY_NEGOTIATED, data->connectable, data->connection);
++      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_PROXY_NEGOTIATED, data->connectable, attempt->connection);
+     }
+   else
+     {
+-      enumerator_next_async (data, FALSE);
++      connection_attempt_unref (attempt);
++      try_next_connection_or_finish (data, TRUE);
+       return;
+     }
+ 
+-  g_socket_client_tls_handshake (data);
++  g_socket_client_tls_handshake (attempt);
++}
++
++static void
++complete_connection_with_error (GSocketClientAsyncConnectData *data,
++                                GError                        *error)
++{
++  g_debug ("GSocketClient: Connection failed: %s", error->message);
++  g_assert (!data->completed);
++
++  g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
++  data->completed = TRUE;
++  cancel_all_attempts (data);
++  g_task_return_error (data->task, error);
+ }
+ 
+ static gboolean
+@@ -1577,15 +1622,114 @@ task_completed_or_cancelled (GSocketClientAsyncConnectData *data)
+     return TRUE;
+   else if (g_cancellable_set_error_if_cancelled (cancellable, &error))
+     {
+-      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
+-      g_task_return_error (task, g_steal_pointer (&error));
+-      data->completed = TRUE;
++      complete_connection_with_error (data, g_steal_pointer (&error));
+       return TRUE;
+     }
+   else
+     return FALSE;
+ }
+ 
++static gboolean
++try_next_successful_connection (GSocketClientAsyncConnectData *data)
++{
++  ConnectionAttempt *attempt;
++  const gchar *protocol;
++  GProxy *proxy;
++
++  if (data->connection_in_progress)
++    return FALSE;
++
++  g_assert (data->successful_connections != NULL);
++  attempt = data->successful_connections->data;
++  g_assert (attempt != NULL);
++  data->successful_connections = g_slist_remove (data->successful_connections, attempt);
++  data->connection_in_progress = TRUE;
++
++  g_debug ("GSocketClient: Starting application layer connection");
++
++  if (!attempt->proxy_addr)
++    {
++      g_socket_client_tls_handshake (g_steal_pointer (&attempt));
++      return TRUE;
++    }
++
++  protocol = g_proxy_address_get_protocol (attempt->proxy_addr);
++
++  /* The connection should not be anything other than TCP,
++   * but let's put a safety guard in case
++   */
++  if (!G_IS_TCP_CONNECTION (attempt->connection))
++    {
++      g_critical ("Trying to proxy over non-TCP connection, this is "
++          "most likely a bug in GLib IO library.");
++
++      g_set_error_literal (&data->last_error,
++          G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
++          _("Proxying over a non-TCP connection is not supported."));
++    }
++  else if (g_hash_table_contains (data->client->priv->app_proxies, protocol))
++    {
++      /* Simply complete the connection, we don't want to do TLS handshake
++       * as the application proxy handling may need proxy handshake first */
++      g_socket_client_async_connect_complete (g_steal_pointer (&attempt));
++      return TRUE;
++    }
++  else if ((proxy = g_proxy_get_default_for_protocol (protocol)))
++    {
++      GIOStream *connection = attempt->connection;
++      GProxyAddress *proxy_addr = attempt->proxy_addr;
++
++      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_PROXY_NEGOTIATING, data->connectable, attempt->connection);
++      g_debug ("GSocketClient: Starting proxy connection");
++      g_proxy_connect_async (proxy,
++                             connection,
++                             proxy_addr,
++                             g_task_get_cancellable (data->task),
++                             g_socket_client_proxy_connect_callback,
++                             g_steal_pointer (&attempt));
++      g_object_unref (proxy);
++      return TRUE;
++    }
++  else
++    {
++      g_clear_error (&data->last_error);
++
++      g_set_error (&data->last_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
++          _("Proxy protocol “%s” is not supported."),
++          protocol);
++    }
++
++  data->connection_in_progress = FALSE;
++  g_clear_pointer (&attempt, connection_attempt_unref);
++  return FALSE; /* All non-return paths are failures */
++}
++
++static void
++try_next_connection_or_finish (GSocketClientAsyncConnectData *data,
++                               gboolean                       end_current_connection)
++{
++  if (end_current_connection)
++    data->connection_in_progress = FALSE;
++
++  if (data->connection_in_progress)
++    return;
++
++  /* Keep trying successful connections until one works, each iteration pops one */
++  while (data->successful_connections)
++    {
++      if (try_next_successful_connection (data))
++        return;
++    }
++
++  if (!data->enumeration_completed)
++    {
++      enumerator_next_async (data, FALSE);
++      return;
++    }
++
++  complete_connection_with_error (data, data->last_error);
++}
++
+ static void
+ g_socket_client_connected_callback (GObject      *source,
+ 				    GAsyncResult *result,
+@@ -1593,10 +1737,7 @@ g_socket_client_connected_callback (GObject      *source,
+ {
+   ConnectionAttempt *attempt = user_data;
+   GSocketClientAsyncConnectData *data = attempt->data;
+-  GSList *l;
+   GError *error = NULL;
+-  GProxy *proxy;
+-  const gchar *protocol;
+ 
+   if (task_completed_or_cancelled (data) || g_cancellable_is_cancelled (attempt->cancellable))
+     {
+@@ -1618,11 +1759,12 @@ g_socket_client_connected_callback (GObject      *source,
+         {
+           clarify_connect_error (error, data->connectable, attempt->address);
+           set_last_error (data, error);
++          g_debug ("GSocketClient: Connection attempt failed: %s", error->message);
+           connection_attempt_remove (attempt);
+-          enumerator_next_async (data, FALSE);
+           connection_attempt_unref (attempt);
++          try_next_connection_or_finish (data, FALSE);
+         }
+-      else
++      else /* Silently ignore cancelled attempts */
+         {
+           g_clear_error (&error);
+           g_object_unref (data->task);
+@@ -1632,74 +1774,21 @@ g_socket_client_connected_callback (GObject      *source,
+       return;
+     }
+ 
+-  data->socket = g_steal_pointer (&attempt->socket);
+-  data->connection = g_steal_pointer (&attempt->connection);
+-
+-  for (l = data->connection_attempts; l; l = g_slist_next (l))
+-    {
+-      ConnectionAttempt *attempt_entry = l->data;
+-      g_cancellable_cancel (attempt_entry->cancellable);
+-      connection_attempt_unref (attempt_entry);
+-    }
+-  g_slist_free (data->connection_attempts);
+-  data->connection_attempts = NULL;
+-  connection_attempt_unref (attempt);
+-
+-  g_socket_connection_set_cached_remote_address ((GSocketConnection*)data->connection, NULL);
+-  g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_CONNECTED, data->connectable, data->connection);
++  g_socket_connection_set_cached_remote_address ((GSocketConnection*)attempt->connection, NULL);
++  g_debug ("GSocketClient: TCP connection successful");
++  g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_CONNECTED, data->connectable, attempt->connection);
+ 
+   /* wrong, but backward compatible */
+-  g_socket_set_blocking (data->socket, TRUE);
++  g_socket_set_blocking (attempt->socket, TRUE);
+ 
+-  if (!data->proxy_addr)
+-    {
+-      g_socket_client_tls_handshake (data);
+-      return;
+-    }
+-
+-  protocol = g_proxy_address_get_protocol (data->proxy_addr);
+-
+-  /* The connection should not be anything other than TCP,
+-   * but let's put a safety guard in case
++  /* This ends the parallel "happy eyeballs" portion of connecting.
++     Now that we have a successful tcp connection we will attempt to connect
++     at the TLS/Proxy layer. If those layers fail we will move on to the next
++     connection.
+    */
+-  if (!G_IS_TCP_CONNECTION (data->connection))
+-    {
+-      g_critical ("Trying to proxy over non-TCP connection, this is "
+-          "most likely a bug in GLib IO library.");
+-
+-      g_set_error_literal (&data->last_error,
+-          G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+-          _("Proxying over a non-TCP connection is not supported."));
+-
+-      enumerator_next_async (data, FALSE);
+-    }
+-  else if (g_hash_table_contains (data->client->priv->app_proxies, protocol))
+-    {
+-      /* Simply complete the connection, we don't want to do TLS handshake
+-       * as the application proxy handling may need proxy handshake first */
+-      g_socket_client_async_connect_complete (data);
+-    }
+-  else if ((proxy = g_proxy_get_default_for_protocol (protocol)))
+-    {
+-      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_PROXY_NEGOTIATING, data->connectable, data->connection);
+-      g_proxy_connect_async (proxy,
+-                             data->connection,
+-                             data->proxy_addr,
+-                             g_task_get_cancellable (data->task),
+-                             g_socket_client_proxy_connect_callback,
+-                             data);
+-      g_object_unref (proxy);
+-    }
+-  else
+-    {
+-      g_clear_error (&data->last_error);
+-
+-      g_set_error (&data->last_error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
+-          _("Proxy protocol “%s” is not supported."),
+-          protocol);
+-
+-      enumerator_next_async (data, FALSE);
+-    }
++  connection_attempt_remove (attempt);
++  data->successful_connections = g_slist_append (data->successful_connections, g_steal_pointer (&attempt));
++  try_next_connection_or_finish (data, FALSE);
+ }
+ 
+ static gboolean
+@@ -1707,7 +1796,11 @@ on_connection_attempt_timeout (gpointer data)
+ {
+   ConnectionAttempt *attempt = data;
+ 
+-  enumerator_next_async (attempt->data, TRUE);
++  if (!attempt->data->enumeration_completed)
++    {
++      g_debug ("GSocketClient: Timeout reached, trying another enumeration");
++      enumerator_next_async (attempt->data, TRUE);
++    }
+ 
+   g_clear_pointer (&attempt->timeout_source, g_source_unref);
+   return G_SOURCE_REMOVE;
+@@ -1717,9 +1810,9 @@ static void
+ on_connection_cancelled (GCancellable *cancellable,
+                          gpointer      data)
+ {
+-  GCancellable *attempt_cancellable = data;
++  GCancellable *linked_cancellable = G_CANCELLABLE (data);
+ 
+-  g_cancellable_cancel (attempt_cancellable);
++  g_cancellable_cancel (linked_cancellable);
+ }
+ 
+ static void
+@@ -1743,39 +1836,49 @@ g_socket_client_enumerator_callback (GObject      *object,
+ 						     result, &error);
+   if (address == NULL)
+     {
+-      if (data->connection_attempts)
++      if (G_UNLIKELY (data->enumeration_completed))
++        return;
++
++      data->enumeration_completed = TRUE;
++      g_debug ("GSocketClient: Address enumeration completed (out of addresses)");
++
++      /* As per API docs: We only care about error if its the first call,
++         after that the enumerator is done.
++
++         Note that we don't care about cancellation errors because
++         task_completed_or_cancelled() above should handle that.
++
++         If this fails and nothing is in progress then we will complete task here.
++       */
++      if ((data->enumerated_at_least_once && !data->connection_attempts && !data->connection_in_progress) ||
++          !data->enumerated_at_least_once)
+         {
+-          g_object_unref (data->task);
+-          return;
++          g_debug ("GSocketClient: Address enumeration failed: %s", error ? error->message : NULL);
++          if (data->last_error)
++            {
++              g_clear_error (&error);
++              error = data->last_error;
++              data->last_error = NULL;
++            }
++          else if (!error)
++            {
++              g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
++                _("Unknown error on connect"));
++            }
++
++          complete_connection_with_error (data, error);
+         }
+ 
+-      g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_COMPLETE, data->connectable, NULL);
+-      data->completed = TRUE;
+-      if (!error)
+-	{
+-	  if (data->last_error)
+-	    {
+-	      error = data->last_error;
+-	      data->last_error = NULL;
+-	    }
+-	  else
+-	    {
+-	      g_set_error_literal (&error, G_IO_ERROR, G_IO_ERROR_FAILED,
+-				   _("Unknown error on connect"));
+-	    }
+-	}
+-      g_task_return_error (data->task, error);
++      /* Enumeration should never trigger again, drop our ref */
+       g_object_unref (data->task);
+       return;
+     }
+ 
++  data->enumerated_at_least_once = TRUE;
++  g_debug ("GSocketClient: Address enumeration succeeded");
+   g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_RESOLVED,
+ 			      data->connectable, NULL);
+ 
+-  if (G_IS_PROXY_ADDRESS (address) &&
+-      data->client->priv->enable_proxy)
+-    data->proxy_addr = g_object_ref (G_PROXY_ADDRESS (address));
+-
+   g_clear_error (&data->last_error);
+ 
+   socket = create_socket (data->client, address, &data->last_error);
+@@ -1793,6 +1896,10 @@ g_socket_client_enumerator_callback (GObject      *object,
+   attempt->cancellable = g_cancellable_new ();
+   attempt->connection = (GIOStream *)g_socket_connection_factory_create_connection (socket);
+   attempt->timeout_source = g_timeout_source_new (HAPPY_EYEBALLS_CONNECTION_ATTEMPT_TIMEOUT_MS);
++
++  if (G_IS_PROXY_ADDRESS (address) && data->client->priv->enable_proxy)
++    attempt->proxy_addr = g_object_ref (G_PROXY_ADDRESS (address));
++
+   g_source_set_callback (attempt->timeout_source, on_connection_attempt_timeout, attempt, NULL);
+   g_source_attach (attempt->timeout_source, g_task_get_context (data->task));
+   data->connection_attempts = g_slist_append (data->connection_attempts, attempt);
+@@ -1802,6 +1909,7 @@ g_socket_client_enumerator_callback (GObject      *object,
+                            g_object_ref (attempt->cancellable), g_object_unref);
+ 
+   g_socket_connection_set_cached_remote_address ((GSocketConnection *)attempt->connection, address);
++  g_debug ("GSocketClient: Starting TCP connection attempt");
+   g_socket_client_emit_event (data->client, G_SOCKET_CLIENT_CONNECTING, data->connectable, attempt->connection);
+   g_socket_connection_connect_async (G_SOCKET_CONNECTION (attempt->connection),
+ 				     address,
+@@ -1854,24 +1962,48 @@ g_socket_client_connect_async (GSocketClient       *client,
+   else
+     data->enumerator = g_socket_connectable_enumerate (connectable);
+ 
+-  /* The flow and ownership here isn't quite obvious:
+-    - The task starts an async attempt to connect.
+-      - Each attempt holds a single ref on task.
+-      - Each attempt may create new attempts by timing out (not a failure) so
+-        there are multiple attempts happening in parallel.
+-      - Upon failure an attempt will start a new attempt that steals its ref
+-        until there are no more attempts left and it drops its ref.
+-      - Upon success it will cancel all other attempts and continue on
+-        to the rest of the connection (tls, proxies, etc) which do not
+-        happen in parallel and at the very end drop its ref.
+-      - Upon cancellation an attempt drops its ref.
+-   */
++  /* This function tries to match the behavior of g_socket_client_connect ()
++     which is simple enough but much of it is done in parallel to be as responsive
++     as possible as per Happy Eyeballs (RFC 8305). This complicates flow quite a
++     bit but we can describe it in 3 sections:
++
++     Firstly we have address enumeration (DNS):
++       - This may be triggered multiple times by enumerator_next_async().
++       - It also has its own cancellable (data->enumeration_cancellable).
++       - Enumeration is done lazily because GNetworkAddressAddressEnumerator
++         also does work in parallel and may lazily add new addresses.
++       - If the first enumeration errors then the task errors. Otherwise all enumerations
++         will potentially be used (until task or enumeration is cancelled).
++
++      Then we start attempting connections (TCP):
++        - Each connection is independent and kept in a ConnectionAttempt object.
++          - They each hold a ref on the main task and have their own cancellable.
++        - Multiple attempts may happen in parallel as per Happy Eyeballs.
++        - Upon failure or timeouts more connection attempts are made.
++          - If no connections succeed the task errors.
++        - Upon success they are kept in a list of successful connections.
++
++      Lastly we connect at the application layer (TLS, Proxies):
++        - These are done in serial.
++          - The reasoning here is that Happy Eyeballs is about making bad connections responsive
++            at the IP/TCP layers. Issues at the application layer are generally not due to
++            connectivity issues but rather misconfiguration.
++        - Upon failure it will try the next TCP connection until it runs out and
++          the task errors.
++        - Upon success it cancels everything remaining (enumeration and connections)
++          and returns the connection.
++  */
+ 
+   data->task = g_task_new (client, cancellable, callback, user_data);
+   g_task_set_check_cancellable (data->task, FALSE); /* We handle this manually */
+   g_task_set_source_tag (data->task, g_socket_client_connect_async);
+   g_task_set_task_data (data->task, data, (GDestroyNotify)g_socket_client_async_connect_data_free);
+ 
++  data->enumeration_cancellable = g_cancellable_new ();
++  if (cancellable)
++    g_cancellable_connect (cancellable, G_CALLBACK (on_connection_cancelled),
++                           g_object_ref (data->enumeration_cancellable), g_object_unref);
++
+   enumerator_next_async (data, FALSE);
+ }
+ 
+@@ -1990,6 +2122,7 @@ g_socket_client_connect_to_uri_async (GSocketClient        *client,
+     }
+   else
+     {
++      g_debug("g_socket_client_connect_to_uri_async");
+       g_socket_client_connect_async (client,
+ 				     connectable, cancellable,
+ 				     callback, user_data);
+-- 
+2.24.1
+
diff --git a/dev-libs/glib/glib-2.60.7-r2.ebuild b/dev-libs/glib/glib-2.60.7-r2.ebuild
new file mode 100644
index 000000000000..01213e8df288
--- /dev/null
+++ b/dev-libs/glib/glib-2.60.7-r2.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+
+# * libelf isn't strictly necessary, but makes gresource tool more useful, and
+# the check is automagic in gio/meson.build. gresource is not a multilib tool
+# right now, thus it doesn't matter if non-native ABI libelf exists or not
+# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	virtual/libelf:0=
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PV}-gdbus-fixes.patch #700538, included in 2.62.3+
+	eapply "${FILESDIR}"/CVE-2020-6750.patch
+
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e 's/install.*true/install : false/g' gio/gdbus-2.0/codegen/meson.build || die
+	# Older than meson-0.50 doesn't know about install kwarg for configure_file; for that we need to remove the install_dir kwarg.
+	# Upstream will remove the install kwarg in a future version to require only meson-0.49.2 or newer, at which point the
+	# install_dir removal only should be kept.
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=true # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/glib/glib-2.62.5.ebuild b/dev-libs/glib/glib-2.62.5.ebuild
new file mode 100644
index 000000000000..33a36d9a2964
--- /dev/null
+++ b/dev-libs/glib/glib-2.62.5.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit flag-o-matic gnome.org gnome2-utils linux-info meson multilib multilib-minimal python-any-r1 toolchain-funcs xdg
+
+DESCRIPTION="The GLib library of C routines"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+IUSE="dbus debug elibc_glibc fam gtk-doc kernel_linux +mime selinux static-libs systemtap test utils xattr"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+# * libelf isn't strictly necessary, but makes gresource tool more useful, and
+# the check is automagic in gio/meson.build. gresource is not a multilib tool
+# right now, thus it doesn't matter if non-native ABI libelf exists or not
+# (non-native binary is overwritten, it doesn't matter if libelf was linked to).
+# * Technically static-libs is needed on zlib, util-linux and perhaps more, but
+# these are used by GIO, which glib[static-libs] consumers don't really seem
+# to need at all, thus not imposing the deps for now and once some consumers
+# are actually found to static link libgio-2.0.a, we can revisit and either add
+# them or just put the (build) deps in that rare consumer instead of recursive
+# RDEPEND here (due to lack of recursive DEPEND).
+RDEPEND="
+	!<dev-util/gdbus-codegen-${PV}
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+	>=dev-libs/libpcre-8.31:3[${MULTILIB_USEDEP},static-libs?]
+	>=virtual/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	>=virtual/libintl-0-r2[${MULTILIB_USEDEP}]
+	kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] )
+	selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] )
+	xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) )
+	virtual/libelf:0=
+	fam? ( >=virtual/fam-0-r1[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+# libxml2 used for optional tests that get automatically skipped
+BDEPEND="
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	gtk-doc? ( >=dev-util/gtk-doc-1.20
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5 )
+	systemtap? ( >=dev-util/systemtap-1.3 )
+	${PYTHON_DEPS}
+	test? ( >=sys-apps/dbus-1.2.14 )
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen
+
+PDEPEND="
+	dbus? ( gnome-base/dconf )
+	mime? ( x11-misc/shared-mime-info )
+"
+# shared-mime-info needed for gio/xdgmime, bug #409481
+# dconf is needed to be able to save settings, bug #498436
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/gio-querymodules$(get_exeext)
+)
+
+pkg_setup() {
+	if use kernel_linux ; then
+		CONFIG_CHECK="~INOTIFY_USER"
+		if use test ; then
+			CONFIG_CHECK="~IPV6"
+			WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them."
+		fi
+		linux-info_pkg_setup
+	fi
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	if use test; then
+		# TODO: Review the test exclusions, especially now with meson
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# gdesktopappinfo requires existing terminal (gnome-terminal or any
+		# other), falling back to xterm if one doesn't exist
+		#if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then
+		#	ewarn "Some tests will be skipped due to missing terminal program"
+		# These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson
+		# Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready for backport (or in a bump) and file new issue if still fails
+		sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die
+		# desktop-app-info/launch* might fail similarly
+		sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die
+		#fi
+
+		# https://bugzilla.gnome.org/show_bug.cgi?id=722604
+		sed -i -e "/timer\/stop/d" glib/tests/timer.c || die
+		sed -i -e "/timer\/basic/d" glib/tests/timer.c || die
+
+		ewarn "Tests for search-utils have been skipped"
+		sed -i -e "/search-utils/d" glib/tests/meson.build || die
+
+		# Play nice with network-sandbox, but this approach would defeat the purpose of the test
+		#sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die
+	fi
+
+	# Don't build fuzzing binaries - not used
+	sed -i -e '/subdir.*fuzzing/d' meson.build || die
+
+	# gdbus-codegen is a separate package
+	sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die
+
+	# Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon
+	sed -i -e '/install_dir/d' gio/tests/meson.build || die
+
+	cat > "${T}/glib-test-ld-wrapper" <<-EOF
+		#!/usr/bin/env sh
+		exec \${LD:-ld} "\$@"
+	EOF
+	chmod a+x "${T}/glib-test-ld-wrapper" || die
+	sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die
+
+	xdg_src_prepare
+	gnome2_environment_reset
+	# TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only
+}
+
+multilib_src_configure() {
+	if use debug; then
+		append-cflags -DG_ENABLE_DEBUG
+	else
+		append-cflags -DG_DISABLE_CAST_CHECKS # https://gitlab.gnome.org/GNOME/glib/issues/1833
+	fi
+
+	# TODO: figure a way to pass appropriate values for all cross properties that glib uses (search for get_cross_property)
+	#if tc-is-cross-compiler ; then
+		# https://bugzilla.gnome.org/show_bug.cgi?id=756473
+		# TODO-meson: This should be in meson cross file as 'growing_stack' property; and more, look at get_cross_property
+		#case ${CHOST} in
+		#hppa*|metag*) export glib_cv_stack_grows=yes ;;
+		#*)            export glib_cv_stack_grows=no ;;
+		#esac
+	#fi
+
+	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		$(meson_feature selinux)
+		$(meson_use xattr)
+		-Dlibmount=true # only used if host_system == 'linux'
+		-Dinternal_pcre=false
+		-Dman=true
+		$(meson_use systemtap dtrace)
+		$(meson_use systemtap)
+		-Dgtk_doc=$(multilib_native_usex gtk-doc true false)
+		$(meson_use fam)
+		-Dinstalled_tests=false
+		-Dnls=enabled
+		-Doss_fuzz=disabled
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	meson_src_compile
+}
+
+multilib_src_test() {
+	export XDG_CONFIG_DIRS=/etc/xdg
+	export XDG_DATA_DIRS=/usr/local/share:/usr/share
+	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
+	export LC_TIME=C # bug #411967
+	unset GSETTINGS_BACKEND # bug #596380
+	python_setup
+
+	# Related test is a bit nitpicking
+	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+	chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
+
+	meson_src_test --timeout-multiplier 2 --no-suite flaky
+}
+
+multilib_src_install() {
+	meson_src_install
+	keepdir /usr/$(get_libdir)/gio/modules
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# These are installed by dev-util/glib-utils
+	# TODO: With patching we might be able to get rid of the python-any deps and removals, and test depend on glib-utils instead; revisit now with meson
+	rm "${ED}/usr/bin/glib-genmarshal" || die
+	rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die
+	rm "${ED}/usr/bin/glib-mkenums" || die
+	rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die
+	rm "${ED}/usr/bin/gtester-report" || die
+	rm "${ED}/usr/share/man/man1/gtester-report.1" || die
+	# gdbus-codegen manpage installed by dev-util/gdbus-codegen
+	rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# Make gschemas.compiled belong to glib alone
+	local cache="/usr/share/glib-2.0/schemas/gschemas.compiled"
+
+	if [[ -e ${EROOT}${cache} ]]; then
+		cp "${EROOT}"${cache} "${ED}"/${cache} || die
+	else
+		touch "${ED}"${cache} || die
+	fi
+
+	multilib_pkg_preinst() {
+		# Make giomodule.cache belong to glib alone
+		local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache"
+
+		if [[ -e ${EROOT}${cache} ]]; then
+			cp "${EROOT}"${cache} "${ED}"${cache} || die
+		else
+			touch "${ED}"${cache} || die
+		fi
+	}
+
+	# Don't run the cache ownership when cross-compiling, as it would end up with an empty cache
+	# file due to inability to create it and GIO might not look at any of the modules there
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_preinst
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	# glib installs no schemas itself, but we force update for fresh install in case
+	# something has dropped in a schemas file without direct glib dep; and for upgrades
+	# in case the compiled schema format could have changed
+	gnome2_schemas_update
+
+	multilib_pkg_postinst() {
+		gnome2_giomodule_cache_update \
+			|| die "Update GIO modules cache failed (for ${ABI})"
+	}
+	if ! tc-is-cross-compiler ; then
+		multilib_foreach_abi multilib_pkg_postinst
+	else
+		ewarn "Updating of GIO modules cache skipped due to cross-compilation."
+		ewarn "You might want to run gio-querymodules manually on the target for"
+		ewarn "your final image for performance reasons and re-run it when packages"
+		ewarn "installing GIO modules get upgraded or added to the image."
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+
+	if [[ -z ${REPLACED_BY_VERSION} ]]; then
+		multilib_pkg_postrm() {
+			rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache
+		}
+		multilib_foreach_abi multilib_pkg_postrm
+		rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled
+	fi
+}
diff --git a/dev-libs/gmime/Manifest b/dev-libs/gmime/Manifest
index 223dfe64fbd3..ba85e2444c1f 100644
--- a/dev-libs/gmime/Manifest
+++ b/dev-libs/gmime/Manifest
@@ -1,7 +1,9 @@
 DIST gmime-2.6.23.tar.xz 5216588 BLAKE2B e173a7dbd418663ebbc55b856359bf9286c3791827f9b7f89da48dd7c3609e77312546f9489c08d34a7dcaeb78659789809d5fafc1323cbae9b9f1c4a316c659 SHA512 2ff6718b7a555cd5b34848399f29c7d0aa5a15e1f3cb46e9258c499e874191ee00f41b737386805d3000bad34367d174a25c45d38ba90cba7902400e733afa14
 DIST gmime-3.2.4.tar.xz 2219876 BLAKE2B 210941d10dd5c0ce8a638a54a51da9000b4638ae2cc8a37be757fb331c0c2360fc497d7bcf2101ed6bf22de668fe0b779984e83ab40d00d551a5b2971d7a5dcd SHA512 34592e89a2f923dacc37ac535da785918c2c0d6a63b0f2ec1d86393264aace44d1060e8ef4a77e60fd57e97475435f8e79d87e46b269ae332db9b9aaf98bf61b
 DIST gmime-3.2.5.tar.xz 2220348 BLAKE2B 677a5cf88633b0d437a86ed3189399ee9ae4a23704f2b92ba6224e395309bea69cee419e39dde69d14f689df737319946eaed6460cc22c529c18f8d3b68872c6 SHA512 37488da84f1befb37a0dff9465e9f786670dfb7248adbbc1f227dcc0e80bcd4ee7cd239abeab2b52e8ded6ea7f8aa432bcc0461b379282dacd6ee4f867aa049d
+DIST gmime-3.2.6.tar.xz 2225796 BLAKE2B 899762dc74b43273e1cf2f277ca624207a2ef9ac62d09bff5972404c315e5498b1476ea19cf4c8c71fdec99702d9d69ac33bdda33a79d2b3db12840a4f1cd5ed SHA512 a60d3f9f1aa8490865c22cd9539544e9c9f3ceb4037b9749cf9e5c279f97aa88fc4cd077bf2aff314ba0db2a1b7bbe76f9b1ca5a17fffcbd6315ecebc5414a3d
 EBUILD gmime-2.6.23-r1.ebuild 1498 BLAKE2B e8b25f0b1e15a2d3c4ebe7de601900b4599da54f84c20b1a4ebdf723cc457d34b91da5053fa43caf0d3eaab2a867260a243e265daa9c9902014501d3118231ee SHA512 aa7207254e08156e08aa3c1cb4af6dfc21b242f9bd01a800df449780121ad61ce60dad1673130f1033ba0561ed26bd23a44c6191c4eec67fae0d2eae83f44273
 EBUILD gmime-3.2.4.ebuild 1577 BLAKE2B d4aeebc85657814cb1e1b27f9c7dace2a5ae2637e92241b75ba2b1872a5dd04dff84f2a018dbbb6f3536950aa5547c0070ef78c1ee9cbf4318e24baf3deff19b SHA512 75a92232f52cf7354d69d0c7bc79b15fface1be6fa4fc9e7ff512bbe5ed0a1eaadd766a90de5a88248ed85990fe0e722ffd656aa1b3408ca74f890cb61deb411
 EBUILD gmime-3.2.5.ebuild 1578 BLAKE2B a3d05923a75a9c71646388ecad4c3b74ba9adec3231f10485aed31cd881f59e65944a365f78b9c3dd903d09b28f32710ae3f2d326a3d043e940000fbb8b6ed63 SHA512 930c882f8ecf47dd239a7f4c34125b860df464443be4abae8b7ae45c700585c3b7be3924de7b896b2509422488e9edade569dd037a790b077699139140085028
+EBUILD gmime-3.2.6.ebuild 1583 BLAKE2B 6877b53501669f0951c03f8a76ab9ea3a99ad93ed704dd2efb22a12a496b464c5630bd52757d588d250f655eb3a97570114100fec62927a4083e06868a249eaf SHA512 60a6caf3ee9c3c0e5c641e55ad3e9a8efcdbd7ad130a55b1ae213e64e860cf1c8f2363166948bea3f27400352dd1f9335ae968ec5b6b02f1e2f75ce1fb5fb97b
 MISC metadata.xml 407 BLAKE2B 6079e838028f6063248e1dfe1b1b720c2bde65fe73512d4749aeda39aa9bd01b5bd047217e51be2ec6ab1050551f6e2f1c1d7162400261c841be312f8538df6e SHA512 0567710e8d8d0a61a0828325440aa243d8517d94767069d165c106fc5d1b96e5f952738874772ef9f28d1a391d3c47939a2ee32ecf3f8321ec00ee81d646d502
diff --git a/dev-libs/gmime/gmime-3.2.6.ebuild b/dev-libs/gmime/gmime-3.2.6.ebuild
new file mode 100644
index 000000000000..704fb43aade5
--- /dev/null
+++ b/dev-libs/gmime/gmime-3.2.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit flag-o-matic gnome2 vala
+
+DESCRIPTION="Utilities for creating and parsing messages using MIME"
+HOMEPAGE="http://spruce.sourceforge.net/gmime/ https://developer.gnome.org/gmime/stable/"
+
+SLOT="3.0"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="crypt doc idn static-libs test vala"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.32.0:2
+	sys-libs/zlib
+	crypt? ( >=app-crypt/gpgme-1.8.0:1= )
+	idn? ( net-dns/libidn2:= )
+	vala? (
+		$(vala_depend)
+		>=dev-libs/gobject-introspection-1.30.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1.8
+	virtual/libiconv
+	virtual/pkgconfig
+	doc? ( app-text/docbook-sgml-utils )
+	test? ( app-crypt/gnupg )
+"
+# gnupg is needed for tests if --enable-cryptography is enabled, which we do unconditionally
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	if [[ ${CHOST} == *-solaris* ]]; then
+		# bug #???, why not use --with-libiconv
+		append-libs iconv
+	fi
+
+	gnome2_src_configure \
+		$(use_enable crypt crypto) \
+		$(use_enable static-libs static) \
+		$(use_enable vala) \
+		$(use_with idn libidn) \
+		$(usex doc "" DB2HTML=)
+}
+
+src_compile() {
+	gnome2_src_compile
+	if use doc; then
+		emake -C docs/tutorial html
+	fi
+}
+
+src_install() {
+	gnome2_src_install
+
+	if use doc ; then
+		docinto tutorial
+		dodoc -r docs/tutorial/html/
+	fi
+}
diff --git a/dev-libs/gom/Manifest b/dev-libs/gom/Manifest
index dd9b4fd47b69..a1cd1642cc9a 100644
--- a/dev-libs/gom/Manifest
+++ b/dev-libs/gom/Manifest
@@ -1,6 +1,8 @@
 AUX 0.3.2-fix-pkgconfig.patch 935 BLAKE2B cc769ecd649c5ee39a5f934268cd55b031bc64512f0abce40e440e9a7fed30b497e1d8d14e267647a0022736befa1880b56b8e1c37a879892bd47381eb9e312f SHA512 5a98cffcff486f485ce9b73ddcee65566689d45df18f86a0a5697df1b2fb4ed3fa1bfe9a915bb8f22c2f3afc4f24da97b739bc1a61310b34fded75bd7a415eb8
 DIST gom-0.3.2.tar.xz 410300 BLAKE2B c0c79c1c3f8a28a0ee992fa4c316538eb87ec26c77def353e8b2038e32f30f9daed433c6d6f6c81069e05e46a980f7d944c955182d973d42f3bd84a341c5a34d SHA512 a7bfb263e5ff6f89768d8fcbdcc949d4ec9b82ecbb80952becd357a3d5781a60e52a327e865e39e46d542b2a2c5e5c861e5302d7ae3c3a2258d3c3f698263675
 DIST gom-0.3.3.tar.xz 101580 BLAKE2B 08e0abb9eaf23ba3bbbca54289ebaa695af705e65b9b612f125e72c62f337baec899d16e657d3de51baeb4ffb79b583716a01d74067e256d59e1dcb63723273e SHA512 152924e704c92f39c493a8becc73fac1f7fe396f4f9e7c154dccec2b4413476821e43abf3c108cc1304de471e61f56c265f124710379ad8568b68f8902064e03
+DIST gom-0.4.tar.xz 102744 BLAKE2B 8116ac388a56e85effbb37c3d5ea5036f6de2f4ad7ee8fe119bd058e1ac3e293eab612a739cdba7467202bc9e258f7cd65b1f116e146577d3a103fc03afba37f SHA512 d847928ce09c53a3f64777c313cb843052e5e001873f29d3f7acf02772cadf0e4b133fb0137aa0463b4ff95dd54810bde87062d8e396ff4fc6d142ba59c8e9c8
 EBUILD gom-0.3.2-r1.ebuild 1591 BLAKE2B 2c29de492c91663ebc682ecb8baa7d59f0aa62baf913a31d972c4a7450275ff9c2689465eec7bfe21ce91fa2b1c7b273b1832f7799d305d826109f16017316b7 SHA512 c6ea43c72be19c8162a37891b56a2f1563ae2aea5dc076125d5286b577c2a633b54a50863ec5f532190d2772afed82f15db4b0537bdbef075ed18c4bb0a959e1
-EBUILD gom-0.3.3.ebuild 1316 BLAKE2B 3c920c55bb033c57023b8add61c2bc8307815ba902c050ca80cdf75e9f459f7791316898849a1c6c8b8de1ac86d9d2c250857a86c38de8fbb60c27336db5c37b SHA512 e2940c7661a35bed4b54682669ab8126a7d31eb27c14208ee729ed84385cb5318acac1355914352a0b435e54682483e7d4ee65f41bacee54c1c1bf8df397393d
+EBUILD gom-0.3.3.ebuild 1480 BLAKE2B 768f4d3721e370dc7064afdc391dfbb4ecfc9ba29b56e8ea505e210b09c29d2c106e26383dce6538aad59ab800848f65cddba3b5f9a980420642ee8cda228809 SHA512 071b7fca68016667362bcc075db1e82ba6899854772678d338eedbde654fcaf00fb67ef6ea3b72f399cca98d4a029e64181ee146300999fa2a07a23e209029e4
+EBUILD gom-0.4.ebuild 1441 BLAKE2B 6c7e140fa0f1c5bb417ae4b094907e983d12b35138d3277e8d6615b6f6d1267a082dba2f4b273dc59bbc7c02d2d3d11a0f74ff8e3c59176f8ad153f81f2a86c6 SHA512 1433b25d11d1627c08ca0f0b2f5f9874dad1e6ecdd3813ef2902a46614a07dad4614a508a6fa960aa65ba728ad18a771aea0b60bbcbb0ccde75044ca8282eea9
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gom/gom-0.3.3.ebuild b/dev-libs/gom/gom-0.3.3.ebuild
index 146fe47ed507..5d6e936cc3a9 100644
--- a/dev-libs/gom/gom-0.3.3.ebuild
+++ b/dev-libs/gom/gom-0.3.3.ebuild
@@ -13,24 +13,24 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
 LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc +introspection test"
+IUSE="gtk-doc +introspection test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+# <glib-2.63.3 to avoid getting hit worse by https://gitlab.gnome.org/GNOME/gom/issues/24 - fixed in gom-0.4
 RDEPEND="
 	>=dev-db/sqlite-3.7:3
 	>=dev-libs/glib-2.36:2
+	<dev-libs/glib-2.63.3:2
 	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
 	${PYTHON_DEPS}
 	>=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	>=dev-util/intltool-0.40.0
-	sys-devel/gettext
+	gtk-doc? ( dev-util/gtk-doc )
 	virtual/pkgconfig
 	x11-libs/gdk-pixbuf:2
-"
+" # only tests need gdk-pixbuf, but they are unconditionally built
 
 pkg_setup() {
 	python_setup
@@ -39,7 +39,7 @@ pkg_setup() {
 src_configure() {
 	local emesonargs=(
 		$(meson_use introspection enable-introspection)
-		$(meson_use doc enable-gtk-doc)
+		$(meson_use gtk-doc enable-gtk-doc)
 	)
 
 	python_foreach_impl meson_src_configure
diff --git a/dev-libs/gom/gom-0.4.ebuild b/dev-libs/gom/gom-0.4.ebuild
new file mode 100644
index 000000000000..39a0e11e94df
--- /dev/null
+++ b/dev-libs/gom/gom-0.4.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org meson python-r1
+
+DESCRIPTION="GObject to SQLite object mapper library"
+HOMEPAGE="https://wiki.gnome.org/Projects/Gom"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gtk-doc +introspection python test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="python? ( introspection ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-db/sqlite-3.7:3
+	>=dev-libs/glib-2.36:2
+	introspection? ( >=dev-libs/gobject-introspection-1.30.0:= )
+	python? ( ${PYTHON_DEPS}
+		>=dev-python/pygobject-3.16:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	virtual/pkgconfig
+	test? ( x11-libs/gdk-pixbuf:2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e '/subdir.*python/d' bindings/meson.build || die
+	# drop test building and deps if not enabled
+	if ! use test; then
+		sed -i -e '/gdkpixbuf_dep/d' meson.build || die
+		sed -i -e '/subdir(.*tests.*)/d' meson.build || die
+	fi
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use introspection enable-introspection)
+		$(meson_use gtk-doc enable-gtk-doc)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	docinto examples
+	dodoc examples/*.py
+
+	meson_src_install
+
+	if use python; then
+		python_foreach_impl python_domodule bindings/python/gi
+	fi
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index b3080ed6ce79..0a1b131e1621 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,6 +1,8 @@
 AUX icu-64.1-data_archive_generation.patch 473 BLAKE2B 88e77149ec92a316d5e534a6aba8808829ebdef16978fc7130bb4fba80f2bcc7886bafe3c944ff83f56cbf5f02860a35cb0a655722ce305e5e6b05dae15d5254 SHA512 3cf34c7ffaa200f841d605f11ee8145d70f2975be2ae5282a6de2fb5caf6bd8ae67e05cf652b0714023087fa145b4e5fdd4e4287dc331334ec347d957674d291
 AUX icu-64.2-darwin.patch 2162 BLAKE2B 74682494b903ee1cdcd2025afe36648adef39573754ccb0e0e86b5b7d7f26937c6ea54d655e8482ad9d7a2ccc64b5c8a8640d4e71390b19b64a25bde76b3d63d SHA512 e4e0eb9f953285f4221f2733a3a76c23e9e72127ce3ac0ecc67a46a9e37236dee352f28b7b9befdcae9e2f95297e01a98e0dd177697ee6335145ad5088d2f00f
+AUX icu-65.1-integer-overflow.patch 4191 BLAKE2B 3163c1237e4943c2d46b10381cb16ef3f2abbdec218a4908e843e03c874d1998784156f8d9f61a57754b70c8f9b5f48c369bb25366d66a6ca355ef58c68754d8 SHA512 1e141588cd6f3685cd8e0a4c232c95cacd14d02e1fa8ff87c5159432ec01a95c7dd832050c74d6fb51c01cd4fb2291a374b3df6334f509472a8b2d2f990f2bfb
 AUX icu-65.1-remove-bashisms.patch 4963 BLAKE2B fb781741a7a908638876729d573a73e42b7b3f0f3e692b54799fed0dac006ecb731583d90d849ea06be47259a0a236933fa7a78a96b3a8107ee85f916dc2000a SHA512 67e60068c356ca8d93b137eadeef2562ff7d8f38153babc97edd92a2c38d7113396d63d4a09364dacefc612b4b3ea28872a4f767c4f38d3e725943b32f98c5bc
 DIST icu4c-65_1-src.tgz 24267934 BLAKE2B 3c62781201c02a2b1027c9b6db4586f8ccdfb339c0765301a381242d5218f3503a1cdbdc1dc9a1a23ffa657096adc4bf7f0b7fe702461f14beba293a7e82e02c SHA512 8f1ef33e1f4abc9a8ee870331c59f01b473d6da1251a19ce403f822f3e3871096f0791855d39c8f20c612fc49cda2c62c06864aa32ddab2dbd186d2b21ce9139
-EBUILD icu-65.1.ebuild 3390 BLAKE2B f7ea8c353e38b2c3d34e753379d27f400299a8bb6bcc35171f99c700601336329831ad8ebd4e45f7656d80e902fbb60da372274048851622b91f6fa9dbc7a9b9 SHA512 05bbc33f707a9f776e69516c8fe170af7459e07f0ffcdcc54fe003f255378cfbb4db3950751570f55d20fe81b11f0677081df9ba8701b85ff7b1e0777fe236aa
+EBUILD icu-65.1-r1.ebuild 3460 BLAKE2B 0dd490c745be064f6597a3e5c62557e5c489beaaef4c18a5dd47838a4b5ffb0ce9d24ab67f5eddd29b94a4b29e95585c55ee1e091a4b4c4b7a51c3029efa40be SHA512 1c3441e9e4a2b3ac2ddc53da914526c0a4d4faf39e9ca93a57d5915279e5c5c77c364b769d43b02881e8c13be23483982b5ccb84a67608952be43f899e64b280
+EBUILD icu-65.1.ebuild 3391 BLAKE2B a0cd53e6d1d4ca15a9d8647bb9f1239d3f3e131dddf77f804676f455f6c717ee67bc19b591d2760f2555b27ee291f0ae90662766b01140b2b000c42d0b040c34 SHA512 48e299923ab7b58c8c779dad13ebf142fdcc4aaa1db3d010d979a4ede3055aa428d621714ef9edb8339804d22dac9d6c7380731fb782a9958160f2269d2bc6cc
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/dev-libs/icu/files/icu-65.1-integer-overflow.patch b/dev-libs/icu/files/icu-65.1-integer-overflow.patch
new file mode 100644
index 000000000000..8e76a9f289dd
--- /dev/null
+++ b/dev-libs/icu/files/icu-65.1-integer-overflow.patch
@@ -0,0 +1,118 @@
+From b7d08bc04a4296982fcef8b6b8a354a9e4e7afca Mon Sep 17 00:00:00 2001
+From: Frank Tang <ftang@chromium.org>
+Date: Sat, 1 Feb 2020 02:39:04 +0000
+Subject: [PATCH] ICU-20958 Prevent SEGV_MAPERR in append
+
+See #971
+---
+ common/unistr.cpp          |  6 ++-
+ test/intltest/ustrtest.cpp | 62 +++++++++++++++++++++++++
+ test/intltest/ustrtest.h   |  1 +
+ 3 files changed, 68 insertions(+), 1 deletion(-)
+
+diff --git a/common/unistr.cpp b/common/unistr.cpp
+index 901bb3358ba..077b4d6ef20 100644
+--- a/common/unistr.cpp
++++ b/common/unistr.cpp
+@@ -1563,7 +1563,11 @@ UnicodeString::doAppend(const UChar *srcChars, int32_t srcStart, int32_t srcLeng
+   }
+ 
+   int32_t oldLength = length();
+-  int32_t newLength = oldLength + srcLength;
++  int32_t newLength;
++  if (uprv_add32_overflow(oldLength, srcLength, &newLength)) {
++    setToBogus();
++    return *this;
++  }
+ 
+   // Check for append onto ourself
+   const UChar* oldArray = getArrayStart();
+diff --git a/test/intltest/ustrtest.cpp b/test/intltest/ustrtest.cpp
+index b6515ea813c..ad38bdf53a3 100644
+--- a/test/intltest/ustrtest.cpp
++++ b/test/intltest/ustrtest.cpp
+@@ -67,6 +67,7 @@ void UnicodeStringTest::runIndexedTest( int32_t index, UBool exec, const char* &
+     TESTCASE_AUTO(TestWCharPointers);
+     TESTCASE_AUTO(TestNullPointers);
+     TESTCASE_AUTO(TestUnicodeStringInsertAppendToSelf);
++    TESTCASE_AUTO(TestLargeAppend);
+     TESTCASE_AUTO_END;
+ }
+ 
+@@ -2310,3 +2311,64 @@ void UnicodeStringTest::TestUnicodeStringInsertAppendToSelf() {
+     str.insert(2, sub);
+     assertEquals("", u"abbcdcde", str);
+ }
++
++void UnicodeStringTest::TestLargeAppend() {
++    if(quick) return;
++
++    IcuTestErrorCode status(*this, "TestLargeAppend");
++    // Make a large UnicodeString
++    int32_t len = 0xAFFFFFF;
++    UnicodeString str;
++    char16_t *buf = str.getBuffer(len);
++    // A fast way to set buffer to valid Unicode.
++    // 4E4E is a valid unicode character
++    uprv_memset(buf, 0x4e, len * 2);
++    str.releaseBuffer(len);
++    UnicodeString dest;
++    // Append it 16 times
++    // 0xAFFFFFF times 16 is 0xA4FFFFF1,
++    // which is greater than INT32_MAX, which is 0x7FFFFFFF.
++    int64_t total = 0;
++    for (int32_t i = 0; i < 16; i++) {
++        dest.append(str);
++        total += len;
++        if (total <= INT32_MAX) {
++            assertFalse("dest is not bogus", dest.isBogus());
++        } else {
++            assertTrue("dest should be bogus", dest.isBogus());
++        }
++    }
++    dest.remove();
++    total = 0;
++    for (int32_t i = 0; i < 16; i++) {
++        dest.append(str);
++        total += len;
++        if (total + len <= INT32_MAX) {
++            assertFalse("dest is not bogus", dest.isBogus());
++        } else if (total <= INT32_MAX) {
++            // Check that a string of exactly the maximum size works
++            UnicodeString str2;
++            int32_t remain = INT32_MAX - total;
++            char16_t *buf2 = str2.getBuffer(remain);
++            if (buf2 == nullptr) {
++                // if somehow memory allocation fail, return the test
++                return;
++            }
++            uprv_memset(buf2, 0x4e, remain * 2);
++            str2.releaseBuffer(remain);
++            dest.append(str2);
++            total += remain;
++            assertEquals("When a string of exactly the maximum size works", (int64_t)INT32_MAX, total);
++            assertEquals("When a string of exactly the maximum size works", INT32_MAX, dest.length());
++            assertFalse("dest is not bogus", dest.isBogus());
++
++            // Check that a string size+1 goes bogus
++            str2.truncate(1);
++            dest.append(str2);
++            total++;
++            assertTrue("dest should be bogus", dest.isBogus());
++        } else {
++            assertTrue("dest should be bogus", dest.isBogus());
++        }
++    }
++}
+diff --git a/test/intltest/ustrtest.h b/test/intltest/ustrtest.h
+index 218befdcc68..4a356a92c7a 100644
+--- a/test/intltest/ustrtest.h
++++ b/test/intltest/ustrtest.h
+@@ -97,6 +97,7 @@ class UnicodeStringTest: public IntlTest {
+     void TestWCharPointers();
+     void TestNullPointers();
+     void TestUnicodeStringInsertAppendToSelf();
++    void TestLargeAppend();
+ };
+ 
+ #endif
diff --git a/dev-libs/icu/icu-65.1-r1.ebuild b/dev-libs/icu/icu-65.1-r1.ebuild
new file mode 100644
index 000000000000..d11f7406c339
--- /dev/null
+++ b/dev-libs/icu/icu-65.1-r1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="http://site.icu-project.org/"
+SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+
+LICENSE="BSD"
+
+SLOT="0/${PV}"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="debug doc examples static-libs"
+
+BDEPEND="${PYTHON_DEPS}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+S="${WORKDIR}/${PN}/source"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-64.1-data_archive_generation.patch"
+	"${FILESDIR}/${PN}-65.1-integer-overflow.patch" # bug 710758
+)
+
+src_prepare() {
+	default
+
+	local variable
+
+	# Disable renaming as it is stupid thing to do
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	# make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 VERBOSE="1" check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	docinto html
+	dodoc ../readme.html
+}
diff --git a/dev-libs/icu/icu-65.1.ebuild b/dev-libs/icu/icu-65.1.ebuild
index 7a70b1dd021d..7897bd2cbf43 100644
--- a/dev-libs/icu/icu-65.1.ebuild
+++ b/dev-libs/icu/icu-65.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,7} )
 inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
 
 DESCRIPTION="International Components for Unicode"
-HOMEPAGE="http://www.icu-project.org/"
+HOMEPAGE="http://site.icu-project.org/"
 SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
 
 LICENSE="BSD"
diff --git a/dev-libs/intel-neo/Manifest b/dev-libs/intel-neo/Manifest
index 3ad0c4dff061..a04cac1a977e 100644
--- a/dev-libs/intel-neo/Manifest
+++ b/dev-libs/intel-neo/Manifest
@@ -2,4 +2,4 @@ DIST intel-neo-19.48.14977.tar.gz 2633172 BLAKE2B 296c85c89833e49f66c428b62fda97
 DIST intel-neo-20.03.15346.tar.gz 2671869 BLAKE2B cf1e242563a377d533b1e5adc89257e3fdd879a0f275f069e9c1c3c8436e269a1ec57e951394d2a487148bfc5393fed0ce1f3feb6954c7ece9de59cccffd628c SHA512 4d2cc8fdcba714832306e6353e8688e12c44eb0f848aad981951ee092274ba8ae032db462b49e874b7ac72e1b8b2b9ba71a84b6715ca241c06a1c70e753e5ed3
 EBUILD intel-neo-19.48.14977.ebuild 1267 BLAKE2B ba1c0f82596ae418fdf8c38a61039fed601b28f81430b16b610eb2c3f45d8e6a0d2bed49fcffd7b87444b71d0d57e6b710b78d807d63600e165ec740d1386bfa SHA512 ba43a79823c69965de75dddac8e886399e60bcf5fcf282e032ebffff277702b918a8796d781abc3c5ff82c491b098a910074495b23bbed527493b4c727f198a4
 EBUILD intel-neo-20.03.15346.ebuild 1247 BLAKE2B 90cb6ad2d7f1086a0f35fdd64199a467183945f8e7101b77c66102ce547bf5ac2d10fdca2755e3917df7dbb8d7111bc41717c7fe1603c48f55e9679636f64e1c SHA512 1c4f838410125a06f929ed4f0c0b9d23b59f5b85e4318723cc28db89862b5e1af2dd0c316676b50e83f4528764fde17124f19232b381df9d2a29a659c90097b2
-MISC metadata.xml 871 BLAKE2B 2e394b97e0147760965e10f7d43f3b7f189a0f146df84adbcfd5adf22937587982b113fe4d7f07d436265746eb9339d5141dbe2655846a1b10ebcc0751f1a763 SHA512 1092d3b8c8dd26fac3822f0b4d25f19ea74726df3f3978a6d596a97b5019465a8a7a853fb98512a07f51c5b81ecc3a7fb9350fb796a2fb7fb27fd16b937eff93
+MISC metadata.xml 735 BLAKE2B 7b75773dfa61833dc93d975c59f9486ea53c1727eb2639f905c9aa858d30fe21a9378f52d97bdcf5ce15f80825d48fadae8ca3abfff8d219e6e6cb431906bc84 SHA512 66c14c5dc86bbfe47c8fd3a95001013fa9dfd5093687e3b602f2b2fd3d81f6f2c2242621a8dcde2930901ab3853a677e646b136eb16c3d19f29647efede3d030
diff --git a/dev-libs/intel-neo/metadata.xml b/dev-libs/intel-neo/metadata.xml
index 2c902f213320..d7b990043c17 100644
--- a/dev-libs/intel-neo/metadata.xml
+++ b/dev-libs/intel-neo/metadata.xml
@@ -8,9 +8,7 @@
 	<longdescription>The Intel Graphics Compute Runtime for OpenCL, informally
 		known as NEO, is an open source project to converge Intel's development
 		efforts on OpenCL compute stacks supporting Gen8 graphics devices
-		(Broadwell architecture) and newer.
-		For OpenCL support on Sandy Bridge, Ivy Bridge and Haswell architectures
-		please have a look at <pkg>dev-libs/beignet</pkg> instead.</longdescription>
+		(Broadwell architecture) and newer.</longdescription>
 	<use>
 		<flag name="vaapi">Support the sharing of surfaces with Video Acceleration API
 			(OpenCL Extension #36)</flag>
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index 827643f748db..97001e5b4ea3 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -2,5 +2,5 @@ DIST jsoncpp-1.9.1.tar.gz 203067 BLAKE2B 654f39b1265b344bb24d3fefb34d4d8b44f69ec
 DIST jsoncpp-1.9.2.tar.gz 211341 BLAKE2B 9081bf2b2599194c1c77476287e34aaeacc3c331147db79e3343eae28321e55dbfc8d74faf899912c257194030d39eac4fdb016a68290755badd1b68b0a69dd4 SHA512 7c7188199d62ae040d458d507ba62f0370c53f39c580760ee5485cae5c08e5ced0c9aea7c14f54dfd041999a7291e4d0f67f8ccd8b1030622c85590774688640
 EBUILD jsoncpp-1.9.1.ebuild 1367 BLAKE2B 6da8a10771ba8020d8903ab0c407d34fce626d4e206232f4d948d3795d913d04bc7a3643bbdbab66bf4f83f5d6fe7b4ebd87d1e4d686a1409adabf5b58fb9e5a SHA512 4abf33513a9296e2362027cda6de4b8ba158fa5e3e4ec4d709436c3e8c687e2da30e9e3dcf462da6f5106cdc6821041fd7b848ed54ca9a672d664d28498c8ea5
 EBUILD jsoncpp-1.9.2-r1.ebuild 1372 BLAKE2B e33bda4af994ea0ec1a2c7e8d5012f93e20dbe0583253ea8cd026d1e2bcc25a769500a47a58014471fe348f425c3301b3c3502522d0edcf09a1727d22d46c659 SHA512 eaddfaa3ddb9516b144472db2e584700f3862a9cf7fa4195b5d0b63a6f3e3a36ae2039a01e378981991b7adbd6cad140cb636741bf8b25d461e821faee73a8c1
-EBUILD jsoncpp-1.9.2-r2.ebuild 991 BLAKE2B e2f317f69acf14707bc1861e96689c89f7fceddd20a5639dc9431cd5824b078cc5794c566097ca0eaa054025668e1dbac3444daacd2f843801efa5964d486ddd SHA512 5ad3d87053f8af8b437cd5cd1fb5dfe23d38b476845da81e0d4b3bccc7d99e8f74057bd227e6699bd028ec10949a83cabd11f1e5deaa662732615340a9a9ac7b
+EBUILD jsoncpp-1.9.2-r2.ebuild 982 BLAKE2B 603299671d26d973475dd3d051b25f840ab104142a694514a45b324b096e8501e7c0740f4d3fbb59528e35a310b6ed5b776485501eb7115944ea0b8540908afa SHA512 c5879a20232398ffd46cd6d0fc8f8b1fc0a434cee1d80012effa6f6ce5597d78b218d2d804abd3776d5515fa1ef6eafaf7c463dd62a412fabf53c2e6183ddbfb
 MISC metadata.xml 403 BLAKE2B 985aad23f9fb2f5353256441788238f78db3c032939ff64bebef834ce57981815ee6a26425d6ccbd60aa55d8c0d2ba6242d7292fa8d8809c217772f0271333aa SHA512 be01555147e932712eeb85ba9ac38bbbf5b5e2647178022cef35c9db82f51171dc6ab25076a32f7eaa6bda93f2a4ec7b836479b81bf33a48a84b622395768088
diff --git a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
index 3e8ebb177b77..b533d3be01c6 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.9.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/22"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/kpeoplevcard/Manifest b/dev-libs/kpeoplevcard/Manifest
index b2f09c2f0b3d..a02dfe4b232a 100644
--- a/dev-libs/kpeoplevcard/Manifest
+++ b/dev-libs/kpeoplevcard/Manifest
@@ -1,3 +1,3 @@
 DIST kpeoplevcard-0.1.tar.xz 13424 BLAKE2B 567b5f081283da8af26e03c3e46c50bf67524146171a6f8afa938ac9609d11bfe32ad8de39a29ec0431af135f33825149fb8e98a28141941fd418539a8f03c30 SHA512 9f11ee768d1ddce1f03f41b604180078c0315eb8b9f0118dd99eba65333400b0a0ed12ab1e08ebce3c6c0a2c93563e5c3e832a0cd458d6ea296bd64eeb9413e7
-EBUILD kpeoplevcard-0.1.ebuild 617 BLAKE2B 23201c599eba39e1ac9026fb7db5fd54f83e42586f9166aed86cbb66a153d5019a7050f05b0d618bfdb77e958d93bb7d7dff21e0045192c79c29e8402ad43b5d SHA512 5f68488bcacce44b8709d774e65b20e7f91f7f6043809c992bd3d69e53c64087375810e7a15ca5bcad9117386a9620dc5f38fe51e794841ab2591d700d24daf6
+EBUILD kpeoplevcard-0.1.ebuild 627 BLAKE2B 25166543cbea5e49a8206c802d9d125a07a7fbb9413eeff1a58afe18de9a97f547ee739f10d55e50884194f5e37e5b0e72c8bb550bc38c10a478032766a7f0f3 SHA512 4681858903aea233688359a0b9ba88e6218831f629f658a770b2632992d8a2262335f89b70f0697993a04c1016b1819a60a031c04cb452b6ebeed1f2bc2761a2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
index 6f959ab3d3e5..3c8f5e033cc1 100644
--- a/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
+++ b/dev-libs/kpeoplevcard/kpeoplevcard-0.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://cgit.kde.org/kpeoplevcard.git"
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64 ~arm64 x86"
 fi
 
 LICENSE="LGPL-2.1+"
diff --git a/dev-libs/kuserfeedback/Manifest b/dev-libs/kuserfeedback/Manifest
index 199a10110f43..f4a191697eda 100644
--- a/dev-libs/kuserfeedback/Manifest
+++ b/dev-libs/kuserfeedback/Manifest
@@ -1,3 +1,3 @@
 DIST kuserfeedback-1.0.0.tar.xz 187784 BLAKE2B 24acb6c1f143a0811a84c7d4f5ffe923df2fe94b0d13e361870d308b65ee8be747cef1a2ab719c6023b4f5885fb9970620a2a5da0d073e70b1e4912c6f64c5d1 SHA512 d45c45b3f7b50f7ff3e5e5ae7e6a4cd68c0aa444553d0c44a969ae17e51ef5114ab6401c8ce65744ec3d635cb2edc7a127187547f01f4954faa55087c702dea7
-EBUILD kuserfeedback-1.0.0.ebuild 1257 BLAKE2B 9acae65acdf587e6aae6c03dfb144ac2cc06507de8118f020eea8f7644cc9bc92d57d570d58df7a6e289ee811958e42e326524188040fd6929adf46385d914b9 SHA512 7fc3ebf56053484dc164cca0745570c3f9a1c4c267ece38d57b7db5e1c421bb627bfbb2b9d5a01b4dfa9bbc1073bd98246104a8409401e8816ab8b25065757ca
+EBUILD kuserfeedback-1.0.0.ebuild 1274 BLAKE2B 77a3e988d9a383529ebde873970312b444b3ce6a2fa4330ae2ffbdb9e2e2936750d2361be969f69976066d167acbda4cc5599259fbd02e0ec86e2a369ce03f51 SHA512 6c57a3aa0813dadc5fda29bfaef9b7df9e1c3dcc7498ac06abd36d503009ab2317d4031c9500719d9453f726591dcd83b8a900678847dd91b188a63825fcbdee
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
index d254a943a562..9d35caa08776 100644
--- a/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
+++ b/dev-libs/kuserfeedback/kuserfeedback-1.0.0.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Framework to collect user feedback for applications via telemetry a
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/libatasmart/Manifest b/dev-libs/libatasmart/Manifest
index a0674dbd5e3f..56938c6762ad 100644
--- a/dev-libs/libatasmart/Manifest
+++ b/dev-libs/libatasmart/Manifest
@@ -1,4 +1,4 @@
 DIST libatasmart_0.19-5.debian.tar.xz 6452 BLAKE2B 09bde3d5d79062d4df82e5582e932b6b566a91607086ddd805925d1966cdee4cb4ba43863f4b7d26a98588479b117841050f762d23c6719448635bf1e681b315 SHA512 434b6ef3ea377485ce745e147da8bb72851b2eeabe6f418379511650f0161f15a9ee21f4f0b5f9beb218b99eb417c1aeafdea4640995efbaf45024f40ce71802
 DIST libatasmart_0.19.orig.tar.xz 251204 BLAKE2B 7e2a9823c27eee5a41f93464b28236239891349639162c5fdc114c241a70fb39a3046c3de16ce402787cd86e13609fff0578bd26f7a2c994fefe3c9756d45968 SHA512 ec9edb019c477873b01289ba365ad0ed0946505d651c1f6f83a63ef61b3976a5db6439c8a0c74d9a55325db9a3a587ad6f655f8d1af9387b0d08356eccabdb62
-EBUILD libatasmart-0.19_p5.ebuild 1046 BLAKE2B 82f4280fedeaff5298bc21ab6f307065905bb8741655bf6fa126c0a1f1fbdb8c7b5dd423ca5a39a026ee39d9fc34d2ad9ecae597ad00e8440038844bb29a3623 SHA512 4ef198131c03fa5ca350e4741dc8cf89eccf722db90f32d83b641c46169fa987d35fe5710b82ba229ba8e993ad01b8b82c6c10cf6994c889f4e02d1c3c932148
+EBUILD libatasmart-0.19_p5.ebuild 956 BLAKE2B 875e51dda8251178004cdc2f92182dead397d50ca4a16f9f8b60488d69c54f24023a7525076ea14f8efa84fc4ffac8f431c78895c80ae6d78d6a4dae77aed967 SHA512 80865fd613bd2cbac6d42f9c03b73871b6c9862e8ac2aba34583f8eea95fbc81a4aa32e59d6459b2e368d01e668dbb26c0936ad8b1260676042af9e09b96ea94
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
index 3a1a984b101a..449170f19552 100644
--- a/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
+++ b/dev-libs/libatasmart/libatasmart-0.19_p5.ebuild
@@ -31,11 +31,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myeconfargs=(
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
+	econf $(use_enable static-libs static)
 }
 
 src_install() {
diff --git a/dev-libs/libbpf/Manifest b/dev-libs/libbpf/Manifest
index 694ee7f540c2..9b27c0353081 100644
--- a/dev-libs/libbpf/Manifest
+++ b/dev-libs/libbpf/Manifest
@@ -1,11 +1,7 @@
-AUX libbpf-0.0.3-paths.patch 1340 BLAKE2B 62ac9803114000b093b6c2a68d396fdc9f9b447ba0a2726d5f5a176368139e5e3c588e2c9482e26e2b27a7d6b850b8a5daebc9e5084758afcf04312235028cca SHA512 8808f00748e4f717562dd763598e864a7ecd2b12c0983bab4e32fd08aae778f29c5f1d173355275c205df1325e3c2327b99e62929ba1daeca6c20b81c9d9b80b
 AUX libbpf-0.0.5-paths.patch 997 BLAKE2B e84f5349131a1ab7f976e60baf74fa030b28214daca198db2a6d6b436bdf536aa89e58f39ab10a2cf9dbbf192a159cd1231b68dc3292396e1164950b1514de3d SHA512 47ccd456abf37cdf7e986633eb5a90c16963e5d99608f0c3dd6b035466a0ffe6769001d2bf448c2da88f6427fdac658f364b960a072949523a964ae01836add0
-DIST libbpf-0.0.3.tar.gz 127328 BLAKE2B eaa1be54f0a7fcc6fd41eb2adaad2f405f76db3bd7c7466a5484ead1cca5a9fe775e331838cd5645d7399cb5b1a5b2fcb3814fb45643660fd3f7d84b9986bae6 SHA512 ee489d968cd9a20a1f091dcd2696d3807ab0db2a001613684402de2c696391eea033f3bd961eaf1d0df95c1e15f4f0ccfb7003ff98c3f08f24a7e9a8db22cdad
-DIST libbpf-0.0.4.tar.gz 148625 BLAKE2B d8c2343441258a01ca54b0046b0f1d54cb2e0e7a09c99e489409b25d3f2486bc7d8a175b4a3e793b56ba72462d34b9a55c53e86eaf446c64f2c30d673e7f23bd SHA512 1e4a16ed0f3e378aa9d7080e4b54cb3a9542975105b09977d1ddecf3ae4dabb3b5edf80b92b61644b1f0cbda7ee7e135ee0f736e71c1d201a97b1b3dd573b543
-DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
+AUX libbpf-0.0.7-paths.patch 1020 BLAKE2B 6a194c3ecf8ec2600e50b02d231a282a489d3d283ac3e91d6d6cd788fb30881fe245aec073175a801f2f030bca03733a50bc31ed6cf4531ee5c364d19a19f590 SHA512 d8447688a4ea8cb8604882d6534c96309e407701627559c229b372e773c46ed9fe2b879677ebd70d30865b27debb18193173a8adb6e24305ecadcd8b57630e2d
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
-EBUILD libbpf-0.0.3.ebuild 1006 BLAKE2B 0ab59a6d9ed6edf242765758286251d1d2dc65470162549396c13fe87ed790eeb7fb13cc2f14e47f2b8db5078948a6cbaa6cd896abb446b85d7bae9f95f34e07 SHA512 d1ae5e553b46fe69594e4576d1600bee0e6e717fd83d2f095adf2eac0a752797c07f0dd6d8bb2c0449d355fef2fe193e7386cebcf06379172f701bce5c9b38a7
-EBUILD libbpf-0.0.4.ebuild 1006 BLAKE2B 0ab59a6d9ed6edf242765758286251d1d2dc65470162549396c13fe87ed790eeb7fb13cc2f14e47f2b8db5078948a6cbaa6cd896abb446b85d7bae9f95f34e07 SHA512 d1ae5e553b46fe69594e4576d1600bee0e6e717fd83d2f095adf2eac0a752797c07f0dd6d8bb2c0449d355fef2fe193e7386cebcf06379172f701bce5c9b38a7
-EBUILD libbpf-0.0.5.ebuild 1006 BLAKE2B 76d69d107ffe635ca1d7bb638751a877daec5a61f1243690cd42db639e46099f30f9bb572b63c42ff5bdaa14b02995d3caea4482804e0a1aaf817989ea10277a SHA512 7b9fea9a715d9a5306342b22657539a6b053055832320e004bdfe7b9d2a8528f93e45d6ae18bf2c95bb19e2d6beb1e773180175c0dd796eb179df2828fe1e218
+DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
 EBUILD libbpf-0.0.6.ebuild 1006 BLAKE2B 76d69d107ffe635ca1d7bb638751a877daec5a61f1243690cd42db639e46099f30f9bb572b63c42ff5bdaa14b02995d3caea4482804e0a1aaf817989ea10277a SHA512 7b9fea9a715d9a5306342b22657539a6b053055832320e004bdfe7b9d2a8528f93e45d6ae18bf2c95bb19e2d6beb1e773180175c0dd796eb179df2828fe1e218
+EBUILD libbpf-0.0.7.ebuild 1011 BLAKE2B 3c6bb6dfe691286dd75ad4644c49308742eba3762961cf620ec2e91086ed5e320fdb0d05186d771bbf95b547469f02d6c896e6e784add7e0f51057bfb12e67a1 SHA512 86ac8b1d5eb4c94cc221abdff5c049822b0dfffa201847a599ba39400ae93ad9944b8ad17f0e6a7d38e6c5f7cf727dd46c303f33f3c83224fac4f9c5af81cab6
 MISC metadata.xml 305 BLAKE2B d5a605019f99aa1bb75e405bface00e9006038c60d280bdab31ac9a42e3bcf75e2884b3efc8be4e2a88f7e35769b610f0480ccfba291444e8d4ddaecf73a57f9 SHA512 38df62cf50255dcd59c3ab6961643379e549eb568f2c0d010cd8bf73a93fceb0dbdbb32af7b07f21475b4146f99e684aad6928963e56ea8d6777b8f63f8d8a41
diff --git a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
deleted file mode 100644
index 8f905819f656..000000000000
--- a/dev-libs/libbpf/files/libbpf-0.0.3-paths.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff --git a/Makefile b/src/Makefile
-index 82a650c..549779d 100644
---- a/Makefile
-+++ b/src/Makefile
-@@ -36,7 +36,10 @@ OBJDIR ?= .
- OBJS := $(addprefix $(OBJDIR)/,bpf.o btf.o libbpf.o libbpf_errno.o netlink.o \
- 	nlattr.o str_error.o libbpf_probes.o bpf_prog_linfo.o xsk.o)
- 
--LIBS := $(OBJDIR)/libbpf.a
-+ifdef BUILD_STATIC
-+	LIBS := $(OBJDIR)/libbpf.a
-+endif
-+
- ifndef BUILD_STATIC_ONLY
- 	LIBS += $(OBJDIR)/libbpf.so \
- 		$(OBJDIR)/libbpf.so.$(VERSION) \
-@@ -63,7 +66,7 @@ endif
- PREFIX ?= /usr
- LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
- INCLUDEDIR ?= $(PREFIX)/include
--UAPIDIR ?= $(PREFIX)/include
-+UAPIDIR ?= $(PREFIX)/include/bpf/uapi
- 
- all: $(LIBS) $(PC_FILE)
- 
-@@ -84,6 +87,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(OBJS)
- $(OBJDIR)/libbpf.pc:
- 	sed -e "s|@PREFIX@|$(PREFIX)|" \
- 		-e "s|@LIBDIR@|$(LIBDIR)|" \
-+		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
- 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
- 		< libbpf.pc.template > $@
- 
-diff --git a/libbpf.pc.template b/src/libbpf.pc.template
-index ac17fce..6d385d9 100644
---- a/libbpf.pc.template
-+++ b/src/libbpf.pc.template
-@@ -3,10 +3,11 @@
- prefix=@PREFIX@
- libdir=@LIBDIR@
- includedir=${prefix}/include
-+uapidir=@UAPIDIR@
- 
- Name: libbpf
- Description: BPF library
- Version: @VERSION@
- Libs: -L${libdir} -lbpf
- Requires.private: libelf
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -I${uapidir}
diff --git a/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
new file mode 100644
index 000000000000..cbc267b64a38
--- /dev/null
+++ b/dev-libs/libbpf/files/libbpf-0.0.7-paths.patch
@@ -0,0 +1,38 @@
+diff --git a/Makefile b/Makefile
+index bc25aba..e1db3d6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -66,7 +66,7 @@ endif
+ PREFIX ?= /usr
+ LIBDIR ?= $(PREFIX)/$(LIBSUBDIR)
+ INCLUDEDIR ?= $(PREFIX)/include
+-UAPIDIR ?= $(PREFIX)/include
++UAPIDIR ?= $(PREFIX)/include/bpf/uapi
+ 
+ TAGS_PROG := $(if $(shell which etags 2>/dev/null),etags,ctags)
+ 
+@@ -89,6 +89,7 @@ $(OBJDIR)/libbpf.so.$(LIBBPF_VERSION): $(SHARED_OBJS)
+ $(OBJDIR)/libbpf.pc:
+ 	sed -e "s|@PREFIX@|$(PREFIX)|" \
+ 		-e "s|@LIBDIR@|$(LIBDIR)|" \
++		-e "s|@UAPIDIR@|$(UAPIDIR)|" \
+ 		-e "s|@VERSION@|$(LIBBPF_VERSION)|" \
+ 		< libbpf.pc.template > $@
+ 
+diff --git a/libbpf.pc.template b/libbpf.pc.template
+index b45ed53..5ec63c2 100644
+--- a/libbpf.pc.template
++++ b/libbpf.pc.template
+@@ -3,10 +3,11 @@
+ prefix=@PREFIX@
+ libdir=@LIBDIR@
+ includedir=${prefix}/include
++uapidir=@UAPIDIR@
+ 
+ Name: libbpf
+ Description: BPF library
+ Version: @VERSION@
+ Libs: -L${libdir} -lbpf
+ Requires.private: libelf zlib
+-Cflags: -I${includedir}
++Cflags: -I${includedir} -I${uapidir}
diff --git a/dev-libs/libbpf/libbpf-0.0.3.ebuild b/dev-libs/libbpf/libbpf-0.0.3.ebuild
deleted file mode 100644
index b455107a4012..000000000000
--- a/dev-libs/libbpf/libbpf-0.0.3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://github.com/libbpf/libbpf"
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-0.0.3-paths.patch"
-)
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install install_uapi_headers
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-0.0.4.ebuild b/dev-libs/libbpf/libbpf-0.0.4.ebuild
deleted file mode 100644
index b455107a4012..000000000000
--- a/dev-libs/libbpf/libbpf-0.0.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-HOMEPAGE="https://github.com/libbpf/libbpf"
-DESCRIPTION="Stand-alone build of libbpf from the Linux kernel"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+static-libs"
-
-COMMON_DEPEND="virtual/libelf
-	!<=dev-util/bcc-0.7.0"
-DEPEND="${COMMON_DEPEND}
-	sys-kernel/linux-headers"
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${P}/src"
-
-PATCHES=(
-	"${FILESDIR}/libbpf-0.0.3-paths.patch"
-)
-
-src_compile() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		CC="$(tc-getCC)"
-}
-
-src_install() {
-	emake \
-		BUILD_SHARED=y \
-		LIBSUBDIR="$(get_libdir)" \
-		DESTDIR="${D}" \
-		$(usex static-libs 'BUILD_STATIC=y' '' '' '') \
-		install install_uapi_headers
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-}
diff --git a/dev-libs/libbpf/libbpf-0.0.5.ebuild b/dev-libs/libbpf/libbpf-0.0.7.ebuild
index 7e265723db96..6ba1ae96c610 100644
--- a/dev-libs/libbpf/libbpf-0.0.5.ebuild
+++ b/dev-libs/libbpf/libbpf-0.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ RDEPEND="${COMMON_DEPEND}"
 S="${WORKDIR}/${P}/src"
 
 PATCHES=(
-	"${FILESDIR}/libbpf-0.0.5-paths.patch"
+	"${FILESDIR}/libbpf-0.0.7-paths.patch"
 )
 
 src_compile() {
diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 85bde6febb58..b2946a271583 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -10,5 +10,5 @@ EBUILD libcdio-0.94-r1.ebuild 1784 BLAKE2B 027388d0d8bc24d6e6c08b7973ef6219b3ef7
 EBUILD libcdio-1.1.0.ebuild 1808 BLAKE2B 5b03df3e657c8cec7f4f81fbfef731a0fbc633e43c79b0061bc68739180fbb4ba4737ae40a7208a076a9682554619665e9b4f6b15b61adffa605d52d7a625dff SHA512 bae1c2dbc6e1c49ab173b97b4c0f213ad79b36fb7dd68428127f7db3f4a69aa4f0dd4390352cf0742c86919fd74411e7f984a382610e40d1ca1d13612f5645ee
 EBUILD libcdio-2.0.0-r1.ebuild 1860 BLAKE2B 2b915992ce8bef9f703e55a0a33a3dfedb585c04fe6a523151c350dd0cb17a5f293912ae9c2e283c080fd8df653f8bc8131c0e54a7eba42ee0fcdf26859362f2 SHA512 aa380ea27f1bede20cb63b114d48ae998c7e70f97072a55b493e2877b7331bfb942f24a87d88b598d201d04c989eb51da1adee1339f26321f23bb7f5b13b234f
 EBUILD libcdio-2.0.0.ebuild 1807 BLAKE2B b091215f3c5591b183a019049daec31eb62e40452fac49968d8fe2d59d8d57a8fb7770b5cadf7b76dec6ffb27a121a5cbe3092c8c821eea5401a29699c597531 SHA512 49c41e62aa89f206426a1545cafb6205eab57ae14f93e2f8ae4ea3e8c6f72364461ce94e0157c66994c6c71a4055926183e4d455821ba0aeddaba61e04a54e27
-EBUILD libcdio-2.1.0-r1.ebuild 1818 BLAKE2B d5acaec26526e2babdd81393e8612a93d167bb33845f3bb44e83e7afa06028ddf014ab765b522e710fd55f46930714a06010d264d216b3d6444379cce00928ca SHA512 1703703c9f04c4c3a2eccf5e72116d4c3d55604a2b27b2fdf6839c29e27de53f3fbbb197fdbdef1e131850062d44f9b154f4a6e204cd91162d7b94e42f626f20
+EBUILD libcdio-2.1.0-r1.ebuild 1813 BLAKE2B d62e3d6d8e09bb2f25e399dc155f4e2f737814ca6f1064d216024554f9917fdedd2a19c9016875946181384923921a913b1a9055beaada97f4d61b5c1c15991f SHA512 940ab0ca93495b649758b83bdab6b97a276a7e29d4d61e5ad1bca8c6df63d61d9b77dfc723ed8765256d99b0d33c57f92947598fddf154ed6ebd30e84266f46f
 MISC metadata.xml 528 BLAKE2B c36309be516242be4eec641d3f81ed67c0f840154bb8a47983a6fb8340a72bcacb1b2eb4f46610a2e341c5c64494fa620c730a44c306b9334b102edf9884e9ca SHA512 17b0f73a4496400d46b3485909fc6c6b3da85e99b5fc03335e9b6ce50233ac075edbe2fc97eee8bc817e632f53238d1c33c3166d33d0d10d745a31dac3797de9
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
index 25d26ab502f4..aad41827ab08 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0/19" # subslot is based on SONAME
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="cddb +cxx minimal static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libclsync/Manifest b/dev-libs/libclsync/Manifest
index 02d5301162ba..07f48f4dd4c5 100644
--- a/dev-libs/libclsync/Manifest
+++ b/dev-libs/libclsync/Manifest
@@ -1,3 +1,3 @@
 DIST clsync-0.4.2.tar.gz 256042 BLAKE2B 28474fc66341b93705a502fcff390e3affcd89a9e1eb272dce9b28be709562e09c03e9c300cfeb5371e2e618a2239468a58c46212a39d751fbbfddeaab12bcf6 SHA512 d14a2efc4bf58d9d5c7a3fe5634cacdd182cd7cd814b0e9ebd99024a7282b056d1f7ceeec6903666391c3572d599a18e205af818b098ed7768d5c0e0f4cd1200
-EBUILD libclsync-0.4.2.ebuild 1710 BLAKE2B 5ad41b13d7bd05087c382e55ff5b955982778c6df5c67fbf34c3e61287e63cbde4b3ba509791fdebddabe887f8975a447035957cd8d5c146bf1e1f4e9cafaa94 SHA512 2bff5a07a19c949785988528deceda0a39462ea2410cee8abb158db478497c91bfe007e681677d04f1e8e828e38144c79b0254c041585de569dbbb85ed8646ce
+EBUILD libclsync-0.4.2.ebuild 1664 BLAKE2B b9b7e9db566ce8d6b6edaaf641a2653d23003d3e16f86498527a0caf590593784b99fa48694fcf88067f7e9300d0d7e5a96f0b2129ed99ce339834317d8e7214 SHA512 27a2ff3d0b00e3fb52413653d3823ad80c4fc6498bd93b5097e5a8369fc076632f45a341df07682cf82bd7511b426a0e492d1ffa086b558d684ed659227578bd
 MISC metadata.xml 718 BLAKE2B 30766db9a818c3dc8ed475fb0b885d20f6ff058eb2e493572923d9efa7708f29a8f9b91cb159a98e2683fbb268e8e44df7ea955098d574a4a707474abcb96e19 SHA512 4f5edc94ccb24487d3cf9f15dbc3c2e6666de4b22fdc8efe2daf10a2b9d31452d85cabe83403062383865d274aae826944da0756e2630af54b4055ac0fd87f64
diff --git a/dev-libs/libclsync/libclsync-0.4.2.ebuild b/dev-libs/libclsync/libclsync-0.4.2.ebuild
index 0da70660b854..0dac4bb0c59d 100644
--- a/dev-libs/libclsync/libclsync-0.4.2.ebuild
+++ b/dev-libs/libclsync/libclsync-0.4.2.ebuild
@@ -40,7 +40,6 @@ src_configure() {
 	use extra-debug && debug_level=2
 
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--enable-socket-library \
 		--disable-clsync \
 		--enable-debug=${debug_level} \
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 7f01ec7d2df9..d26762be5ce9 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,4 +1,4 @@
 AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
-EBUILD libdaemon-0.14-r3.ebuild 1370 BLAKE2B 209071e407a845e5b0e8fe90e244841b5ebb1993cacd6a6a9b2ec4ab8494e7311d2bc24b98e0d8b17e5d8e51343b7d482aa37bf9370074554343f22ca6e03509 SHA512 ae45a5be3ad7526e84fa30133aa6b0f45f523978f1e57588ee1448f5e1a8f17aba252fe25feb9df4f06d3ab69693d588234706458137a906403e4b3d94d0e0a8
+EBUILD libdaemon-0.14-r3.ebuild 1324 BLAKE2B 6263d4734ec11bc922ee892a0dd62f2f6139502b4642045c9842100dd8d1bafe89123affd26371c501db918756975ce38d0f08ca0cce95cd03eb0772c020c3ac SHA512 ac65b1a2fb7d5647673fd7229e4fcaac3073bfff25dd66137b6e7202e86499885cb80a3fe75cb8a37cd81cb87750ad83f8937e5f14bab6a716563a5b7acd5d08
 MISC metadata.xml 263 BLAKE2B ffc12ff3506230708339c526731fc41075c998b49a137ab20123d685a623bc7b1a1f235a3b3bd170c7761ff470a92fa8d7a4b5a5d12d0d9bc6bf487a39f5dd37 SHA512 0d09fd7f66692657dfa07da397338a22091bdca415b13d84b7fb7f21ceba2c3ecccc49144612b6a7c639ff802c01851e7120a62789397ec585c8db497a3ae692
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
index 3caddc39ff6c..8afbb96151de 100644
--- a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -30,7 +30,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--localstatedir=/var \
 		--disable-examples \
 		--disable-lynx \
diff --git a/dev-libs/libdshconfig/Manifest b/dev-libs/libdshconfig/Manifest
index 7fc26b6fdf43..8bf49eba6fb1 100644
--- a/dev-libs/libdshconfig/Manifest
+++ b/dev-libs/libdshconfig/Manifest
@@ -1,3 +1,3 @@
 DIST libdshconfig-0.20.13.tar.gz 323720 BLAKE2B d470f71930e9c2b909d99fc177a0d867dca459c7831a2752b39573729a3b875bd65fd6cc68da3966912987b07f956afebe84d6f5329437eed391ac92c2ebb296 SHA512 04f3580bf1e1dbac130d350eb4c6e86a980f2ae8636a206821813ed0e14db07dc7ea720ebb3816455a4a939294caa2f2247b7348ecea72769a6f05bee0dbf19a
-EBUILD libdshconfig-0.20.13.ebuild 598 BLAKE2B 10bc232e6e327b37e194f8a2a0a1ee3223cc580862354344e9f3be0ddbbc9d5c926248771d1c47b5e147cb33fbcbadb50102a2ef7611b3bfa7679e6c4481c039 SHA512 5db8ad903de2b4ce77b886606dc1a974f48772dbf49d14d2ef8d6ee4fd84c644afcce54eb591d80069d5335e32868b23fb97c5a19bdb2fd0d416b1538ef8d2c6
+EBUILD libdshconfig-0.20.13.ebuild 561 BLAKE2B 6165ebaa2129964012b9dcda728599a9ff1201b8681cf39a4449e3607f7e184a6f090ce300ba71d6f45975ee6e87db88a70c929e1c9f5f7c4c1f70d92dd98e60 SHA512 638b5c1dfa37c46c79da2c9bf78e68a2d7e54f111d90e2bbd055577cbea1c4bc1c33df9ad5e68e880cbd0703ed420fdd65d43f0e9d88d8b36bc36ab9b587f3ef
 MISC metadata.xml 253 BLAKE2B 2fbd23e1eeca2d6a1474e03aeaa1ad81f16f00141d906ca087f01b67a69e065cac2b3600c2da212ca9fdaf4765788a58ec12b6cd6a45323e5b524dbdb1ce0a77 SHA512 0894860713279dc39bbe7ce3491002710b62c4476198984a0deb6328cb0012c19d7a5546299960bbe600ee240e62a603dd4c4fa04325a753cc0b7c4044c30aba
diff --git a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
index 649f6761cc48..d7ed58d8cbb4 100644
--- a/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
+++ b/dev-libs/libdshconfig/libdshconfig-0.20.13.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit eutils ltprune
+EAPI=7
 
 DESCRIPTION="Library for parsing dsh.style configuration files"
 HOMEPAGE="http://www.netfort.gr.jp/~dancer/software/downloads/"
@@ -12,18 +10,16 @@ SRC_URI="http://www.netfort.gr.jp/~dancer/software/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="static-libs"
 
-DEPEND=""
 RDEPEND="virtual/ssh"
 
 src_configure() {
-	econf \
-		$(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	prune_libtool_files --all
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libedit/Manifest b/dev-libs/libedit/Manifest
index 15124bb7708a..1246d3c9dba6 100644
--- a/dev-libs/libedit/Manifest
+++ b/dev-libs/libedit/Manifest
@@ -6,5 +6,5 @@ DIST libedit-20190324-3.1.tar.gz 521999 BLAKE2B c48161626a5cf3140f75ec1df1d9652d
 DIST libedit-20191211-3.1.tar.gz 516620 BLAKE2B 765926c035143e8e409d87d4f75709c861d83e2d725ec02c7ecfc3cccebe895be7d2902dd41970811207db32e6847689368f6544ea49ad42a600037a3a4edb58 SHA512 8393477a87e65d330b037494110501b5d6d2c1cbe80d82b9bc7a6315a21fd1327fe91354346966d30541015e2c277be2187fa4bb737b14f706957c70f4083547
 EBUILD libedit-20170329.3.1.ebuild 1263 BLAKE2B 1690e60218379cf850aaf31cc0e60667e806f93fee8d4892f2136e8322874e7b8d89f1bec6409481f6520b9ead3023e3006cda655e317880bf41eb1341643324 SHA512 e342679a588ce21c88df11998aa443c06275c9bfc6e41498d3260432f15fd6fb9d6ad53a93a0408146e6cd81e2cef91f1b814da3ebdcd335f466e7b9444ad22e
 EBUILD libedit-20190324.3.1.ebuild 1192 BLAKE2B 5023ddf7b5ac9c2f9d0774d2b91609d44c60aaa95d6e0f5278ea119cc6fabb78d58c3ec1950ca5191c324deb7b3d0edfdd04bab7006ac942b5c8b2d7f1eed074 SHA512 74db523c633d8a9b0028acedaa6d4f8d650969874a09eab2b51c60dcd648ee88aed5fbfdbd03200dec54795696557c65214ea39a16c230ca46b129cd1b087173
-EBUILD libedit-20191211.3.1.ebuild 1160 BLAKE2B 09559625b212af7041b680b272d59d140a330071e0d53dbe70d7fed744eae2fc8f93b87d528e289ee255f692ee809d31af522e6b0c6a4c86246b75475f0cce02 SHA512 6ba1388849c91aba8b6607b931d49354a9acae7af140f87970b93dad71623af03115acc62270c1b9a820500e3cbc0b061cb3837c2b90b165628d7e364165736c
+EBUILD libedit-20191211.3.1.ebuild 1153 BLAKE2B ee952c9748f51b9a6dca119cc4f760d82b9d8f8ebbe5084e2a3e7fb171526d9b9bdad5e06f572fe3d56563fd24db411cd8dfea3e15bb9cb03f813edfa797ca88 SHA512 388fd8907f79f19122b048183ea7937b8a266a6092966d5424f85a46aed037716d1a569a3d88d2530ef88e435daef90cba535d2a4cdc9ca3c61aff38a09f6151
 MISC metadata.xml 641 BLAKE2B 9571b8de7209e3769419ab4286915a24f0efdc432725f0d7157a7625049702db7b05819e542a586583c3df77a3ad34b099c1f00d28855dcf7e117a81f5828e46 SHA512 ad32daf90166761308b53cb1de6fe923e52217f7d3e2359a7c5b8797841de3d4064437b1ffba727acca9085816b615e0c207c268017908ac1557943730539629
diff --git a/dev-libs/libedit/libedit-20191211.3.1.ebuild b/dev-libs/libedit/libedit-20191211.3.1.ebuild
index cda097a9affc..917b88fc3813 100644
--- a/dev-libs/libedit/libedit-20191211.3.1.ebuild
+++ b/dev-libs/libedit/libedit-20191211.3.1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs"
 
 RDEPEND=">=sys-libs/ncurses-5.9-r3[static-libs?,${MULTILIB_USEDEP}]"
diff --git a/dev-libs/libee/Manifest b/dev-libs/libee/Manifest
index 360542fb3e57..c9556bee39e9 100644
--- a/dev-libs/libee/Manifest
+++ b/dev-libs/libee/Manifest
@@ -1,3 +1,3 @@
 DIST libee-0.4.1.tar.gz 357116 BLAKE2B 121f7cbdea1978889b6fcc24bfabee0c64276bf060265578e7b8067d217ee6371dc6e49b7ac733aeb0abe57bcc1df1552029831bd7a6bc6b42431d3166f90037 SHA512 810cbca8077c975b045b6761de22642708b3555aa8959c17e6be3f3865612642176762ca4def09274a6291256608f11b5833bfaaa25ba0d66f71d0dee6f594d4
-EBUILD libee-0.4.1.ebuild 655 BLAKE2B e16742fcd6468001780d3a3640fc988681c1d9f369f349ae06d91f4b869844a1cd353ec25eba28ba2b9aa4e1a1a1dbb70065baf216621b3519c68a7f1b1c82e3 SHA512 08016e57bcd35ffb44a23eb29160e584ae1c60273c89a4e908da58a9ba8b7f6c704f891bdaa930c2435830bd714fbcee5a7a759b82149ec081691c52a67ec7b7
+EBUILD libee-0.4.1.ebuild 639 BLAKE2B 220d965b30db93ae78c8ae956545f720952d2de21ef580fd7946f2ad9a6e2b549ab6c1a7e8c6765d59a56156ba4961c922f2b0220f8e3b8ab69047571174aca4 SHA512 a6444329d6eea20861ce55c1938e1d9a1b13edf60a8e818491c1885d1a4c490ec00f8a763974cb96639d3ddf5c248bd93f1d7cc58125cddc13a20a76fd8851ba
 MISC metadata.xml 325 BLAKE2B 8ff60b6615474ad4ba1def5ef9a89cb98f6e3a54dbb6d45cc3c2b0c6ea815ec71c7d04fb08c9af4cc116b95197dd28c49c9e65b5f43be636751bd1d1abeb909a SHA512 0118c80631e3be45293d46bf16ca279033edd35365dc332f155880fc328a7310272da11ada63de212283d77c7f051bda648520a4b9c0600f67675da4015d14a7
diff --git a/dev-libs/libee/libee-0.4.1.ebuild b/dev-libs/libee/libee-0.4.1.ebuild
index 266f15686957..c00d1015be58 100644
--- a/dev-libs/libee/libee-0.4.1.ebuild
+++ b/dev-libs/libee/libee-0.4.1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit autotools-utils
+EAPI=7
 
 DESCRIPTION="An Event Expression Library inspired by CEE"
 HOMEPAGE="http://www.libee.org"
@@ -12,22 +10,27 @@ SRC_URI="http://www.libee.org/files/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 arm ~arm64 hppa x86 ~amd64-linux"
-IUSE="debug static-libs"
+IUSE="debug"
 
-DEPEND="dev-libs/libxml2
+RDEPEND="
+	dev-libs/libxml2
 	dev-libs/libestr"
-RDEPEND="${DEPEND}"
-
-DOCS=(INSTALL ChangeLog)
+DEPEND="${RDEPEND}"
 
 src_configure() {
-	local myeconfargs=(
+	econf \
+		--disable-static \
+		--enable-testbench \
 		$(use_enable debug)
-		--enable-testbench
-	)
-	autotools-utils_src_configure
 }
 
 src_compile() {
-	autotools-utils_src_compile -j1
+	emake -j1
+}
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libf2c/Manifest b/dev-libs/libf2c/Manifest
index 7baded1e6782..637aea171ed7 100644
--- a/dev-libs/libf2c/Manifest
+++ b/dev-libs/libf2c/Manifest
@@ -5,5 +5,5 @@ AUX libf2c-20110801-format-security.patch 345 BLAKE2B 723f79e2fa5015c49bd763473b
 AUX libf2c-20110801-main.patch 1708 BLAKE2B becf5fd72a0d9bad9a6fef4d6013b2e1dbedd2b2d1cb9764a3a04772648f24f2875d6257595c95c09b17159baf47c217d4fbdc3cd4d6dfa37980adb306552e3e SHA512 f2c8574f45580d2bf99e5506266668c615f19a985ffa27eefe38d373f083da61dbe486d5c27e034bd38029b46a4a77285e175a7285b1acb37e7a1ecfea6a2bbc
 AUX libf2c-20130927-fix-buildsystem.patch 1632 BLAKE2B 381a2e03ee75f0553325c4b5bbc1191d7262d0fec6d315791684a761f1be6e0749782a679fce805b1d4eb466d0f219d78bec6ef03968addaa47c3a0d1c212c59 SHA512 40191835f7b5d6a9865c68e0fb8a7168715b2f79cad069192427cc657b9664ac9f242c7b746aa821b81c33ae2c08c6d936f838b2f5228acde35d8aeb7c102b93
 DIST libf2c-20130927.zip 129082 BLAKE2B 09f818bde8888b569858784c39e93a6a11b3103039f44c3f6a1246b29efb5f8ae6e45f787ed0c2216bea383a79b9554aff30e1fbb00668bbc872b4bc30d87ba8 SHA512 1a12093dec3c250f4775eebd06f1a9144fdb956ea3162202fb67569fdd956ac5591bc563a0726ca65ea10d465efaac1c1d8024d63bc4a4b5c88bf46242607c8a
-EBUILD libf2c-20130927-r1.ebuild 1206 BLAKE2B ca58597864c9a53c1492bba6aa5ce1a7ddc56e2870de0f34299e42c215418591106fb65aaf1c593e863f2eaaac70bd44611aa9a3814278e6489224bccbd56d44 SHA512 1ca74b5d405978b2a6f6e7f718ad7c86b4923119c0d9e76be93d7c4ea2bd663af38d3e1214c0fbe6506dadfac184c2af3c24a9ade9815fdcb1e76c9a89f4862b
+EBUILD libf2c-20130927-r1.ebuild 1205 BLAKE2B cff5e1b623ff71ca2b39e034dba3efd11f01b99dde6f913f8f86d49d7cb223d15b13839eefacd13cd62667b32b35fac54823d685ceb7b9a478a7884de8cd5431 SHA512 cfec1b64ef22c178cd7ea30653314ecde95cee384b6580030d555c861f0215aaf6027ffedf33f547d4d9adc6274b652445f84562e81080384e9d2521feba30a1
 MISC metadata.xml 363 BLAKE2B 854c5e9e83fb984b31f4def65cb25720bacbff0522fe93e3488211611e15896e562ab86a101ea0f661ffa6de9bb15331dce1e39ca614b1987ed35184029a0d18 SHA512 3c5efbb36dba02cfa31cb0b95c78194bfecfcc128b60eb5c11983da6ac26fb0d75bc02e004443fc6365d3cf53b6d9bffc3a0342c185e61ffdc404cb8b4a3f95e
diff --git a/dev-libs/libf2c/libf2c-20130927-r1.ebuild b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
index 4b977242dc7b..d5e8ade2f5ef 100644
--- a/dev-libs/libf2c/libf2c-20130927-r1.ebuild
+++ b/dev-libs/libf2c/libf2c-20130927-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -43,7 +43,7 @@ src_compile() {
 	emake -f makefile.u libf2c.so
 }
 
-src_install () {
+src_install() {
 	doheader f2c.h
 
 	dolib.so libf2c.so.2
diff --git a/dev-libs/libfido2/Manifest b/dev-libs/libfido2/Manifest
index 2ba15557e7b5..b5bc885157bc 100644
--- a/dev-libs/libfido2/Manifest
+++ b/dev-libs/libfido2/Manifest
@@ -1,5 +1,7 @@
 AUX libfido2-1.3.0-cmakelists.patch 1210 BLAKE2B a7b90def3763bc5c07511103c05917009532219dbd5fc2c2ee90e0a8c68251c938d23977449998ea98afa35900813e38b16b230379e5add15fa4ad18851134b9 SHA512 4559b85525247b1e625a4aba404f85e15802a6f75ada0d1b1a3e1c817d434d6e119fb4549147b0aa9c9af9e176f93d176c3f8ae71e4c8fdf7c0cde66ae18445e
 AUX libfido2-1.3.0-remove-openssh-middleware.patch 1606 BLAKE2B ad02fe91523187bb7107b22bfb8b140f9ff0f3ec78f1047655e06fe29b5c2fb0e5b0a1d5671e7dc1a770499c2baefeac635024d506432a9c7dcef445ed1a3cfc SHA512 35b916fb6cf937389df05396f3491b5f7326305994585e290c9fdc8b9ff01455c1895ab32e4223ae1be60c0df38f16150c9d3e8799d9b84c16d560cc8a04eef7
 DIST libfido2-1.3.0.tar.gz 1516842 BLAKE2B 18a0036127a9f643ef7ca917dab909bfa344caecdfdef3f1f0881bd7c84b73ea8273a57a2daccc95cc448d7777c389a8f573f663895abd78c48b3340a45f7764 SHA512 9cfb872b898fb6659e0c5e377b5f80738c22dadc4768be02b8cb5e4f4932cb4edde360cd84aac78eb3e3a57d3bc10b4147740a4830d16adcdefe7c48fa460d36
-EBUILD libfido2-1.3.0.ebuild 837 BLAKE2B 87abad59913961b368df1c04eba384cfd6664c30ed9a610fb16865adfe5b67bd6e159d76cf29d4068df373ba890bc0c2baf97ab8abf82af92cfc7524606c6037 SHA512 7d6f4fd58cca39abd52be36bf332c9b659d851b8d51f06cd38030c6a2c149f15655293379d7a7c161b0adbec5a680b9277843e78d035dd3499aae62df16d6f50
+DIST libfido2-1.3.1.tar.gz 1512676 BLAKE2B f69a04fc69c46b688d83afe9d72b2fb1860ac00a09665d55e25293595520e95d45486ecc5355c479bc8bc06dbe6ed4fd469c511f5bf5f341a0ec86cb099fce28 SHA512 fc56f7bcddd7ae0f950b4e94f08ad726f7de68b975c0bdcbca98c7932c2c3d2e2a51b30eaf41e8dba08e82af3926cbed44264244ae721902af46e47df9fcbe1b
+EBUILD libfido2-1.3.0-r1.ebuild 989 BLAKE2B 5894629d1c22d311bf27e5563f88a9ba4666f800a9c61dbf18cecb0042a18adf15a855a7965569e66695b5548f8704ea695467f72ef33cc71b6aa730a51eb635 SHA512 40e8ae45897fc44183b25414e2ed4de23ed80dd2b1553ddb145984f8130f45b0c25f145549b9e69b68072e7c7c247e2b9b20086d44ba52241c7b7f9569979a2d
+EBUILD libfido2-1.3.1.ebuild 870 BLAKE2B a3c6402b83891e8426dd3dae60127d32f90759a87abcc162452f8f503eb97511995f423f85591bde101107d48d0fa170da640d185180bce92737be7656bef994 SHA512 d1589c95c5ad040ea58888d4f52bb9a61587572e0a5a1600683fc0d3b3b440c196275d14cbd26fe88ba536d81d326c6fd41a3cab1360fd53831f4e5247126674
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/dev-libs/libfido2/libfido2-1.3.0.ebuild b/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
index 80fc8d24e085..ca7036d3d103 100644
--- a/dev-libs/libfido2/libfido2-1.3.0.ebuild
+++ b/dev-libs/libfido2/libfido2-1.3.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils
+inherit cmake-utils udev linux-info
 
 DESCRIPTION="Provides library functionality for FIDO 2.0"
 HOMEPAGE="https://github.com/Yubico/libfido2"
@@ -29,10 +29,21 @@ PATCHES=(
 	"${FILESDIR}/libfido2-1.3.0-remove-openssh-middleware.patch"
 )
 
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
 src_install() {
 	cmake-utils_src_install
 
 	if ! use static-libs; then
 		rm -f "${D}/$(get_libdir)"/*.a || die
 	fi
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
 }
diff --git a/dev-libs/libfido2/libfido2-1.3.1.ebuild b/dev-libs/libfido2/libfido2-1.3.1.ebuild
new file mode 100644
index 000000000000..0ed36b0583f0
--- /dev/null
+++ b/dev-libs/libfido2/libfido2-1.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils udev linux-info
+
+DESCRIPTION="Provides library functionality for FIDO 2.0"
+HOMEPAGE="https://github.com/Yubico/libfido2"
+SRC_URI="https://github.com/Yubico/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/1"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="libressl +static-libs"
+
+DEPEND="
+	dev-libs/libcbor:=
+	virtual/libudev:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/libfido2-1.3.0-cmakelists.patch"
+)
+
+pkg_pretend() {
+	CONFIG_CHECK="
+		~USB_HID
+		~HIDRAW
+	"
+
+	check_extra_config
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if ! use static-libs; then
+		rm -f "${D}/$(get_libdir)"/*.a || die
+	fi
+
+	udev_newrules udev/70-u2f.rules 70-libfido2-u2f.rules
+}
diff --git a/dev-libs/libfilezilla/Manifest b/dev-libs/libfilezilla/Manifest
index f4081f09179e..0629823826ca 100644
--- a/dev-libs/libfilezilla/Manifest
+++ b/dev-libs/libfilezilla/Manifest
@@ -2,8 +2,10 @@ DIST libfilezilla-0.15.1.tar.bz2 404746 BLAKE2B 644f4b8949670d5b07f9e7b861d388ce
 DIST libfilezilla-0.18.2.tar.bz2 526968 BLAKE2B 81b27c18e9c04e2277dbe7a2fa2bfe3c1fa7c1f9c27eaf5cc02f309a15e9b61e71e5a67aa359c7bb36b27335f008cfb58641adcb42745ac00b9ac9eb2c649cde SHA512 6f165a008ea8e3090554070685ef042b5304a8e7fdeb9f16c81a01c00b5fcb3d4acd356cfaf3fc1189c04db0b726dd005c592f6c7c6b06a527d8b82e7890257b
 DIST libfilezilla-0.19.1.tar.bz2 539952 BLAKE2B a581964a34c9104543eb06579e1f1b816b0f47e6ef3af0de9aa0b7528665ca0ac17ddf3c5327a434b8e344bdde5602f1b7a71b7cc755367e750c88de06329335 SHA512 1342a199e4bdc211437deaa4ff34fe7f7de476a664b1ea4dc8df0482db98eb6c21e03f9c7b510bc00c81f6dacd7fdec2fa721554fe6e71c5bb2763618759b1a1
 DIST libfilezilla-0.19.3.tar.bz2 541117 BLAKE2B c0015be2fa632cc4bfd44d5e02bdc9e14c5ac0598e4c83fabc95e00dd82669963d02a8e7b3db33e554d86f333eb5a7afdd6235acfa7b336dbd5bbfbf334f4381 SHA512 264a3a110dc4e99f6b993479be9f25cf831297899c699d73e5ad5a403e11ff09fa9ab062a420a0111e78f7d6e68e92fa461c161c8fd7c274cf227ef45f618849
+DIST libfilezilla-0.20.1.tar.bz2 548442 BLAKE2B 1a0c41847fac98f28cfbda2071d76d945c38414de2ae97dccb00870ed97e39cf1cfefc879b85e014eaf731f3bd9c9859636b362872c1cd109f9214e9376680a0 SHA512 5fa43b2215c71d1e0ba92fdfed8963f771b7b8862333f14e812b0e01a783ceb5e186706f6729be8112872cf4abfa4fc4b785bbab5596d1b3f474046febedbfe7
 EBUILD libfilezilla-0.15.1.ebuild 920 BLAKE2B 0f9101255067d3dd17f4048716b25ac12e9270db414208ee23911d644140f0d8a1bf446f07a6b67f3aab679403a87a0a3e7c569922cbe4ffcf7c9c0ef9d846a1 SHA512 5a6b773f29312f2b7557ba02404124040c4272328c51df45a00eef2ba8ec6ec72517116d501ddb7307b30b0216dabb94c42690bbc72fd96ac436c8684e423215
 EBUILD libfilezilla-0.18.2.ebuild 1051 BLAKE2B 06f0455b9a48fd2b1eb8f1a6437260efc74ca81b07f18124db2c99311c5ae3bbe416226f70c72f9732c71ceab52041138dd8a64ef3bd923d07658db409330080 SHA512 428fd7bc6c28d76db19f568edb3cd4f3e6528320e62f6da78408a57d34fdb31d4aad2f91da49f33634e29fbc6f7d443b01998a53d9ee599090094bd7940c5558
 EBUILD libfilezilla-0.19.1.ebuild 1080 BLAKE2B d046a5ab623d32c7dfa351fd168e4041650f9248e1099698dd04b8ddaede2eee71ca34078827b4f723d6b2abc02889985e6759073e054f1470453aa96aaeb736 SHA512 b4d226e728d68cbb97faaf22282869d59d506e91a0014a0164a35f1df394e53f58ed91cfbf0a7595f0c32177d3fd618bb75c1085d9260339df9e1228dc84acaa
 EBUILD libfilezilla-0.19.3.ebuild 1087 BLAKE2B 871c89630e89cfb7ae3a45ddbcb8f8037514f435714f95192224c221808717a614f25cd096e42d883f03f88c943e4c9a0e4add6d52581c5489d1aeabf02cdc3d SHA512 de7bee4d4741c7356d0085a7c24454f39ed87da863a9404f0dc0a59906245fd137f40bc3ca126d632c44e8f90fbfdf2ba367a66ef7b29305aa37eefdf92e4cb9
+EBUILD libfilezilla-0.20.1.ebuild 1087 BLAKE2B 620bead88b7a648e222da686414b39b1a23b93cb8b6b9ac71716a5d59d242eeb2553ec41ffc109335d9c154e6472e3f29495125683714647366cdf8c4b714e48 SHA512 cad7926643736f61c954b555380e3445fbb0841466406f19a94a3cfdb9ef44815755a15f0d6a2b1fbd8e1e789a67653fbea26729dbe3860939306009b3024f9d
 MISC metadata.xml 1135 BLAKE2B df349738b526f415335acdb239b0d567b2e86c835fc8faba17513a9cad40427b50d1822ee7f2d5931571cb02a26dc4a26831c44563ae3d9a6f999c8a63a23404 SHA512 f0a35af200bbaca778c066720f1c4bb8680418196ac996cf09158c2ff881612132c85a926d4881437c332bb7e1698c5f02c44be9e9cc9b976e5170813ecd8151
diff --git a/dev-libs/libfilezilla/libfilezilla-0.20.1.ebuild b/dev-libs/libfilezilla/libfilezilla-0.20.1.ebuild
new file mode 100644
index 000000000000..61611daf6b65
--- /dev/null
+++ b/dev-libs/libfilezilla/libfilezilla-0.20.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 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/4" # 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_install() {
+	default
+	find "${ED}" -type f \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/dev-libs/libflatarray/Manifest b/dev-libs/libflatarray/Manifest
index 89ae943db55a..792b2c650adc 100644
--- a/dev-libs/libflatarray/Manifest
+++ b/dev-libs/libflatarray/Manifest
@@ -2,4 +2,4 @@ DIST libflatarray-0.2.0.tar.bz2 34193 BLAKE2B 8f409b097a0dfe037e9fdd1f8ed3b0ba86
 DIST libflatarray-0.3.0.tar.bz2 104544 BLAKE2B 9ac490a526fbd71478ac569538bad28e01a1a91bd71d37e85bf89181e856e79b2dec6af5415f238e5f72fbbe57cda59ee87ebd79cd273887061e2bbb93a7ce31 SHA512 c58339cdadf98f552d2f1b440a293c48923f32fc43a5a06ee8b8a40835a5f6c21514f7a9efa0ff23930ab9fdda8d4389641ec83c589e1982dbf5a3f75d2ffd37
 EBUILD libflatarray-0.2.0-r1.ebuild 949 BLAKE2B 86ece267ca65c8d18f942c121111d1958b3e35689c0cad86d0cdded924bb5ca8c32a669d383c461e1a02d3b9232a52e59e53731ce965e660ef207a98053cbfe0 SHA512 77dbb17cb4fd34fea2ab6741d1eababdbf22187b15180414c7d7540ac050013f006417068870a62a65a67004f3b554ea3c99bbca8983576a7ba711182f22f38d
 EBUILD libflatarray-0.3.0-r1.ebuild 979 BLAKE2B 987158e0f8ae9b7292c8e9138cf1525d681c290db424031aa84ccdc6e82f06148e74067b0d478def1fa68936edeb6f9f9aa82be54a982218c3dacf5dec32bd60 SHA512 8096e2881688ec361f25edda46d47bdf5044d015aba1d025fc7ca0650abd346d116a1cb5bd832a22f71e083175b876811555bafbd02b38c7aeeea64f6c368da1
-MISC metadata.xml 583 BLAKE2B 4ec277b4e2e93a1cfb155546d4be3b9effdbf2dc6ff1ebb5c6adee9287d2d344537c91f629a0e7b79a12870759cf0c4a959268397db3e3684b5562021d38543f SHA512 0aba9d676149fe1879985c28dcafe1222db2c3d14007bf7add67cbbaaff2462f983f857bd088557aaa7e5edd977a435d8669b1d313924f98e5b528b1fa9a31ad
+MISC metadata.xml 796 BLAKE2B 97e9da58126fc47aa98f30b4e5389ac90f792db95e84a2186d7cc8702719c299d8e8b8bb9de3d91c21babeb6e1c21a778da4e6719d84975d142ab1fbd8256ca5 SHA512 672b8ab81e7915b0477c716493afb2e64b48749bdc510da3f01efc0a20ae5cc49facfd97ab96ba4661783142671f5c68d9f4511f89f928875f9a5c47d0cdb085
diff --git a/dev-libs/libflatarray/metadata.xml b/dev-libs/libflatarray/metadata.xml
index c9292e9b692c..fdfc323c8194 100644
--- a/dev-libs/libflatarray/metadata.xml
+++ b/dev-libs/libflatarray/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>kurt@kmk-computers.de</email>
+    <name>Kurt Kanzenbach</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription>
     LibFlatArray is a multi-dimensional C++ array class which provides
     an object-oriented view (a.k.a. array of structs, AoS) while
diff --git a/dev-libs/libfmt/Manifest b/dev-libs/libfmt/Manifest
index e8ffcc2a6521..f3674855facb 100644
--- a/dev-libs/libfmt/Manifest
+++ b/dev-libs/libfmt/Manifest
@@ -1,6 +1,6 @@
 DIST libfmt-5.3.0.tar.gz 662493 BLAKE2B 462c54c227132b2398977ff575f74e63e973825968b106e09cb0f3da859f1d851a6dd1799c05e3ae6adff2ac972f4af259c42fdf8429346b2830134571c31480 SHA512 9ef0f3d328681253c1e1776576d54d67dec49c19fd7fc422ae63c3610b01a3f05f6e83cdf5e913dfd09bac42e52fe35c38ebe1ea91f4207d226a32aaf69eb4a8
 DIST libfmt-6.1.2.tar.gz 723160 BLAKE2B 36e7451a8732c62dcbf47e6d287ea582827b6196a468b8648803ea1bc9a37a5f681d87488f748d749183d97783ac7fb47a3f2aeed64fc6a684f9ee85b67ae28d SHA512 8770bf4bd2bb6d938e75e0cf1e665c41930dbd9d2a6825274a5a43cd1d85b9c9ca621bb040ed099429f0e16bddbc3399361c453eb1bf3fc01376e6ad9dd875b7
 EBUILD libfmt-5.3.0.ebuild 792 BLAKE2B 2bc5485380c222af65a0948098394feb750838d19340b393bb23b51670a052082a24d8fc48250041f4199e7bc21fe55c2202d029097bb7eaf034d6cd266aae43 SHA512 340b90b24035993670dc769a5a47cc009c8017afbc0ae3e5de4167e4973b267688d40c19c2a4a49c74fd5ff3472203e071522916d523925ccd2a8a492ee8e618
-EBUILD libfmt-6.1.2.ebuild 768 BLAKE2B 6a0f6e17e16aeb35c62f95d7dcb579dd18bf52e6826fbc669c6bbb6b2db51456fb005b4d54a2c17e8bd5c3d693fdd6dda4ef342ce2a4707bc7b8287184986d28 SHA512 caf0bd12a13b2026fb6bdc4c293d4476d315801c3850abbb85f72a423602106765a2d5ea36494bfc14ec6d530171199c6643b3ca39122f829340e61ce90a6e72
+EBUILD libfmt-6.1.2.ebuild 775 BLAKE2B efae60ca62eb525fae1fb25f18d43abde0f9ff71cd0da58f791b6bdcf610e1f80ab3b07150acb47c33191c973b19d7938ce8050b1dc9f4e5a864dbc70327f6b5 SHA512 8175587b9a1072bd7e209caffe90bb592047319ed7c8e9f8edfe8e5729165b16e2cb3efa0c5079b4233f60b76928a8f247c246cf33557b295bc7ff97c8e7cb81
 EBUILD libfmt-9999.ebuild 772 BLAKE2B 53eaf21c8e01d31c44adc443812fa21ca3e48db4914131ce3a56e52cfa04bedc44e44fc1a7bdf11865336bbb0fee4d364b6521d60945aa5b87c153c5e8019b14 SHA512 0dfb8292beaa1a0f9cc942b303fe5bbfe391d6f6b59cd2399ba5c47d6549eb2077101af54f034a2bfcdcd99c39aad4b5fd3acc545e8a4a2b873fe0f598ebd755
 MISC metadata.xml 381 BLAKE2B f38f6a7691ef81c18b1170b7ca29264dac3c621f8de446d065d65b6e022e21fbb2475c4e2d3210e00254339d09681030c7e7b8fc41cec5549663b4086bb0c983 SHA512 200bb79fc448f40acf8a1be9a907a51461d82db3b5e6e92df1cef4b96418fa6217ebe1e5c8d4228d34bd9bc633022a34f399521a875c92232fb2254350a7605c
diff --git a/dev-libs/libfmt/libfmt-6.1.2.ebuild b/dev-libs/libfmt/libfmt-6.1.2.ebuild
index 41a9ec459559..35ee6242ee74 100644
--- a/dev-libs/libfmt/libfmt-6.1.2.ebuild
+++ b/dev-libs/libfmt/libfmt-6.1.2.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/fmtlib/fmt/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ppc ppc64 x86"
+	KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
 	S="${WORKDIR}/fmt-${PV}"
 fi
 
diff --git a/dev-libs/libg15/Manifest b/dev-libs/libg15/Manifest
index 8309d0440ac7..af41ac5fac5c 100644
--- a/dev-libs/libg15/Manifest
+++ b/dev-libs/libg15/Manifest
@@ -1,5 +1,5 @@
 AUX g15tools.patch 2929 BLAKE2B cc88ba441a27b7cc2e256712536304f7a1d3667b04fc1e2583dea994321df8a59ad295a6cecc76cf5633a5f6994cb674e7a7f3f8eaf2c0d86dad35b3e7d0c8df SHA512 2cd1b1f54ea8d4cc2a322c657cce6b8252b9425df6ad031401d6187ff82472fc3fb974734cfefe80b85b3e1a3532b26a5685b5aa9ff42ca7453ec55892834e41
 DIST libg15-1.2.7.tar.bz2 232475 BLAKE2B 490193410f2127d4efc0bcf64909514faff2ecce57bba08e1cf53a958ab296a59bc12867bbd14ca1bf866e5f69833d99f4e3ebb7d078ece35725afe2c0dd03ab SHA512 ddffb38f5c3d9ce0cb90b0375c2f5d317a7bb3889fe59d56932a0889c6e15bc2f1e590757d3182eddf7c5bd3101303b332b18fbd37247c20f66e1be256aa93c0
-EBUILD libg15-1.2.7-r1.ebuild 577 BLAKE2B 7c691bd1a18b975f94b304fba02b5893e214a484c99e3d98cc2210fc8083590fc549ff38b2d50fa1cb49a6d3564b39a95381adb1ef89a88fbc4170cea0af9d38 SHA512 4f69993a3fe66ba8642eea1d8bb3aa9e6b1e86f579ed91c163fb1db2d8b6241ab2586d0cafbab3dc030128a170085d8eb2ce8975fee3afb55f4a4ac6cb10f343
-EBUILD libg15-9999.ebuild 979 BLAKE2B 023afc75bd44fe0e05ea3dd313e3df3b27d282f4b26ca56c682715c17c362695e5e4d7d9266bf43eae06a88d96639830ee1d7bc6ef1a1b84eddfd7856a9ed642 SHA512 8acc39a8dd1b341bb727d6958a253236880f0e240cbc57ae70285b6304ce431926400137c419289a9a2285fde6965c9a9771ac1a55c9836934d3e8afdad5759c
+EBUILD libg15-1.2.7-r1.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
+EBUILD libg15-9999.ebuild 781 BLAKE2B 21ba3edd5b9e96420b200b05fe8df6e4053c3c6586c6157e4dcce45fbce3c7b5b3f63a643e683dad8e21b1ebd1bd6946ec9ce430fd02d6d85bb5c98c6c5b07f5 SHA512 5f5e6ece6abef9db83d3da6d6c93b6c9c1dcf4c58c0cd24384500bf7c566cbfefd9c1df04efd7139b20122d16b453c0ad27f93f6bb28314c285736f88b770c4f
 MISC metadata.xml 408 BLAKE2B 2165f633654f865b41938473830e3a25c373d585a453ea4a084eb4912e0abb0567366c76a9d11373b54bc0e1fd1e76d5fbdc3724a1dd05e47442e778f60fe754 SHA512 e4da283d6a210afc06b392ed61be935a1a1dfa0d886c0f3e6e82bd5e78323e080e911ef7eee9ff2e6ab98ced93804ab8f48433b9f0f630d8c68a62f91a3e780d
diff --git a/dev-libs/libg15/libg15-1.2.7-r1.ebuild b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
index 5ec490f2e523..3e7892e8cce0 100644
--- a/dev-libs/libg15/libg15-1.2.7-r1.ebuild
+++ b/dev-libs/libg15/libg15-1.2.7-r1.ebuild
@@ -1,29 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
+
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools subversion
+	ESVN_PROJECT=g15tools/trunk
+	ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+else
+	KEYWORDS="amd64 ppc ppc64 x86"
+	SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+fi
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
 HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
 
-DEPEND="=virtual/libusb-0*"
-RDEPEND=${DEPEND}
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS README ChangeLog )
+src_prepare() {
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
+}
 
 src_configure() {
-	econf \
-		--disable-static
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libg15/libg15-9999.ebuild b/dev-libs/libg15/libg15-9999.ebuild
index a2faa8211176..3e7892e8cce0 100644
--- a/dev-libs/libg15/libg15-9999.ebuild
+++ b/dev-libs/libg15/libg15-9999.ebuild
@@ -1,51 +1,38 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-ESVN_PROJECT=g15tools/trunk
-ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+EAPI=7
 
-inherit subversion base eutils autotools
+if [[ ${PV} == *9999 ]]; then
+	inherit autotools subversion
+	ESVN_PROJECT=g15tools/trunk
+	ESVN_REPO_URI="https://svn.code.sf.net/p/g15tools/code/trunk/${PN}"
+else
+	KEYWORDS="amd64 ppc ppc64 x86"
+	SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
+fi
 
 DESCRIPTION="The libg15 library gives low-level access to the Logitech G15 keyboard"
 HOMEPAGE="https://sourceforge.net/projects/g15tools/"
-[[ $PV = *9999* ]] || SRC_URI="mirror://sourceforge/g15tools/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE=""
 
-DEPEND="=virtual/libusb-0*"
-RDEPEND=${DEPEND}
-
-DOCS=( AUTHORS README ChangeLog )
-
-PATCHES=( "${FILESDIR}"/g15tools.patch )
-
-src_unpack() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_src_unpack
-	fi
-}
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
-	if [[ ${PV} = *9999* ]]; then
-		subversion_wc_info
-	fi
-	base_src_prepare
-	if [[ ${PV} = *9999* ]]; then
-		eautoreconf
-	fi
+	default
+	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
-	econf \
-		--disable-static
+	econf --disable-static
 }
 
 src_install() {
 	default
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libgcrypt-compat/Manifest b/dev-libs/libgcrypt-compat/Manifest
index e6789cd531a2..f5940bd67617 100644
--- a/dev-libs/libgcrypt-compat/Manifest
+++ b/dev-libs/libgcrypt-compat/Manifest
@@ -1,5 +1,5 @@
 AUX libgcrypt-1.5.0-uscore.patch 981 BLAKE2B 0f7bae068fa1c04834a0295b902aa479304a8b9f066d984d28a49c59a5c041281d93a7bc73e053f4098461364e87b7a665cb890b4792cdf221f44593c23fbae4 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601
 AUX libgcrypt-1.5.4-clang-arm.patch 4189 BLAKE2B 39fb88e752a544232c4c48aa8b8df44952e700966f1cbc361664015d075c1d8ef171ae68e9cabd87cab9ce0424243dfbe71271ce2a984d7ad1bdc8c52efd1349 SHA512 86d462340595420a70977d697237a8bb87583750e90c8368ce783ca0fbfed8816c646dd5e40b8e929fbce29917a2b05bb48a0a492d271605958fcb98faf4caa4
 DIST libgcrypt-1.5.6.tar.bz2 1548918 BLAKE2B 14ff8dfcfd7c5345f1be6d5300b97db27c9ac3c78141cc888ee978882aee39ac386a1e90588d3840bf0595a519437e92fa53b5f73d8659e193a43cfa374dfb34 SHA512 2c16912de66bc83adfbf8f43a2a9f57e1afcc866b1774ec11a670e2a793a7c5f2029d134c0bda681c9cb95f7dcc166133782c124e520b7fbe246ec10a9e1c06a
-EBUILD libgcrypt-compat-1.5.6.ebuild 1615 BLAKE2B a4f95ab70371a9e771a2ac867378413c437747581035c245a17d97237e470f4c21b9ba878937cb3b555677b13e6ed5ec31f2b26fabae1d0946e8efd057e91352 SHA512 b3bfc9f3324052f326bb37b23bfeb537aead61c248781b24b319264945e29af7a5c28fbd5bb325d562e1981a1fbe4551e0286d4d248b4c91e86860781e4a1895
+EBUILD libgcrypt-compat-1.5.6.ebuild 1583 BLAKE2B e01eb17b562792e6c1f6184534ab99bdd580cc33cb738fd0bb46b552b6cb69d5dceb867c4ed338f07b4e2976569e309cefd27952bb67f8811eb844e4096e4415 SHA512 ed3010373a01230577e0b244b6db06f0869cf0a4415ea7a9087e52e8529b894eacb969b5c1ac5e8303ba11f200a4104db63a4707446d561a05441847ae1b5646
 MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
index bca8a3b5d9a2..a52e734e1836 100644
--- a/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
+++ b/dev-libs/libgcrypt-compat/libgcrypt-compat-1.5.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -36,7 +36,6 @@ src_prepare() {
 multilib_src_configure() {
 	local myeconfargs=(
 		--disable-padlock-support # bug 201917
-		--disable-dependency-tracking
 		--enable-noexecstack
 		--disable-O-flag-munging
 
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index 44f534221d55..396876a8ca13 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -3,8 +3,8 @@ AUX libgcrypt-multilib-syspath.patch 588 BLAKE2B 6a8d30246263339571455df3c1cccfc
 DIST libgcrypt-1.8.3.tar.bz2 2989166 BLAKE2B 3443883c3e8d005be6cbdc91589b8b287226f26eb59536e1a32512004af739a64a3817ac38fa1132fdfc3424c21ca49c81db93535a23d590a5dc4f4518f3cce1 SHA512 8c873204303f173dd3f49817a81035c1d504b2fc885965c9bc074a6e3fb108ceb6dca366d85e840a40712a6890fc325018ea9b8c1b7b8804c51c44b296cb96a0
 DIST libgcrypt-1.8.4.tar.bz2 2990108 BLAKE2B 97a1f9382adf23cd4ac491a392882f2e712fddd4f0d95a4fafb9cc70aa41ffa7b7b6a371b8368e9c99e3e1849b9d38078abc55703d4d8b25289f3c662e6ba8a1 SHA512 b831fc337eb14806897e224b0d1e78d1f8e9db91dffa818a015a4aa104144e2d971e5a855904907ee2bb9990a9d526de32d6787e1cae98e28a65c3258b2b1ea1
 DIST libgcrypt-1.8.5.tar.bz2 2991291 BLAKE2B 93276b4536f71c07bb103e10607592e02add413f633d96cc95513daa6e6b0e098fe803bb6a0e405a241fddc5ce0cfad61658d57c27bd724eecd32fd862af4c99 SHA512 b55e16e838d1b1208e7673366971ae7c0f9c1c79e042f41c03d14ed74c5e387fa69ea81d5414ffda3d2b4f82ea5467fe13b00115727e257db22808cf351bde89
-EBUILD libgcrypt-1.8.3-r1.ebuild 2292 BLAKE2B 38d4a9d686f779239cff3c17886f080de25659644cc85f2f3aa8a8edff513796bc422f21cc22bbfdfd76d295bd50cc2efef05e387364b43bfe044b0d8919f510 SHA512 8e63df596a948a263d9ca3f8cf61c754e4de3c44415f2caa8302b78a82a653609f507b270533274d8d6f13bf10ccee51b5ab4eb8533decaad5f392b4f44f2fd9
-EBUILD libgcrypt-1.8.3.ebuild 2162 BLAKE2B 68c38a28310d997ea811fad37fa81ee9620cee8c47f09286b0199bf35746c12787fb6718e3aba3c6b78078d7754e3b67fd608ded8dea5de75a3b7dc6ca5cb049 SHA512 40e829ff60bef4eece8a5f1d77ad0e42c2ddf09417b5c06c6c1d1de0d9e460450be4a2af2a3945a4e146b8babdb5414d52c402003848478f3a08a50c66f34174
-EBUILD libgcrypt-1.8.4.ebuild 2299 BLAKE2B f9abd685b5e83a619f2368c2761db3e045f229d007c8b5256756514b26654a356102ad844ac4938c06261c9705b253751fb33d765d1ebeb8868e94f0739ad61f SHA512 a201729f2b2240aed59732a3056c4af64f240f3dc9d67938ab9a2c1e4f101f02c08bbad92cd5b5e18e42865796b9fa9570b6f65994169d08a9adde7e80c87d94
-EBUILD libgcrypt-1.8.5.ebuild 2289 BLAKE2B eafa6c113105152e3e54eac6402d51e214e0aea0f3cb0edca4c3a13224900ae30fbe1a210142080f262ded81d366dab76e320640107030083d3c2d1f9f324043 SHA512 d2ce7fe8da62ae5e4dc8cf1731e2a1a7361342df41dd89900e13489ce9464d6a71405cbd748b09d5c8c1383def93c526eb1bae5c39cb3e7f188049d02dcac27f
+EBUILD libgcrypt-1.8.3-r1.ebuild 2260 BLAKE2B da94834f364006884bea2d55b522d81ce8a992ff1d0969d6fcbcfb6422630db8a60d521843e23a734ff877a2e08582d79d445208646cbbfb56e2d7b5e0d46e42 SHA512 9b63a5aa252839b68e77f714303cc115a49dc1bf5d48e79a8dc8ee9cdb3fa081b6cf973e8fa48c42bb322a7cb1cc5718264bdd97cef8544ec492cc00f1c455e4
+EBUILD libgcrypt-1.8.3.ebuild 2130 BLAKE2B 3aabd4fe3ef02c9f00f3653e6517dc2e12b08a9d765a120d3b01e8befa14704850ed36f94b2e63e95b1596a25f1b5864e38041c0d0cc9fd6e11eaeb62010d81b SHA512 7e0677d5d78358dc0940fd053877ddef9d243b4cd8685878ccb8c2deb0ed2ff83b32d32068858c7dfa74ef0350b206b1d5884281390f887a38278004dfb3be28
+EBUILD libgcrypt-1.8.4.ebuild 2267 BLAKE2B 882b6a108cecd07c5d36b79a0939890c5ae3d5b1992b872497733cd2db7fa4fef30efdc37c5660bfabd4488bf2574cb044cbe5357fe2d2e573c5eaea51906413 SHA512 da478e9789d1514077aa0fc18aa0bc023866d11dc73059712528bd309255ef62d5cf628c5db33ecaf83e58ad2f38c1bdf0934e112bb4e1f69c786bd5decb84ea
+EBUILD libgcrypt-1.8.5.ebuild 2257 BLAKE2B d0abfbe36b10764d40f01cd71084059f09ac7407e95c76dea4ccd3254203d4df4ba95470bb043f11dd8dea5eff8e65b1675cb19db95243169577d9b716c341ca SHA512 56428a8394ae17eeb98809bf6a409df8135e051b1ef98411e76088c16ef0a6d5e9f08f615cbbdb2d7523579fbc0c317da3950a46cb8fe5126bfbd8965a390a04
 MISC metadata.xml 419 BLAKE2B 3f50eead2881e1336ad05c677b0108897d4664cbe228c95b5dfe3f7f0696581472692644e06d5d86b81b4bde0a3b41f0e65e25f4e40a29b830c1d9342b143a70 SHA512 c33fb355262594d13d6f7ea66e35a53379695fe10227d29d800f7fca8ee8cf2856a624ccf81ebe3352be10c4c010bc61131f95f9065eafcff0b5c70f684df4ba
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
index 22ba9221713d..5821d4f4f907 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ multilib_src_configure() {
 		append-cflags -Wa,--divide
 	fi
 	local myeconfargs=(
-		--disable-dependency-tracking
 		--enable-noexecstack
 		$(use_enable o-flag-munging O-flag-munging)
 		$(use_enable static-libs static)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
index c233727259ac..9421ee98f643 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.3.ebuild
@@ -40,7 +40,6 @@ multilib_src_configure() {
 		append-cflags -Wa,--divide
 	fi
 	local myeconfargs=(
-		--disable-dependency-tracking
 		--enable-noexecstack
 		$(use_enable o-flag-munging O-flag-munging)
 		$(use_enable static-libs static)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
index 778b99687913..b3008df69b14 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -40,7 +40,6 @@ multilib_src_configure() {
 		append-cflags -Wa,--divide
 	fi
 	local myeconfargs=(
-		--disable-dependency-tracking
 		--enable-noexecstack
 		$(use_enable o-flag-munging O-flag-munging)
 		$(use_enable static-libs static)
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
index 2aa47e6fcf9a..1a36bd5e114d 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.5.ebuild
@@ -40,7 +40,6 @@ multilib_src_configure() {
 		append-cflags -Wa,--divide
 	fi
 	local myeconfargs=(
-		--disable-dependency-tracking
 		--enable-noexecstack
 		$(use_enable o-flag-munging O-flag-munging)
 		$(use_enable static-libs static)
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index 0d61206dc3d7..4b4a434b6b03 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,3 +1,5 @@
 DIST libgdata-0.17.11.tar.xz 843948 BLAKE2B 8be79ea5840a585c5bdd5b51aa99401aedce0562ceaa98c7e323cdb2354384db635288d05c740993da49fa9c60c2cafab4e7c43ab82de4295afc0ca6b690d4dd SHA512 5abb00e6ebee1010fb6d9eab675e03d94883cac88e42b403a7d750bff73d65d0b35aae5c9e8f17a182819193b4a049ac7e9fc644ad9fa79872924ed5704c8982
+DIST libgdata-0.17.12.tar.xz 845420 BLAKE2B 636ff5ba7df48f671cdb5da09c011f620619051e30470bb3ebb400f8c093e89885e0c3c7ac54e569cff2c350bd08f7e346f1529c07c41f570b7255002fc69c44 SHA512 22571c9b0cecbaf617fc8fa43a312bba4eaf36267264546f55c9c9067514cc6ae1db755536c7413427ebf6121115512dcab4201549c128fb1a25afe75a3daa2b
 EBUILD libgdata-0.17.11.ebuild 1771 BLAKE2B 600a33b3c16b44bc332111dcd62bfcca0ec169f311babfabc53e69bbc6bf2baf79f9aed4ad5fe2b5295bfb9e57fe96b2bfed247bf1556b8cac3919b406543d2c SHA512 6c6ec2a346451b4fc26a5751e5d064d6b3e0c3c0c0c61a9c35a47ae5b22fc76bdd49c739458848572d7851b0c98bf20cd96fb7f1fa51a0c9f9d129deeee36c4a
+EBUILD libgdata-0.17.12.ebuild 1768 BLAKE2B b66d622b692a7ef9a98424dce9a53e2c20aaae417ce994ef9cc7bda13b195061031de2e13fd211f31ecb0b423d38a3db85b473c754e334b49d7c835d74cc851a SHA512 0329e26abeb15a278f2ca7d8428f2651b5d79d6caf5174bfa2de2eda8ee75e9fd84e17155f3d26b0e113568fe5514cbfba0d1d19e91f01de236ef5e9de77ef71
 MISC metadata.xml 496 BLAKE2B c1ea319b0bfe89f579895ad4422216a26b3b8709d75bf9680278c22e3fa4e3e771f4573b89eb3db2704a33196149883f0c7028b7e39cdde833df510e350f560b SHA512 e12832d53a97dcaba6d2f669ece3ff9dbd504951a7539f00cce52e88e28d4c28034b203b9f1def27c812f39e5ad21532789b62cd0ab2814facf90b7b789e82dd
diff --git a/dev-libs/libgdata/libgdata-0.17.12.ebuild b/dev-libs/libgdata/libgdata-0.17.12.ebuild
new file mode 100644
index 000000000000..f9c87147c2cb
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.17.12.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson vala xdg
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/22" # subslot = libgdata soname version
+
+IUSE="+crypt gnome-online-accounts gtk-doc +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.44.0:2
+	>=dev-libs/json-glib-0.15[introspection?]
+	>=dev-libs/libxml2-2:2
+	>=net-libs/libsoup-2.55.90:2.4[introspection?,vala?]
+	crypt? ( app-crypt/gcr:= )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.50.0
+	dev-util/glib-utils
+	gtk-doc? ( >=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	test? ( >=net-libs/uhttpmock-0.5.0
+		>=x11-libs/gdk-pixbuf-2.14:2
+	)
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+	# Don't waste time building a couple small demos that aren't installed
+	sed -i -e '/subdir.*demos/d' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dgtk=disabled # only for demos
+		$(meson_feature crypt gnome)
+		$(meson_feature gnome-online-accounts goa)
+		-Doauth1=disabled
+		$(meson_use test always_build_tests)
+		-Dinstalled_tests=false
+		-Dman=true
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+		$(meson_use vala vapi)
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libgit2-glib/Manifest b/dev-libs/libgit2-glib/Manifest
index 6b51c1328e68..cdd9802403e6 100644
--- a/dev-libs/libgit2-glib/Manifest
+++ b/dev-libs/libgit2-glib/Manifest
@@ -1,4 +1,7 @@
+AUX libgit2-glib-0.99.0.1-vapilink.patch 848 BLAKE2B f37a6220afa807eb45c5e0fa45792c863c2b64d6217f40466f72771e0ff708b9952316c2f354d0d0b303cbf26615155d5ef75e494d9e92d6b1e93ffcfc61dcfb SHA512 86ba5754300ec4852aa09f475e6ad29fb8dcadb7634a919d14c88525b8299e0af6fd2a5640feff6c07ae94f2116584933e58466dd5ebc6bae09c17e58b3e0e34
 DIST libgit2-glib-0.28.0.1.tar.xz 138928 BLAKE2B 708523bb5a723f59e51501675c046da072bcdf18b3ded94920ce9eb181854780d6b44759531c8e949199a889578515994299facd14d10a07958019f6af0b6aba SHA512 6ae88bb56052461a9531016140edbd8517db8d5c0e5c217b4e8918ffef70b92652e4a95493c4290112068d0b793bff2b894f136b79929924fb7347926e3a8f51
+DIST libgit2-glib-0.99.0.1.tar.xz 140996 BLAKE2B 0c163467ea43ab236b2c856416940b1ed7c93e6ed8ce9980d2d146f0633830ab3765d8bd34bdaab31efdb4096e88e0513c9585b9e06a3efc800d5c32a0d29479 SHA512 48b34ba84b5315d23d0429a684753c3a64c62086d70a67fdb4dfbf8f2ee883f5a90d7e59cfcfd229682794c455b668eb9bd7bf6159d6bfa45a99ddc2461d7c25
 EBUILD libgit2-glib-0.28.0.1-r1.ebuild 1327 BLAKE2B a7c182d2f1d5fad28b81bbbddade798e41f5a4a555b86c505819833024971e744b06a2901d67862e3feb62201e9fd077a7f470cdc137a36df333f881d12750ea SHA512 1e9cf655d40b85038309cfc2d943e0e1a0f6a83ba796ca3a92e8ab6a4d03e17ccd73d3e959006d32767aa4ae7b93e8baf43ca0f9db8278f602f770cbf43ada0f
 EBUILD libgit2-glib-0.28.0.1.ebuild 1256 BLAKE2B 7246cecc6ae927178611caab2ade6d38a954b041f55c4486e62b2846ad7978a9ce7ebfac2f6b49feb53f771e48813bef38a3a1bcf7b8b31b28ece90ceceb4019 SHA512 b330da636839cc73691f0a33c778dd37c3d9318e470ce90210333235601c030ccac76b81914c02ea4291649392cd52607003aeae1b4b8dafb1e519cf2e21e600
+EBUILD libgit2-glib-0.99.0.1.ebuild 1326 BLAKE2B b2d71c33a23fafa7c1cd40a0c10dd66d8d2596548943703219cf18576859ea01927d53bfe3ce2ba90d8ad26f596976b420f8e9d26a1feaa38173af05e3f2b88c SHA512 b9a0bd7c5d37dc7c95615b986b2520f15c3df867a3a040a737057d90b0d7e24933d2e21507aca9ab2a493b5df5ba236e65dd5f21e37ef3fb2198a37fb9440c2e
 MISC metadata.xml 431 BLAKE2B b9cd78ab798b15be24933f218649464c25a768b6fda11d29190a18d49d2d5b2011555ee047a6b6d14df94cde89dd6bd83a85cf525215ff84ccaa2c8b5d64bbc4 SHA512 7ec17f350ff55331f7c502957be11244f629201769446e9900660f1573872a4425036feee58a9c82f05ed16d7e36820719818b7cf29bff4c37ab944c4c19c970
diff --git a/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch b/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
new file mode 100644
index 000000000000..a1838b403ab8
--- /dev/null
+++ b/dev-libs/libgit2-glib/files/libgit2-glib-0.99.0.1-vapilink.patch
@@ -0,0 +1,26 @@
+From 7f63349fd0405439532f2ff0896a3697c73ccaaf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 27 Feb 2020 15:20:20 +0100
+Subject: [PATCH] Fix meson_vapi_link.py to respect DESTDIR
+
+Fixes #5
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 6d314b5..3a423b3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -135,7 +135,7 @@ if enable_vapi
+   assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
+   assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
+ 
+-  meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
++  meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
+ endif
+ 
+ # Check for libgit2 ssh support
+-- 
+2.25.1
+
diff --git a/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1.ebuild b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1.ebuild
new file mode 100644
index 000000000000..88a9c56932d0
--- /dev/null
+++ b/dev-libs/libgit2-glib/libgit2-glib-0.99.0.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-r1 vala xdg
+
+DESCRIPTION="Git library for GLib"
+HOMEPAGE="https://wiki.gnome.org/Projects/Libgit2-glib"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk-doc python +ssh +vala"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	>=dev-libs/gobject-introspection-1.54:=
+	>=dev-libs/glib-2.44.0:2
+	<dev-libs/libgit2-1:0=[ssh?]
+	>=dev-libs/libgit2-0.26.0:0
+	python? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+PATCHES=(
+	"${FILESDIR}"/libgit2-glib-0.99.0.1-vapilink.patch
+)
+
+src_prepare() {
+	xdg_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		$(meson_use gtk-doc gtk_doc)
+		-Dintrospection=true
+		-Dpython=false # we install python scripts manually
+		$(meson_use ssh)
+		$(meson_use vala vapi)
+	)
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	if use python ; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule libgit2-glib/Ggit.py
+	fi
+}
diff --git a/dev-libs/libgit2/Manifest b/dev-libs/libgit2/Manifest
index 3e4d6ecf3765..250eb85566da 100644
--- a/dev-libs/libgit2/Manifest
+++ b/dev-libs/libgit2/Manifest
@@ -1,4 +1,6 @@
+AUX libgit2-0.99.0-pkg-config.patch 2871 BLAKE2B 642bffd7dd418a323994657df152dbc0f53ed4e42fc3e7501f9e3fffeedaaa19502aca3e84b43f5dbbbdde858719ef704efeaa7039ee46f645b228eb3783d1d9 SHA512 2489e9b3632567561ad2d542f2f62227d03681429eebc83be73a5d249bd3e429cde22bd145f1119760309894d30c0e5f324c93bb06fa9004b380f78811a19578
 DIST libgit2-0.28.4.tar.gz 4991720 BLAKE2B 7dc94dce69c27f6de3736b94b4d80b727e3e2a7db255a9eab7422cebd93a3ea1a6f47d1de6c3fbe4ba5bcb28ade9b23a989c5b54c06eafeaf30e382f3b859cdf SHA512 b81160608003b25d9b922d259ebbbbf941b6bd5100fa1875497c8cd29de320e292fff568c757a7a85b2b3044ddc1cb92c74dbcb13d630d62ecf9a8559b619d15
+DIST libgit2-0.99.0.tar.gz 5307975 BLAKE2B 2ff6c48d29844c8efd292b636c018403f49ae5eef1ef41e2c8755cc35d935677fa965b52c05724aa133f8542a266bb0e0fabb34fcf710127332bd6137ea4ff12 SHA512 e38e18da0e6ed1e5c8198c9eb2c362b21da2d0b9c8bc23309d2f70183549f4b9f23a6db8ce5f1f0f24b373e6427039c2a845b62dd74f91b02cfe8954f961a91b
 EBUILD libgit2-0.28.4.ebuild 1651 BLAKE2B 74131b4ca7dbebcd1a15ee10ba20d0d8326447b9ace6069f10bc81d1cc31eac4450cf03f2412be57a4a1651ceb2e6f40bdd13434e4efb26ca9edc0db7c221651 SHA512 da910710957b1f30208f77d5edc1573509629dd8bab12921962b1e9316a59d76d9749acbcf8a104798e96f137d3ac1c25fbe8fcef6ec23aea31cddb3829cca3a
-EBUILD libgit2-9999.ebuild 1655 BLAKE2B 2fb83e4ef74143c9bed984ebc03842fd32f820c3249f5bfc77a114c97c01eb7ac62d10528bdfc54c5f389b702af61438e5458eec59a21e30e06890df48befa0a SHA512 41d11a84eeedccd2ad2c15ca547d3ca43519b34a2e826bee3ecf3116a591653b1ed280df5a8b166823a00e83d01246c206738f8c8d82f94264354ad3af2bc2a0
+EBUILD libgit2-0.99.0-r1.ebuild 1807 BLAKE2B 0ca4832f7431c13be6a1905f4d1b1013749f13c634bb37a33c02e27ea86c184ab657dc338e9ba6de8f3e5c0f59ace25e935fe59bd6328a65a472f1927786b72c SHA512 fc887680be388fd765236eea01890398e3113e338f896ce12161e559c8cd1e1f4c27b46db781a3606a9e19e530b0020fdad48b0e2d0f713a914b5a8aa77709b6
 MISC metadata.xml 915 BLAKE2B 1882bdcfaee50de784b4aebeaaad4f04ff3f2385721b354ed685f3353ea92b83344559905cff5a9adc2a316b684079b64d9930f14081c257c8066dd7d4c89a33 SHA512 5b6f2239f656f490b0961788f8047662fc00ee10bc5ad9ee3a326313285cd29514c1eda54d17b878abef3d73034f997aa814a64ff496dcbe9f05ef4708825c35
diff --git a/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch b/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch
new file mode 100644
index 000000000000..4a60037c612a
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-0.99.0-pkg-config.patch
@@ -0,0 +1,81 @@
+From fbda0575b133a57d8f5d264742098994c7624c99 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tomasz=20K=C5=82oczko?= <kloczko.tomasz@gmail.com>
+Date: Wed, 19 Feb 2020 12:54:19 +0000
+Subject: [PATCH] Fix #5410: fix installing libgit2.pc in wrong location
+
+Remove using custom PKG_BUILD_PREFIu, PKG_BUILD_LIBDIR and
+PKG_BUILD_INCLUDEDIR variables.
+Use cmake CMAKE_INSTALL_PREFIX, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR instead.
+This patch fixes install libgit2.pc file in correct location and simpifies
+cmake module.
+---
+ cmake/Modules/PkgBuildConfig.cmake | 39 +++---------------------------
+ 1 file changed, 4 insertions(+), 35 deletions(-)
+
+diff --git a/cmake/Modules/PkgBuildConfig.cmake b/cmake/Modules/PkgBuildConfig.cmake
+index 1c0079eb0..e4c574431 100644
+--- a/cmake/Modules/PkgBuildConfig.cmake
++++ b/cmake/Modules/PkgBuildConfig.cmake
+@@ -1,10 +1,5 @@
+ # pkg-config file generation
+ #
+-# Uses the following globals:
+-# - PKG_BUILD_PREFIX: the build location (aka prefix). Defaults to CMAKE_INSTALL_PREFIX
+-# - PKG_BUILD_LIBDIR: the libdir location. Defaults to ${prefix}/lib.
+-# - PKG_BUILD_INCLUDEDIR: the includedir location. Defaults to ${prefix}/include.
+-#
+ 
+ function(pkg_build_config)
+     set(options)
+@@ -29,37 +24,11 @@ function(pkg_build_config)
+         message(FATAL_ERROR "Missing VERSION argument")
+     endif()
+ 
+-    if (DEFINED PKG_BUILD_PREFIX)
+-        set(PKGCONFIG_PREFIX "${PKG_BUILD_PREFIX}")
+-    else()
+-        set(PKGCONFIG_PREFIX "${CMAKE_INSTALL_PREFIX}")
+-    endif()
+-
+-    if(DEFINED PKG_BUILD_LIBDIR)
+-        if (IS_ABSOLUTE ${PKG_BUILD_LIBDIR})
+-            set(PKGCONFIG_LIBDIR ${PKG_BUILD_LIBDIR})
+-        else()
+-            set(PKGCONFIG_LIBDIR "\${prefix}/${PKG_BUILD_LIBDIR}")
+-        endif()
+-    else()
+-        set(PKGCONFIG_LIBDIR "\${prefix}/lib")
+-    endif()
+-
+-    if(DEFINED PKG_BUILD_INCLUDEDIR)
+-        if (IS_ABSOLUTE ${PKG_BUILD_INCLUDEDIR})
+-            set(PKGCONFIG_INCLUDEDIR ${PKG_BUILD_INCLUDEDIR})
+-        else()
+-            set(PKGCONFIG_INCLUDEDIR "\${prefix}/${PKG_BUILD_INCLUDEDIR}")
+-        endif()
+-    else()
+-        set(PKGCONFIG_INCLUDEDIR "\${prefix}/include")
+-    endif()
+-
+     # Write .pc "header"
+     file(WRITE "${PKGCONFIG_FILE}"
+-        "prefix=\"${PKGCONFIG_PREFIX}\"\n"
+-        "libdir=\"${PKGCONFIG_LIBDIR}\"\n"
+-        "includedir=\"${PKGCONFIG_INCLUDEDIR}\"\n"
++        "prefix=\"${CMAKE_INSTALL_PREFIX}\"\n"
++        "libdir=\"${LIB_INSTALL_DIR}\"\n"
++        "includedir=\"${INCLUDE_INSTALL_DIR}\"\n"
+         "\n"
+         "Name: ${PKGCONFIG_NAME}\n"
+         "Description: ${PKGCONFIG_DESCRIPTION}\n"
+@@ -105,6 +74,6 @@ function(pkg_build_config)
+ 
+     # Install .pc file
+     install(FILES "${PKGCONFIG_FILE}"
+-        DESTINATION "${PKGCONFIG_PREFIX}/${PKGCONFIG_LIBDIR}/pkgconfig"
++        DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
+     )
+ endfunction()
+-- 
+2.25.1
+
diff --git a/dev-libs/libgit2/libgit2-9999.ebuild b/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild
index 41394dc15ba1..c986f95f0cfa 100644
--- a/dev-libs/libgit2/libgit2-9999.ebuild
+++ b/dev-libs/libgit2/libgit2-0.99.0-r1.ebuild
@@ -1,24 +1,19 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake-utils python-any-r1
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
-fi
+inherit cmake python-any-r1
 
 DESCRIPTION="A linkable library for Git"
 HOMEPAGE="https://libgit2.org"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2-with-linking-exception"
-SLOT="0/28"
+SLOT="0/0.99"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~ppc-macos"
 IUSE="examples gssapi libressl +ssh test +threads trace"
 RESTRICT="!test? ( test )"
 
@@ -35,16 +30,27 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-pkg-config.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	# relying on forked http-parser to support some obscure URI form
+	sed -i -e '/empty_port/s:test:_&:' tests/network/urlparse.c || die
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
 		-DBUILD_CLAR=$(usex test)
-		-DENABLE_TRACE=$(usex trace)
-		-DUSE_GSSAPI=$(usex gssapi)
+		-DENABLE_TRACE=$(usex trace ON OFF)
+		-DUSE_GSSAPI=$(usex gssapi ON OFF)
 		-DUSE_SSH=$(usex ssh)
 		-DTHREADSAFE=$(usex threads)
+		-DUSE_HTTP_PARSER=system
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
@@ -54,12 +60,12 @@ src_test() {
 		ewarn "Skipping tests: non-root privileges are required for all tests to pass"
 	else
 		local TEST_VERBOSE=1
-		cmake-utils_src_test -R offline
+		cmake_src_test -R offline
 	fi
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	dodoc docs/*.{md,txt}
 
 	if use examples ; then
diff --git a/dev-libs/libgusb/Manifest b/dev-libs/libgusb/Manifest
index bcaad876ad70..220bd93ee78b 100644
--- a/dev-libs/libgusb/Manifest
+++ b/dev-libs/libgusb/Manifest
@@ -5,5 +5,5 @@ DIST libgusb-0.3.3.tar.xz 38928 BLAKE2B 711bf59db0d86879961fbba1cd87d5a8557cd4c7
 EBUILD libgusb-0.2.11.ebuild 1274 BLAKE2B 5c10310f7036758dbe152d94086e34233d8b31b9114f7dd97375d1ac6735b6d50e0e8ae7467b8d726ba38c0c2b99dbf8456b747b46e009e70d23e3530525952d SHA512 86833878bef26182a98a04506c25d08c3fea84ba74f986dcc361954c5745e3d39f7288f93f607fc1c71a17cbb8eef18e21eeb94fe100f250ca4375de3efc0304
 EBUILD libgusb-0.3.1.ebuild 1497 BLAKE2B 53a724d97fb95eb4ebba955663c744288fdd8ff643794e664286c1aa26a35ea2d0409bb0facae0c5d7c367c71b197aa55c67c33eb50cd7494ddc9f8cd195d39a SHA512 77da2fd2c758dd43c4217b225856fb1c00b3f893d7c629bec305474b72a79e61a1e62aed6e140e52b6e434a0a1c7a665f17b100d5a3b582afc37c078d609d1d1
 EBUILD libgusb-0.3.2.ebuild 1497 BLAKE2B bdeb19cfcc0b05b846e546b6a1eac91f7cca3acdbf898922f6f8ec7dac36d0ed02d3184e85cbb94eb4c5af2cb55a88fe7ed42191f887cf64f8feb9c682bc764a SHA512 2d5f829dfb61c0a88284676a6e6eb4ef468c9faf17dac39a6da81c27c6ecabf2d8f79e9a2189437b2609a7c83455e9d0dbaf7ef6ee7fe8c50abacce2602a0335
-EBUILD libgusb-0.3.3.ebuild 1499 BLAKE2B 2e7e4dbd2d6ed3616f2c4c7fa4fc603bd78294caece4cfa0daa31985f50c5f59de387acaf150bf42303f3dbbf0f5ebab0c59bd3e3542154b5a596ef612b541d9 SHA512 47fd9ba8968f866a828298334d066054d7ce54544408030d899771f59928ee0b355a9202e6be60368cc16b7add69f020f38eedc954f45f20c422488c1083c53c
+EBUILD libgusb-0.3.3.ebuild 1500 BLAKE2B 02bac6ee2981ba4317a1588dda5cf267c48742a06b492ee266b4a1ce717a322057ec0b89e4ac0353dcc0f5884fcae5f97389a01dfc038a2bf2badf61f4272fe6 SHA512 dcb1cf508d957e608a56f7af379784348d142117906429bfa7cf2cb7af96586e71044d426a3dbf5d892e325e5ae7ff362264d10bb7c911874872277f2ba29e57
 MISC metadata.xml 343 BLAKE2B 5905d49c021f1b8d8e5167415d0f0c731c0b204fad7aa73f10f6a7dc8b8f417e9591ed26ce655e2d5e5963e84f0ce44d77e59cd79e8d1921899b0a9627d52911 SHA512 096d78e0613e0475d5499f3c30542bd22fc98a2598a7e2e5719747a809a19288a0a36897bc9bc647fceb98f3579f7148c32d16d78c6114d0b925f143daca91bc
diff --git a/dev-libs/libgusb/libgusb-0.3.3.ebuild b/dev-libs/libgusb/libgusb-0.3.3.ebuild
index 87219dfe567e..f7b99287e233 100644
--- a/dev-libs/libgusb/libgusb-0.3.3.ebuild
+++ b/dev-libs/libgusb/libgusb-0.3.3.ebuild
@@ -14,7 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="gtk-doc +introspection static-libs test vala"
+IUSE="gtk-doc +introspection static-libs test +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index eb3384702d48..c8b20f99f201 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,8 +1,5 @@
-AUX libiconv-1.14-no-gets.patch 836 BLAKE2B 9385fdfb2c924ae30ddef79a40bd8778a09f7da5da0adf085cb114a40670186d186036607c77d1665469a1ebe2082fe93d3967058502a0b7a5a418854963e647 SHA512 3bb04769c46964d4357aba57b16a2cbdb5c666d839d46fcc0a11be945da9e855f5e0682c2dccd2fd66baab74e3429040849c503e9bcd05e53962f7680b2c0713
 AUX libiconv-1.15-no-aix-tweaks.patch 981 BLAKE2B 37d0ce998456bb2c07b249c22e8cd0d1eaad48c1d5b40e774d368923f764b6030a090e414fcb9851e32a9d582691dc70fc04da4d67386db53489db2feaed6895 SHA512 0318b24af8671043ee9e5c547734f6f768ef21b122b23ab95f7d1a5dcfe6c2c9579db87633a765e9bc83915d2097d3e2f3b6320cdf094106e3bf87b72d05d461
 AUX libiconv-1.15-no-gets.patch 796 BLAKE2B 19eeadf7bbfb96c5c7d2037af18d55162d81bba61b2dc022dfc19ce25534fe72eea1b29424f662c199fb6769fdd412a00cb2d5cb0e41af75f435f3ee16d83efc SHA512 39c32470cb802d74ee6f97071e74a4cedc8374cf60b50f470ca318066fe45a71ed89c5c77dc7b3e70f0a3a33ccca7beedf6e96863a431515e957883467325bde
-DIST libiconv-1.14.tar.gz 4984397 BLAKE2B 8697bbff9b929e8a30157f271ba3216aef7b2f0020f5edd273f3cec249069fb23f58ae13cbe3d3bb502c27e97e7cccae66aba23017ab4f6bce11b2ec133ef684 SHA512 b96774fefc4fa1d07948fcc667027701373c34ebf9c4101000428e048addd85a5bb5e05e59f80eb783a3054a3a8a3c0da909450053275bbbf3ffde511eb3f387
 DIST libiconv-1.15.tar.gz 5264188 BLAKE2B 2384dbf8549fa56e841b15b7e2698b83c0ee171cdff13aef48c60eae0bc4f5e7b2e937bc8d5eddf89fba11412d17bebd77bdda7060c177ce9dc9be00172c0c12 SHA512 1233fe3ca09341b53354fd4bfe342a7589181145a1232c9919583a8c9979636855839049f3406f253a9d9829908816bb71fd6d34dd544ba290d6f04251376b1a
-EBUILD libiconv-1.14-r1.ebuild 1373 BLAKE2B 8164ba86f9ac4090f75618b1e63aa64ea83f569ba474598d76d4e6a3b5dc222c517e3e810394abcd528223f43582e361d36540dbde51112bada4b85bdb10b118 SHA512 36f86203f6f1323365987386de64da46dd6534c7b56a35b77f79f86359450d9cb314ba5a84b7a52a550337f71e7339ee6a9ee7d171df3eada00dc05d62d3802f
-EBUILD libiconv-1.15.ebuild 1919 BLAKE2B ac63709e3065c43f6fc75c2e663b5996a65bd1cd71b4b1fe8b623f35ec1793fd13aabb5439f7bf8ad9d83da62f79357161b4cc4d2cdd135916b1d2dc008f55e6 SHA512 6c87bfb68a812a1dfdd30d1ea0cbb163ac9c00a6f03b5d05bc3030cad42272a34ef9c8331f1d21e73fa5a3be5d3dcac3a3ba0ac982322793be3e6f28d3459ebe
+EBUILD libiconv-1.15.ebuild 1918 BLAKE2B dbfb9acab74fd962361f22c5e5b745a933610199c48745b71b3792d8fc8800473b872e38ae2a38522136c116483ff50f249f3a279bcbca64a9df964828fd0c30 SHA512 d47d385e2fa11498323715083a0ba48951a06683d417f7437e8efe893dc9ee44d3a8bc4c8ef34cfce671d543e2f740273747df4a5995febe7231b20a54098cba
 MISC metadata.xml 465 BLAKE2B a9451430b40c62c22fa244871d26561960f697d360e3e46300f0512556d07988d73beb7e2eb468b94c9df71aae8aef6bb61c9e59ca9ea451bd86d1acfdbb8ce3 SHA512 a7f901242b5bcc60c070d40e4271e6d6a8dbd2e152a29c0b408ef43d5140a3ef89e90062853066532cd6d64db687aaf41ff553a56449865f1b84f37158cc389a
diff --git a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch b/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
deleted file mode 100644
index db767ac1dd81..000000000000
--- a/dev-libs/libiconv/files/libiconv-1.14-no-gets.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-hack until gzip pulls a newer gnulib version
-
-From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
-From: Eric Blake <eblake@redhat.com>
-Date: Thu, 29 Mar 2012 13:30:41 -0600
-Subject: [PATCH] stdio: don't assume gets any more
-
-Gnulib intentionally does not have a gets module, and now that C11
-and glibc have dropped it, we should be more proactive about warning
-any user on a platform that still has a declaration of this dangerous
-interface.
-
---- a/srclib/stdio.in.h
-+++ b/srclib/stdio.in.h
-@@ -695,7 +695,6 @@ _GL_CXXALIASWARN (gets);
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
--_GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
- #endif
- 
- 
diff --git a/dev-libs/libiconv/libiconv-1.14-r1.ebuild b/dev-libs/libiconv/libiconv-1.14-r1.ebuild
deleted file mode 100644
index c3ba6d18d4b6..000000000000
--- a/dev-libs/libiconv/libiconv-1.14-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
-HOMEPAGE="https://www.gnu.org/software/libiconv/"
-SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
-
-LICENSE="LGPL-2+ GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips ppc x86"
-IUSE="+static-libs"
-
-DEPEND="!sys-libs/glibc
-	!userland_GNU? ( !sys-apps/man-pages )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-no-gets.patch
-	elibtoolize
-}
-
-multilib_src_configure() {
-	# Disable NLS support because that creates a circular dependency
-	# between libiconv and gettext
-	ECONF_SOURCE="${S}" \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}/html" \
-		--disable-nls \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	# Install in /lib as utils installed in /lib like gnutar
-	# can depend on this
-	gen_usr_ldscript -a iconv charset
-
-	# If we have a GNU userland, we probably have sys-apps/man-pages
-	# installed, which means we want to rename our copies #503162.
-	# The use of USELAND=GNU is kind of a hack though ...
-	if use userland_GNU ; then
-		cd "${ED}"/usr/share/man || die
-		local f
-		for f in man*/*.[0-9] ; do
-			mv "${f}" "${f%/*}/${PN}-${f#*/}" || die
-		done
-	fi
-}
diff --git a/dev-libs/libiconv/libiconv-1.15.ebuild b/dev-libs/libiconv/libiconv-1.15.ebuild
index f200a83abc59..a8143ca5555b 100644
--- a/dev-libs/libiconv/libiconv-1.15.ebuild
+++ b/dev-libs/libiconv/libiconv-1.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
 
 LICENSE="LGPL-2+ GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="prefix static-libs"
 
 DEPEND="!sys-libs/glibc
diff --git a/dev-libs/libindicate/Manifest b/dev-libs/libindicate/Manifest
index f60b10d138fb..bd1b5404d0a1 100644
--- a/dev-libs/libindicate/Manifest
+++ b/dev-libs/libindicate/Manifest
@@ -1,5 +1,5 @@
 AUX libindicate-0.6.1-no-mono.patch 1888 BLAKE2B 60cb0434e3974cf474fca729be08defcaa01d713e4039001f4994bcaae0a657fd04b0c2eafa447c25c2e56d92bddd39f2b17915fdb7d26b916eae3e3315588d7 SHA512 b2623349c139321403e285ce384191f2741b6216dd87ce5e05a439bd175a2846bca111ade729e87322a413bfc518fdfc2546274114fe5726de171b51d3be7cb1
 AUX libindicate-12.10.1-werror.patch 343 BLAKE2B d7c64d707ef1d5dc47e865458ac6617c49842cf26001a1f74c69b226cf13b281c08cc854ae4df2de6cb36a5031eac107c88592a0134075e7b91f5b67a7c7c683 SHA512 8a385ed6cd0a9a216c675eb003497e15415a25666a2a475be2bbe7fd077ebf4fb8566a4252e53123f372adcf49fac48cfa8ffaef7c6ee6fabef98edf06f3d00f
 DIST libindicate-12.10.1.tar.gz 550378 BLAKE2B 9966c645c2538bf9246221e138771ce38e7f74629ae2365cd803a5e26372922cd5194ca1449f79a35f2bcd391e3ee2056183ab53b11fa8d92a8b2c258ead9c6d SHA512 4dcb5f292153210bc15a05f117101429da77a60b8b05b569baddf0e9043d852c2dccb0d5a6adbdf4d4a1b6f06b33c61e242bb4bcb376e3d96563bda591685c06
-EBUILD libindicate-12.10.1-r3.ebuild 1723 BLAKE2B 3562e38000b62d0d078d2a3803f374990d2911b498ed7182f692d181dde6d51fcf029f15b0aae3dae49525789f164376a863e9c69dce757bafc57f4340417a53 SHA512 12fa1732a7a37f09a0b2625499eb4a37223c307bad9097e1cc654f6cb825b214019b59d109aa2ba056ed65975c745ab7f4504ca411023e1ce83607c359057ff7
+EBUILD libindicate-12.10.1-r3.ebuild 1696 BLAKE2B ea050f4ea7aba787f78a91b849fbdf9bbcc3d7a1b1ad7e7a8adf2aa18ca20ed4e704dd38ae6e1265f6228dee5ae0b2638b9c1c196c9af99dc606625100eb80c1 SHA512 27a5eaeb70fcc4957aaca874df887492d423cb00a09a862115e53bcb82c8aec896b2350e26376ea6aebdf66127439d21b894b90a42a48be09949e400673a6eeb
 MISC metadata.xml 246 BLAKE2B bf90acdc36bc8aa411c24dc044144d43ea688be2451d7aeb1bfd3d7cc047e9fb9f59ee60389b200a43bc7fbf9b35a235d41c0866d2d894b989cf78156652ecd8 SHA512 a7134844aead376dcfe05a2d3eec66ef246a31a970f0d0b3d6acb2b31da13e67d28c94f6126e214384e5ad712b0e5bb1d0ddc946468639c000cadc3e79c19f8c
diff --git a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
index 5eb278f4e4b7..b3d10dacf948 100644
--- a/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
+++ b/dev-libs/libindicate/libindicate-12.10.1-r3.ebuild
@@ -60,7 +60,6 @@ src_configure() {
 
 	# python bindings are only for GTK+-2.x
 	econf \
-		--disable-silent-rules \
 		--disable-static \
 		$(use_enable gtk) \
 		$(use_enable introspection) \
diff --git a/dev-libs/libindicator/Manifest b/dev-libs/libindicator/Manifest
index 054cdbffa55c..75287c5d333d 100644
--- a/dev-libs/libindicator/Manifest
+++ b/dev-libs/libindicator/Manifest
@@ -1,5 +1,5 @@
 AUX libindicator-ldflags-spacing.patch 298 BLAKE2B 2d0fb361e2980d429beee418d9bf8d2f786de0d2b337b6775f9457158aa30d02b4dcbccdc488fa79236f04bf766aad49df732d25f48f1ecba923c46a4e239280 SHA512 fa283a8d6b88da0e2b6f5d0711ebe8a5cc0d4ab87cb07c3cecae9974dd68be751169b89503ae66751bca6cd73df2b2a262ac55a667c5c8e00e129d51f4452c67
 DIST libindicator-12.10.1.tar.gz 427764 BLAKE2B 93cc774df0b55b7ee447c24a0ce49047080ab867c20403724b855153cfc5b93ed0da278532a2fc67bd69e4a9484a31286c2c585cd14d156028f338b5ed2b306a SHA512 d6d77d0309b15cf6b52539323920ab0c1594cb1c1cef8a8d67cd0f76f8ceeeac28eb6db6227563df1932e6f1fadcffac68d82982182b745257dfaf91f1c945af
-EBUILD libindicator-12.10.1-r201.ebuild 1242 BLAKE2B 4a883f0f1aba8def12a879884bbc39f911c316974b36710bd67db6528df8f0bea10eaa6fd69afbd71c54a6074dc52b165277a96b1a1d30660e59fe9642f47d38 SHA512 b37a8db4db1054ec76a2907c726867356df17c9953f6e78d1d22680f6e9923c22d2e618cf89e19a2c50b410bf4dce842db41a9e9c6affa9a48f3d185ac5e18b7
-EBUILD libindicator-12.10.1-r301.ebuild 1223 BLAKE2B c4e5d3b5b25dde75e8e8e256080a92fe296c8414afd204c4763baa3f290be5183b338a1e377236413fd83b4d75f74916c59887689892312ac40f4c2a926984dc SHA512 cb70e762f17cceea1bf3a9f1fa6c06a5c2a5e90ad62b331553061cb40b12f3606b4ceb7549ee79b6ba7b2517a5d5bf4bb5835417bfedcede3b6babc1203cfe0d
+EBUILD libindicator-12.10.1-r201.ebuild 1217 BLAKE2B 2ac3b76290c0082cedb779ec6f0b14df429d7c183d220bb2cfa9078d82801fb8ed2e839d41d64e8a8ce996954f6889110fb5eea786528443b5917b42ad022c51 SHA512 199c5d5e60f8dc3bf2a215598640d9267d1f824955f76705f835073d5ad33e55bd4513f522e8a4b2ffd2e2e9119f2622f26020f6760d05323e25b6f59b5c21f8
+EBUILD libindicator-12.10.1-r301.ebuild 1198 BLAKE2B 041dd6acb68958c63f8fc0fab20056154276e4e98657d52a90797c8170844a51ea14330aa5e9c75b78f59ed2a33b4eb267721fd3be53d11cea79a331d6fe812b SHA512 b3d772147ccf73a96906380d3e39498606f778f561ad17ccb019343447db56653bcbceff25618e49226c263a2b6883513e4f979817eae7d3bc0622dcce139b6a
 MISC metadata.xml 247 BLAKE2B 216107f32a44b828d5bd65432dbdf2f3b71d81e96ee3580fc551392310b9ee554715698dfcba215fa2181a90f361564b6d04546c61848c3a2d176f3590602f69 SHA512 f24203e0188dd8311689fc59007368585764703b92f6fde9b4ea01666d37304193fc728a9f99b7f6c936f5a5a51a58a8402a101dc4eddc0bf2bf09f221bb0054
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
index e3d8f80f60b2..8e59ad01fd19 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r201.ebuild
@@ -30,7 +30,6 @@ multilib_src_configure() {
 	append-flags -Wno-error
 
 	myconf=(
-		--disable-silent-rules
 		--disable-static
 		--with-gtk=2
 	)
diff --git a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
index 04bb88e316ba..7dbbe27af996 100644
--- a/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
+++ b/dev-libs/libindicator/libindicator-12.10.1-r301.ebuild
@@ -31,7 +31,6 @@ multilib_src_configure() {
 	append-flags -Wno-error
 
 	myconf=(
-		--disable-silent-rules
 		--disable-static
 		--with-gtk=3
 	)
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 169ca062d49d..113c2cd6fcaf 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -1,7 +1,7 @@
 DIST libinput-1.14.3.tar.xz 567560 BLAKE2B 76d38b795a5e721a73062e9c37b23bf6739291549cadc66401ef47b1a9afd5766f1d0ed855fc66912e4257fae4b1b813946c67246adb8d8566d5ad9478079636 SHA512 f01d1bd1b25b8060519575644597d35f0c89de5386d298441f440128ceee3e57549921a058adec31adc8b33dbdedf4c0bd12c76905a69f752859d3136e26336d
-DIST libinput-1.15.0.tar.xz 573364 BLAKE2B 521e5775fb98b1b3a281d1002bd41fb0cd3e7dd3d7c1f11bd32773fb8651cddfa7db1fa2ca686a213ecd726f2f0fb475cd3f40a7a7290101286a334fa7b0086d SHA512 5dab48e1b4c9c0deb5b01ebc3ccb4cc28d614be25d87daaf42f51fbd2d955266f3fdba73029bc0094caa55060dad8967751b72d8f45f19a40b542f0c9118c1b6
 DIST libinput-1.15.1.tar.xz 579236 BLAKE2B 0b0b8cd6643ef33c1fc52461caea332d98cee38b79eee3947fc3d853e6a9402ffc9ba2ac5588430c28c73b6444fa06f6743b0c932077ef29e97d0b1384e20fca SHA512 634810359bc4d86f2c4c75f472bee5eaed04ed93af3c91c4bc46a596402323941f9cc90173e278bfa7e5cbda6b7a20adc59bd09520dd4152fc961302b7e57904
+DIST libinput-1.15.2.tar.xz 580624 BLAKE2B a13bf121b12c58d904f3505fe2fa60ea32eee78a057ac1fe9e64d3017fa840bb92af053f472d2b163d46a958f2a3a5039154efbb9558eddabda3b2422cafb2ca SHA512 f6b50dbdf6ee6b65f88e020c4292c94c3178125d58629f27c2e52f92b658ccd67e0c5604fbf0b303621ff0386637ce1e291daaa991761d4145e8bcda4dd128a2
 EBUILD libinput-1.14.3.ebuild 2062 BLAKE2B 2f69359a6fbf4ff51d52b31d98a1219577414f7462ead908fe9cceb9b46c1825f50bb422a666a3f69b5fb3086bdc6747908826cbb2a7d093e0a8a6bce9adb25a SHA512 d10de59e53d94998d274502d0e9f9c384e4ad267783b87bf3509d1e3e40132b25832926fabdf24a40a8fa2426d81c64622635d35b198dd12d39fac5a4f0af39c
-EBUILD libinput-1.15.0.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
 EBUILD libinput-1.15.1.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
+EBUILD libinput-1.15.2.ebuild 2105 BLAKE2B e9ff1aba1ea011b3bdc5c54480485d5e4f72871bbc655261f89b42e4d73ec7e0fc718be7452967cbca6717997663584220ada483fb3d8ebd12028cbddf898223 SHA512 7a72ecb0d8cf333018d72709a7cb08e3c9a67a7c4ea8674357284937358a77111a1414444c806c35a493c18121a6dcbd2a70fa47f78612f53b06b051ba2662e5
 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf
diff --git a/dev-libs/libinput/libinput-1.15.0.ebuild b/dev-libs/libinput/libinput-1.15.2.ebuild
index 313a4e3d067c..313a4e3d067c 100644
--- a/dev-libs/libinput/libinput-1.15.0.ebuild
+++ b/dev-libs/libinput/libinput-1.15.2.ebuild
diff --git a/dev-libs/libite/Manifest b/dev-libs/libite/Manifest
index 2e0e8d067623..601a21fefbaf 100644
--- a/dev-libs/libite/Manifest
+++ b/dev-libs/libite/Manifest
@@ -2,6 +2,8 @@ AUX libite-2.0.0-fix-path.patch 304 BLAKE2B 2f753f52984c5481c76f8b228373ae7d091f
 AUX libite-2.0.0-fix-which-path.patch 594 BLAKE2B d93f3c500f82f541bbeffd2e418f2430db9e8328ba03a2af39b22042c9c5a6923b69fb9c6a5f0bd64271d2f4761c207a8af01d87c977c7ee09e273b90e64ce64 SHA512 34b091128a9d43202b2d90f01d575a4c03bea38828d65bc6212d601c02a53d8157b9634cf5e0dd4f2be3ddeb18ad0bb3af0dedc68a0a30abfd51e7de2808a115
 DIST libite-2.0.0.tar.xz 259960 BLAKE2B 4c5393daaf2ca6eb830fc5f11b1d38e9c1e2374c5f5d87bb973c7e54b9f81480d4a270a4551689806620cd5a84671d1055d409d6dd090acb64bf7fc454d1c283 SHA512 18516f19d36d81169116562b4b27d76240715424cdde9b87eae831f35adb17d70fb01e2eae5e7e9ce99e2c88344c2c15d2b7d11f4ea2e9ae0deb25ee5ee4c563
 DIST libite-2.1.0.tar.xz 265712 BLAKE2B c8a0f2a55bc6e0ae2ad774be67501d2d8ec31927cc107b1b38de409ce78334b9a516727722aa57d615b234edf1057967b2375a96dd947637e987d2583e2efc2a SHA512 dd6b48ed6dc646ce2d17e647179173bf5d3b478db38f05c2133119ce81da9778be8bb277db9beb0e28aeff7f81cb3fc361d3737de31623f6661141efa63d64d3
-EBUILD libite-2.0.0.ebuild 624 BLAKE2B 4fedd1976a0f0b8a3808dc86c0b1dbd9975f956320fd0caf9eac1c40657aa6ac01b96ca4133ab819d99a60f0e572406a1a3fe5b74960c517195ee78fdd6ce804 SHA512 fe0518a4470535fd2f79fa59b1b2525f8b2bec63e9ed6dace625e45b242640ec889822913b3911b04ab3e646e5ddec714c504d50a1f33c55562427e421f98f51
-EBUILD libite-2.1.0.ebuild 532 BLAKE2B bc58c451cd962322d65ce6bf026718161d0a73c3ac9330150d7388f9b885c1b5c8af2630ca2212d427d44c68f1244abf204ca496b054a08fde865fb2439ea09b SHA512 4b6ee1ad3db4e8fe04b374ce8c5ee6b32edda02aed3ec1c6180964a93f4dc498051c58f0e15598a25217a742e08edf5509ee1323da8ac21bd98f87d592177707
+DIST libite-2.1.2.tar.xz 265524 BLAKE2B 6e89fda5267e9beb8b057d195f1ed7503fc898146e64da2735510ee9fe703a9ee7d1f21e67a7820cd9ae413ee77b66c050d6534553b5a6ce113c113a7fd58f06 SHA512 92c3830344d7816cbcc2a697bf55b53557d4df7bab4d3db5aa6319379c82a14cf021d18402eae724c5b9126ec06df9728ee6ded9599117cc7f3fa7a0b2f997cc
+EBUILD libite-2.0.0.ebuild 623 BLAKE2B cc155de718b9673052969f833cfab6e0b9dbc5ce2cad4dfb1b6b77461ea293191d69b4573d6cd19feb98a10e6199a688265965e4f99f3b543a98d605e8d554f8 SHA512 c5d23809b45ff32fee9e840b05c3f4b905bbf34bfedc2d85406130950bbc2f7b198bccbddef7a23c9b721fcbcdefb3e86e15e5629ca9ce6d34fa7cf04abf2985
+EBUILD libite-2.1.0.ebuild 534 BLAKE2B eb5645297458dffed3149fc49f3f91abfee966ec84355419bc470e1e8c1ac2a2617920512c81c41ac07e726776d42734623df53347a638e322b16acb08622d45 SHA512 39d343c6b7bb37e971fbf4395a2d6ccea0914f7c6ae3c0da0794e33af8ec8f0c079c7122341883f4056abf1028598aabdd860f62126882f41acca2542b81a234
+EBUILD libite-2.1.2.ebuild 534 BLAKE2B eb5645297458dffed3149fc49f3f91abfee966ec84355419bc470e1e8c1ac2a2617920512c81c41ac07e726776d42734623df53347a638e322b16acb08622d45 SHA512 39d343c6b7bb37e971fbf4395a2d6ccea0914f7c6ae3c0da0794e33af8ec8f0c079c7122341883f4056abf1028598aabdd860f62126882f41acca2542b81a234
 MISC metadata.xml 773 BLAKE2B ed6eab8165e4f6a6b37c9c23616d0eacb44f2b15b13fda13093629a8d060e2c9f35b5a5614ad8e205462e0e1c8ec2a1cd71243d377d3a94084f0c1d7d2ab62a4 SHA512 2bb72bae63f07cce65711f13f5268a2bdde04ebdbcc9be4a2a5700f6a68aa3745d91ec83881fa83001fcdfb71675dc4fa1f937ca63273ae763ad899e43e0290f
diff --git a/dev-libs/libite/libite-2.0.0.ebuild b/dev-libs/libite/libite-2.0.0.ebuild
index 0380b8e161c4..b5328e1645dd 100644
--- a/dev-libs/libite/libite-2.0.0.ebuild
+++ b/dev-libs/libite/libite-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,11 +17,11 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-path.patch
 )
 
-src_configure(){
+src_configure() {
 	econf --enable-static=$(usex static-libs)
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
diff --git a/dev-libs/libite/libite-2.1.0.ebuild b/dev-libs/libite/libite-2.1.0.ebuild
index 285bb078460a..f0baf554132e 100644
--- a/dev-libs/libite/libite-2.1.0.ebuild
+++ b/dev-libs/libite/libite-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-src_configure(){
+src_configure() {
 	econf --enable-static=$(usex static-libs)
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
diff --git a/dev-libs/libuev/libuev-2.1.0.ebuild b/dev-libs/libite/libite-2.1.2.ebuild
index 299e8c4aa126..f0baf554132e 100644
--- a/dev-libs/libuev/libuev-2.1.0.ebuild
+++ b/dev-libs/libite/libite-2.1.2.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A collection of useful BSD APIs"
-HOMEPAGE="https://github.com/troglobit/libuev"
-SRC_URI="https://github.com/troglobit/${PN}/releases/download/v${PV}/${P}.tar.xz"
+HOMEPAGE="https://github.com/troglobit/libite"
+SRC_URI="https://github.com/troglobit/libite/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-src_configure(){
+src_configure() {
 	econf --enable-static=$(usex static-libs)
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
diff --git a/dev-libs/libltdl/Manifest b/dev-libs/libltdl/Manifest
index e1642328e5b8..9f59ccb58c62 100644
--- a/dev-libs/libltdl/Manifest
+++ b/dev-libs/libltdl/Manifest
@@ -1,3 +1,3 @@
 DIST libtool-2.4.6.tar.xz 973080 BLAKE2B 0865af9f8701ca9dc62eec8294a088d24f4a3ff541bc76acfe7b69f70637d7e8261a17d69f7d54a4177f974c429be68467883a1560edb539061966cbf7d4a356 SHA512 a6eef35f3cbccf2c9e2667f44a476ebc80ab888725eb768e91a3a6c33b8c931afc46eb23efaee76c8696d3e4eed74ab1c71157bcb924f38ee912c8a90a6521a4
-EBUILD libltdl-2.4.6.ebuild 1121 BLAKE2B 2fff331e7b145dd239cc1f8e8597e4624db4acd761f3bdce728aa178a8d106f6b3315f8b91f65ac98900b3159dd91c96ed89f8d6a38dc1f71ebf092ab799224b SHA512 ddf4e4ebc9eef2ed57e2c465d3f41dd12e35b41bf283df34c3d6fa9201bd2394ac3cc9a6ac3d1b624646a99e5936cd8f7e639e6377d9ec560e2f8b550f2bcb41
+EBUILD libltdl-2.4.6.ebuild 1120 BLAKE2B cd203c8244cdef9ee4deed1fec53e1792e88c9c2c92e1ac92edef1724f7e324e5dfbf6bfb795fb8d21be18db903a15923ea9abc4cbdf1fc538facad6fbb28ad2 SHA512 4a3dd7856eb0873540566f224a4a4c211def0c06b1089a61b0c681672143cbdee5a4950e08d4df0e9c2332703950de69049e773429f41ce9a692178415f00283
 MISC metadata.xml 330 BLAKE2B 5678614b52e8b602999e8a3d3a551cf0096f6bd1e765b4181d4183a33cdb0782dc16b959556b410d5c630ec3d36d00df80c204a0ef825361235bfb3165b41a04 SHA512 524ff4bb47aa1a020112c86f625f3f0a9bf385e7399a7a9aecdebb99c5699dbe770b3bc6de4e3e969c8a4c5107a4a214be1f6a06a075b7301069fb2f0e7939a1
diff --git a/dev-libs/libltdl/libltdl-2.4.6.ebuild b/dev-libs/libltdl/libltdl-2.4.6.ebuild
index 28d8c55cbf48..87edfbde9106 100644
--- a/dev-libs/libltdl/libltdl-2.4.6.ebuild
+++ b/dev-libs/libltdl/libltdl-2.4.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
 inherit multilib-minimal
 
@@ -19,7 +19,7 @@ IUSE="static-libs"
 RESTRICT="test"
 
 RDEPEND="!<sys-devel/libtool-2.4.3-r2:2"
-DEPEND="app-arch/xz-utils"
+BDEPEND="app-arch/xz-utils"
 
 S="${WORKDIR}/${MY_P}/libltdl"
 
diff --git a/dev-libs/liblzw/Manifest b/dev-libs/liblzw/Manifest
index 5027f5033b98..35d86346780b 100644
--- a/dev-libs/liblzw/Manifest
+++ b/dev-libs/liblzw/Manifest
@@ -1,3 +1,3 @@
 DIST liblzw-0.2.tar.lzma 868300 BLAKE2B 6346fb0aa5d2a199276faf04a7ac6fd571d0dd06952028ff5b49c7ec312b0ba77b219be6d5a000b4477f6c84ab30ac3818e58e1165033746f675265f4fb38ef2 SHA512 46b14fe83793e9611c9ee969f699fe752f4d2df46a53b0f975fbce9805259fe4024c42df6f4946fc6dd7270b9b15307c54f31417309806ab6c616abcee73d9bf
-EBUILD liblzw-0.2-r1.ebuild 473 BLAKE2B d463c9cca801e948914047c38f5321082abb7b08dfd9a7d59b4a92c95d9c635ea49b663b24cf006ff78b04e055b0ef0ac176c60d09b951720ac831064ebbd635 SHA512 e92e08543e77e5ba026964dc7b2a594c7bf8b8018216341f21186dd52a07d56474fd71b01844e39474d392302bec2f8a55830a7423f91c2f215933a6fdc27bd1
+EBUILD liblzw-0.2-r1.ebuild 475 BLAKE2B a8af4286947f17e6c566126f28e0a94cd0ebfddde9c94099e7b34adf91c8f409bf82edeca1e4ad8d5f7cdc477c4c4a7a8b1dfc196b8fdac7a6a7017586650cf8 SHA512 739defcae527a5bf24c920be6ce76bc0016c6ef84cc9a46b8ac47a21deefc7621c047b651c65e6a2c90ccaae57da2908aa520736a62de7b43289efa9a6651dc4
 MISC metadata.xml 348 BLAKE2B d29da512394e29b4b8060614f619581eddd64eb7fd3273414ddfc6bf715d17040f4cddde699fe3bd56c3eb96fcb74cc9109cdafab0f46ff38b4ec00743a1b8ba SHA512 aa6d3d2945033b6643c9f1ee7a643826ff39d61fdd880a4d8dc0fa5a8790af120908b8ffab70ec32e88ca4d025bca9606f6f549adb49df1130105abc9ecec3bd
diff --git a/dev-libs/liblzw/liblzw-0.2-r1.ebuild b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
index 84d097d32022..ca3863803346 100644
--- a/dev-libs/liblzw/liblzw-0.2-r1.ebuild
+++ b/dev-libs/liblzw/liblzw-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,11 +11,11 @@ LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="amd64 arm hppa ia64 m68k s390 sh x86"
 
-src_configure(){
+src_configure() {
 	econf --disable-static
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/dev-libs/libmirage/Manifest b/dev-libs/libmirage/Manifest
index a3419ec84038..351244f67743 100644
--- a/dev-libs/libmirage/Manifest
+++ b/dev-libs/libmirage/Manifest
@@ -1,5 +1,5 @@
 DIST libmirage-3.2.3.tar.bz2 234761 BLAKE2B f3fc24dae81643c4fea99d12e4f7f1d600586a7c5e546e854d4391ecb11f39a6d1108ac86c79b917fb96cc53424975ff548522a0f0e035ffd4b99638fc18608a SHA512 25cc3ccfac9332d06edff7e73d992e9d74b7464f61b857c3fb40ec9e2584a8f61b8aaef96a6d6f4b8f3a7c871b6b7b7803502d5e1ef771fc239021a827b90f09
 DIST libmirage-3.2.4.tar.bz2 234530 BLAKE2B 72329350a9e2a197ff52d396a011d3cf0178731909066ee1dab75f0d870fd751d50e2cacb69c849aa8045e94fa492732c21d201bdd4cbe3a9048f5c3f90ea881 SHA512 6fe718ad7beaf457ef0a7cc037b3bcf268574606ea9cbc1ba9abb5088c734fe9a100a35320d393a47625bbdde5515cded02e767618f2fc0801cf755af1414091
 EBUILD libmirage-3.2.3.ebuild 1160 BLAKE2B e5a33aa6a2d9c3827a7b49b0de806072c291ee8a16f5448542508ad3a5d03edbfe2e3f479eec61e9a40f24d3ca1001b244486e04cdd44a2debe26d81ed3b0b91 SHA512 bfcaabfab5dc6b9f265cbfddef81c61ac975d0e1ace22fa300943cda0ecc1c28c984b4719e8fe88bc2a6e07ab6f24ce457a7480db730d8f210cbf46aef5ee309
-EBUILD libmirage-3.2.4.ebuild 1180 BLAKE2B f4cdfc1eb21e2135689ad5d5c9e61532f4a14542d2937d74ea16fb094b1576e86187026bca8ebc418150227ee90ccad6ba41b7ed7074643850dc720d9fea7fcb SHA512 5b9c864d9055486c4ce8ad16d8caa06420c4df2d289f3e83df9cb5d049be56cc556148e18a58342a9e584425ec97adb9efe0a25f30b1140497f68648adb4c65f
+EBUILD libmirage-3.2.4.ebuild 1179 BLAKE2B 4088a63434e9e39fb5faa93b8e54715195d413ffc49b232468e9c51d5d7c765918b682651c47c54bf0d71195b1e85c83bfcf5cf84439d3bc7be97ef25f1ca373 SHA512 a3c22119d7d578483cb5319f0c2738473d875503531ee8bf4e2e2fe9079bb28953df5e50acc78d633424383d6d244d3d083bd44453bdab3b093dd850c78d2c5f
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/dev-libs/libmirage/libmirage-3.2.4.ebuild b/dev-libs/libmirage/libmirage-3.2.4.ebuild
index 8c6a16a49522..ff285c1dd0a3 100644
--- a/dev-libs/libmirage/libmirage-3.2.4.ebuild
+++ b/dev-libs/libmirage/libmirage-3.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/libmirage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0/11" # subslot = libmirage soname version
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="doc +introspection"
 
 RDEPEND=">=app-arch/bzip2-1:=
diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest
index 2143ff1086ae..11f0821a7d19 100644
--- a/dev-libs/libmodbus/Manifest
+++ b/dev-libs/libmodbus/Manifest
@@ -1,4 +1,4 @@
 AUX libmodbus-3.1.4-doc.patch 358 BLAKE2B 7f69a497411d308bc02f4881802cbd2b17ef2dc9edd527a6f9ecfa96ed70d3336f79b20c4ab8297062802465fa174f0adcd4d3ac81946eea8c1409a23b067278 SHA512 a73147873d0ddb3338608cb7bd4a44e6e333b46313e9326e7442b6b3c3fd4da97cbf93f8c92e517352d8828cc6ab6eb95a36e7fcaaa62a48774bc8f4a109b6ae
 DIST libmodbus-3.1.4.tar.gz 471576 BLAKE2B 4fc57abd784e2cfb65d19cd55a31f4b778a209141cc13b9c969dbd6052f187ba0de0031105be748aa2113f345bdb16c2b582b53635b5334f06dfdb34c5992a18 SHA512 63f73894b27704f5e5b3ca0a364cc366c5b5d24903bb24384155890cf06c0f8e5c707a435a38129402ff6628ef3d611dd0db82f840b79cf1d205ebed2ac5681c
-EBUILD libmodbus-3.1.4.ebuild 737 BLAKE2B a89079a9c3fd16bff365879467f1f98707a83e34e1524e874821390ea29cb53b5b1e8dbfb23971f21035ec3c0814e40a56cec7064eef3c5e6cfe0a42a87ec0a6 SHA512 27b39d5db810d3d5c835644dacf8303d281b50f5eb27e3a78f6ff47fcf9129353b16ba83e3b6602a8c67a2cd96a955b3040bfea2f6c1805a635e8eb1db2e7cd3
+EBUILD libmodbus-3.1.4.ebuild 710 BLAKE2B e568176b9251fb809a400a554d26f6f4ff18784514440be657324ceac0b92ceb7222983537bb9a7a49bb0a9aed2d78b2fee4992289773fe6ef1762e72de1d2b9 SHA512 ebaf73c27063a16f6990778ce62986b7934d8b2e0e714ea530225557ce7c8f81724016c535647677359724f216b51664bdf4446e1e6c9cb033373d2c11a9bc48
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
index b8b3f359a002..5592a4bbd211 100644
--- a/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
+++ b/dev-libs/libmodbus/libmodbus-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,7 +21,6 @@ PATCHES=( "${FILESDIR}"/${P}-doc.patch )
 
 src_configure() {
 	econf \
-		--disable-silent-rules \
 		$(use_enable test tests) \
 		$(use_enable static-libs static) \
 		$(use_with doc documentation)
diff --git a/dev-libs/libnatspec/Manifest b/dev-libs/libnatspec/Manifest
index 1657a5946cfe..c1e01255ffd4 100644
--- a/dev-libs/libnatspec/Manifest
+++ b/dev-libs/libnatspec/Manifest
@@ -2,5 +2,5 @@ AUX libnatspec-0.2.6-iconv.patch 323 BLAKE2B 26cfb0f9faad0e375a2f2ed7766c3adc66d
 DIST libnatspec-0.2.6.tar.bz2 500525 BLAKE2B 30cf13f89a60c86c9ff56c2c2890d1fe169b2d503a87effec805fec49674b439f7311b358f2dad06b335e27b45e775f204092d3ae0b9933f516af3292ff351b2 SHA512 6bed3c8b2937ee27666a7deedcdebd7b24a8f495be63008fd70c467de4ab532e6448e6b682ed3be04a3a60ed64acaa0074d87231a421f6c73d6a7ee1d17bc66b
 DIST libnatspec-0.3.0.tar.bz2 127265 BLAKE2B 3f0ffdaa57f232c5245de72bc67b3b6bdfa88aaf965156c50483278f51d54c1da1600c19bd49aac5a1a9317a9b53d5202e6610b1ef6c2335b824e183de1fba75 SHA512 5c04358d20be5b6ffc7038bddd4514c4b5b4e9940fb6247070b832da9d059b31fd1306cf29f54e4a1b8be1d909176bd72e6ffa98e4b750840764f9b2c250d31c
 EBUILD libnatspec-0.2.6-r1.ebuild 1049 BLAKE2B 91efda9a51e47c5fc781981c7da261a8183aec0fdc1ad1fa06e4b663e39c3454f5e7d90156534cffb573b5f3d0e4f7dccd64e1c577c39676c91155c6f1479e0c SHA512 3a75566f08316990344c9d206b49742c504d60559356b221e0b250c2a4dc1c323e56cb400d7c96dc5becf8a496a7c7ae37ddf293c7d80d620d924d011bf53eba
-EBUILD libnatspec-0.3.0.ebuild 1073 BLAKE2B 82a487a19b3936447202e35a5b8c3dd425ad667bdcc8e78eb43e84a65f4de73329f9c2d94301dbfb45addf1a91fa97ee2e100852051019c0063fd7978b4cf8b1 SHA512 093a59ce70da148429769f45764090cd9ddfdc8efbecaadc4f291289510af858e46e8e075363ac80b945cb3c7076f61db6b5bc44587a15ed66b12c31a63563ae
+EBUILD libnatspec-0.3.0.ebuild 1067 BLAKE2B ed21fc4dc319fe481532824b6a865a6297b0360f0e4210665d927339f36b8f7657e30919966fc1e02d024ae95143aeb44230448e417f6bdd44ae10a9d6791de7 SHA512 8e1bb612ac5efdc07dc7abc62266163076e5e20cdaee338e93c0695e6b4b2c96e5a1cdcea1b7deebdd0e326e0ae6e96e3d0ea9dba88d1cb914d5a915b087a924
 MISC metadata.xml 311 BLAKE2B 6af7771eaba07f3b1a635f316f198655ee598392f99fadc0f56bcb110c3b630bc9d86ff450622d9e27fdc17aeb62140efc6fec1d228a0de157b7058f1101d9a0 SHA512 f854676930193772765a53284b645b40e9a3a5fe7b6a6646173034593039ef6be112a1163760f59080ae89870d0af48c0308c31cd6eebd4d6fd5b45122d55272
diff --git a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
index a78d03b776f2..4f28ced35763 100644
--- a/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="doc python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest
index fc32e29fa1e9..1b26ba0b5846 100644
--- a/dev-libs/libnl/Manifest
+++ b/dev-libs/libnl/Manifest
@@ -7,7 +7,7 @@ DIST libnl-3.5.0.tar.gz 967835 BLAKE2B cf21c1ffa89799b91bf4bddb8833d5af5c62eb1c5
 EBUILD libnl-1.1.4-r1.ebuild 1158 BLAKE2B fc2e62c2286a6c5d5ea686ef638a6f29b458f8fc7806ebb29679da77fbc660c086d7122d8e02d732f1f5bd1e5cf073f817d8148c5e0f58abdee8cf35b0b96ee6 SHA512 3213fbca3c960b4d5088f2cc8fba234a1d49a3da4ce617aff11c9ea0207776dc2744143e1989ceb0368c2925318fdee16b9e191183be6ab212cc19ad854f83ae
 EBUILD libnl-1.1.4.ebuild 1132 BLAKE2B 0fa1aea261fc28c20bca57df2daeb687f3f00a8423a7fd8be9de2e395d9ab40323b642cf4bf85859a9df1ed2fdb57aee993c17e221969b4ecb69ab16e2f39f70 SHA512 e73b592e0435f5e3f420f105bfefdc19b9f8e6c1bcef5bc00ce8fb10740209c84b386fa281c7f24ece69d8f76039661f2e7d24b8ce6120629220ea078494efdc
 EBUILD libnl-1.1.9999.ebuild 1055 BLAKE2B 89c39a6ec77da02bd2adf5aa55116bdd6a9c12771502bb5a7ae922ea58f6e6aa240e98332cc037d1320f30383488415e5edbc1ac45164382567c9160e70d6194 SHA512 c1648b9fd4003454d9bf54e5c5af1deb68eff4d048f450180675870cedb915f9e54350c6bba9649289e10aec654d2f2e8025e0fde72240394e9f2bed2e055738
-EBUILD libnl-3.4.0.ebuild 2404 BLAKE2B bf8e070f99c3c48e2e55f0cb11b1aeaa924acee3fbf48ef05d304b751c31e47f20722e6f4ceae0ea7b4ac732fcfe4379ef7cd3a8e2f8cc50625c676b64492454 SHA512 106ce94deafc34ba6ee6aadda20c778b48c6f5d5982b80e6121074a8928b5e9e9c4fdc36ab6f6516934f7ea142a88ba9d159a46f2dd7cace456f6b9adb597cbc
-EBUILD libnl-3.5.0.ebuild 2403 BLAKE2B 0d0f738850a5ae96d4efb4200e82c6e0348ef374762696003196d7a83825ae56e1a4f2fe37488657f5c55682ef7c8b14de866bc51765f3b327f83ee7620b4761 SHA512 ae9f6955f6f78c03618fbdae5d5bf15ac6531f83f808ec54bc31cc583a5c7ed96d5e089b4a52df4d710f8e9fa728d4dcedbd97d0c362ba47be8debd737df1b47
-EBUILD libnl-99999999.ebuild 2159 BLAKE2B 80cc6787a701da757828ae3ea9f2f9872a03f62044656e602565404d9c6baaffe2999862b19c7613d5904fb253ff36b28df366742b2060f83b473bdd20a63a65 SHA512 73acc65ac6814da3df135708afef59209f028b985a82b05ad175345e28ed252f096108c008010007defee758efbf879b2aa3f8154aebf883986e9324fe198bf2
+EBUILD libnl-3.4.0.ebuild 2377 BLAKE2B 10f1d5ba089fe2dc0a25c2314acb3e834da2e2a63a6387967d3eb6ad8461e54247a95c20a5681cc2f59bab2eaacd20c3e843b165735ccd258ac41b706d8d5f08 SHA512 3ea00e46372ac59274487532837f460ccb5fe4f9313dbc006dfcceb548abbfd336dabfc07eb791fc82fa9c85920fa358fd6e79d415f700f2fb806d60cd586aec
+EBUILD libnl-3.5.0.ebuild 2376 BLAKE2B a4a163a0879fcebb546fb62efc1ccbb5c106b840833c5c5b784f80fc349994edf587cef59e2b1b3489d9357563146e83e5500c787bd3a9f31cc59f8b27d5307f SHA512 e3264d315c61014975c150ac9494f9bd21007e6c59415dd24a0d1a0ab27dc88d996f4b48d840a1afeb65d9b1188de0cb1e8e07ae0c1c0f1dbec3c47b1cf93653
+EBUILD libnl-99999999.ebuild 2132 BLAKE2B 4ac29a14c07f5769cdba9af5a53f7c384ed0587a31ba3368011dcfee342269060dfcccd4904e4b6fdf567882882adc46dbb02a1a34edd3f75f27591598d83867 SHA512 3891de572c343840a201a4a5bdb4a02a9b1cf07af5d9fc2b9dd864d7fb5fd07d85eb5d8c2488f616f4700050b205a3514b3a81cba40e4d31dd3cb00717c4acc7
 MISC metadata.xml 584 BLAKE2B a20cc961918ee8685889b73f8fcdf5cd26a5b0da2ddb95164774461c2fd78754262619d7de2dcb6030f7ef3d27a34057662b2c01cde1fe3729ba1c34bd2a087f SHA512 0e8731a9aafb77b313583babfb2786c4fcbe655f3fcebe93fee90b2ea4c7f03a6ed559a253cb63f5f3a5eb9fd841babcbb5c85c4c93e51a670abe605e9d22a9c
diff --git a/dev-libs/libnl/libnl-3.4.0.ebuild b/dev-libs/libnl/libnl-3.4.0.ebuild
index 04fc2e4dabe6..5d321fe6abf3 100644
--- a/dev-libs/libnl/libnl-3.4.0.ebuild
+++ b/dev-libs/libnl/libnl-3.4.0.ebuild
@@ -74,8 +74,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		--disable-silent-rules
+		$(use_enable threads)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/libnl-3.5.0.ebuild b/dev-libs/libnl/libnl-3.5.0.ebuild
index 28138672f5b2..be977647afa1 100644
--- a/dev-libs/libnl/libnl-3.5.0.ebuild
+++ b/dev-libs/libnl/libnl-3.5.0.ebuild
@@ -75,8 +75,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		--disable-silent-rules
+		$(use_enable threads)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libnl/libnl-99999999.ebuild b/dev-libs/libnl/libnl-99999999.ebuild
index 9a6a52092d76..bbdb3529b765 100644
--- a/dev-libs/libnl/libnl-99999999.ebuild
+++ b/dev-libs/libnl/libnl-99999999.ebuild
@@ -69,8 +69,7 @@ multilib_src_configure() {
 		$(multilib_native_use_enable utils cli) \
 		$(use_enable debug) \
 		$(use_enable static-libs static) \
-		$(use_enable threads) \
-		--disable-silent-rules
+		$(use_enable threads)
 }
 
 multilib_src_compile() {
diff --git a/dev-libs/libowfat/Manifest b/dev-libs/libowfat/Manifest
index ac0b0b9ae4f4..259c04ad0436 100644
--- a/dev-libs/libowfat/Manifest
+++ b/dev-libs/libowfat/Manifest
@@ -1,5 +1,5 @@
 DIST libowfat-0.31.tar.xz 183684 BLAKE2B 67c60ebba10463f28196e3d9ed5f20fdbe79db8b499b226fb02d4f38833747e5e709054473267a1e139e1bef29222220e7f60cf2f472ac58ca67b52dca2c5661 SHA512 b3ce973d6edc501ddaa6caa84dc3b74e3e31ced92e4f707038858cd36c977863251a7eaeababdad34ffe6b8ad13c9702118464f6f9fd827e05f6fbc5004408b5
 DIST libowfat-0.32.tar.xz 195820 BLAKE2B 6dc19b947867a9b08eece785378be2493fb7185d1cc334de080ab1c288884fe0b670ece6f3785f051c707cc98afc4d843a262b9761fc9cc68fdf1f1ac8df1eb8 SHA512 c762a1aa27dfb30e2f6da67d1ad16da03d301b2e3cce33c83b69103183a6689a494c8cf8d7d4e26ad5b22130e4e0560d5f3ef6f44b14d706f10e2300ce11ff3b
-EBUILD libowfat-0.31-r1.ebuild 994 BLAKE2B e93ab5d7746de5c071b55a8dee7d2415f64f623aa98c543cdebc0a6007dff1b6eb362197f5143e7ec2f0ff97ff07e46d6298afe255af0a9ad2d2e5db1d626ab0 SHA512 070b2af23d5f88a2295c34674f86af39c68ca88480ca5882f79bc4c9a4b75f3a6f7a99ddc4deb85e4d3d20f8ae7dd04c336aced617eee63417f128378b1d05fc
+EBUILD libowfat-0.31-r1.ebuild 990 BLAKE2B a9f8efca4c9eb61726390339a7caac4ffe8f2ffa65e3e7bc7886fa1ea8e526ca41e04ce7e8647ba0f6eb99a3d3ad609c72b29455e3fcf253f2727ddd3f5cec71 SHA512 42ecb020a438fe3fee377d1c3aef631c991a2985b840da07532e9abdd9fba46ecf3bc9127a8a6436611e5e399cdcb815bc6f9a5e7f190048003f3e632d57dc92
 EBUILD libowfat-0.32-r1.ebuild 1039 BLAKE2B 534907ee194eff327e07f903df0f5dc5728572b013fca29e583aa3df3e852db91c3145f2f2d604b0017963d8423a0c946c2eaeff93da0785f486da939e055047 SHA512 71e1d1a579943fe2b1d53c22ed23c579745ab3d4d058033d7a789563ac0ead400039232472a116ae9abb7ee83df3421d7a43dadbca187567bd8fdac2157b3e86
 MISC metadata.xml 430 BLAKE2B 16b95e09cd79b1b22a0b391fbd70b3ef51b08dd5d92449613f21e8e1ac85f16fdb5e0bde3a298aa7b2c740439c909836a3a71dc55022a1322746f2078522ed78 SHA512 83ef95906f9aa9e0a88eb9241dd1245cd6628a24acc06fc99d97028ef9d82e4369fbed5643d88d51ae514dedf70dde032443a1523d335ea0fb1f96cdd9149a79
diff --git a/dev-libs/libowfat/libowfat-0.31-r1.ebuild b/dev-libs/libowfat/libowfat-0.31-r1.ebuild
index 9bd8cf6f80af..409b88fc630f 100644
--- a/dev-libs/libowfat/libowfat-0.31-r1.ebuild
+++ b/dev-libs/libowfat/libowfat-0.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ src_compile() {
 		$( use diet || echo 'DIET=' )
 }
 
-src_install () {
+src_install() {
 	emake \
 		DESTDIR="${D}" \
 		LIBDIR="/usr/$(get_libdir)" \
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 5ba487f1f684..711d948e74c8 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -3,7 +3,7 @@ DIST libpcre2-10.34-patchset-01.tar.xz 1208 BLAKE2B 615b7eff085bd52bb3aed30c90ec
 DIST pcre2-10.32.tar.bz2 1641814 BLAKE2B fdd512312547ae90b36b6c9eb86b6fcfea9b03fcfd9766063c901819c6bf7536e1f3da89bd69ae62309069bc07c705e96e81f4a36355bf934c566f343e3104e4 SHA512 3d712e7d6afbaef227952680ded69fadbdec0b1abdfcac17cf071415c3c93edd152d6d268dec80570aedf24f82ba954f74f5f9e62c9b9991be75080a3d6ab5fe
 DIST pcre2-10.33.tar.bz2 1690739 BLAKE2B e59cf47a5068b2ec2d647d6dfe1cb5f8d6cdcc6fc6b47aa65a4c3d5aae256e7f0b090487d372c62aa7ec7f15a1f037650088b53385fc2fe31aa405878855e5d5 SHA512 c6aa52cdbb0c906b02e9a9f255697a1b9b99d9c7dccdaa484ffdb04fe3582d232ba3cb3c421d6df589a387b415dedb0817f58ec5391488b25b4e7bd9da6bab8f
 DIST pcre2-10.34.tar.bz2 1714731 BLAKE2B f731339b3acdb084ddb1462cf4638edefbfc4a95e63e44c8c75ded55fd9b98334336dbda5f31bd8e9410e63ccd83dc7e707cc20f03df4d801f182ff4939b6cc6 SHA512 77ad75f8b0b8bbfc2f57932596151bca25b06bd621e0f047e476f38cd127f43e2052460b95c281a7e874aad2b7fd86c8f3413f4a323abb74b9440a42d0ee9524
-EBUILD libpcre2-10.32.ebuild 2338 BLAKE2B 3d66daf8021431e69d18e335690bd3395463ea55baea1b0ec4955c581fa464f00b57b35a29b063f8c0200b94982a973dec002dcd398ccdb38257054c5dac2a1c SHA512 abd92a1fadae4a2bfa591fd2e8913bf4b78313123d88a6415d64a29456c3de5728f96c0ffe5d078a148078b548a633cddd40e46c17c4f580523b410848247eae
-EBUILD libpcre2-10.33-r1.ebuild 2512 BLAKE2B 903f5339eb63392d4db24896519f10d23efd31d5e20b1526b2ec96a7528a01b59443aeb930ecf65b4aa11b1a4f07c8427a757f47945a5fe58108cbf6dc5acf9a SHA512 3060b2e6e0f242090ca047af35b73b9bf1a0c6e320735c926ed3996d56a3fb713825c00ecd289180e996d64c0e3613935d10c563c8b8454cafff5210ba16de27
-EBUILD libpcre2-10.34.ebuild 2596 BLAKE2B 6991aa2b8ce4b55a4ff30f2f1d8524ed920c4a457d347bf924b6049b5fddc48383364c5b08316f6aa3612606f8f62c161d073f4bba219f720e809159202a7c0b SHA512 0f45498bb09c8675acdf671bb1da9973ebd75014109b48e01422bcc8fa062a5fe676ac23c3a690b722ca61a45accc63e7fb76f48d9fc3992b9f7c05b5c25207f
+EBUILD libpcre2-10.32.ebuild 2288 BLAKE2B 4d1bfcfdf20c8f4a5f208b8481d6a6796491bd6302fee4f1d2c1bf664d18c8bdd2305cccd2d477738dbc71ab42a9135d92829a7ceedcc8464fa5171c4a58077f SHA512 1fadc74c43e841251965196fc9f32d0cfb2bbcb954c428ea8cf5f042c4e509ca9ced96271e165127d82d3571b6e18b8cb3f93ab452da687a118d92f29e43f247
+EBUILD libpcre2-10.33-r1.ebuild 2462 BLAKE2B 328853f417d7e974677e37835a4912c8443b7ce2b2694b26ab5dfc7880bdf3215cb27e3f8d875e749f000363d7bfa002d39ec34544e552e74908bc33d6fb662e SHA512 42dc3e51dbe1096ea5ad2a9e06f97079ed8a7b3bef26e7529f96d04e0b1c89e76b28b2579aed5bb0a1ed682435bb2e583f139a40bdb41e44120acb72b616abff
+EBUILD libpcre2-10.34.ebuild 2546 BLAKE2B 045076fce441ea2eb31fe2a1cfd6b1e4e0835bc8cd0a688e95567502dc0d409f63162ddc7e4ec9be775fc481f1992ef44aee3c7191bdf6db0aaaceb14ede90ca SHA512 2199f9c65cf5581ffcf41f358d79f6facda74c1ee15233a6e40c79e83ba65540dd63f40a8430b0a59facf8def143972f437eb8a501f52e87f5fdad1911567a2d
 MISC metadata.xml 1140 BLAKE2B 19f0ea04c9613f0c804c76ca74012fa2313ba69b57fe95f31720809a12d5244f78e4ce9c957723b848f0d8c3514ef27fd875f7814d2434c7e50dbcc7325c0a95 SHA512 9b54ed8cdf78e1d3fe737460117cb840280b63c196cca0bfc7b89975ea8102f9729cf5f29628f5cb7b7c1eefd8fd5c67f3c7f5fab64f9d168d6fcdedbd926b51
diff --git a/dev-libs/libpcre2/libpcre2-10.32.ebuild b/dev-libs/libpcre2/libpcre2-10.32.ebuild
index ecbe29ffaa04..9b45a0539d30 100644
--- a/dev-libs/libpcre2/libpcre2-10.32.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.32.ebuild
@@ -46,7 +46,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)
diff --git a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
index 5dc625424a06..e8f61f2b3516 100644
--- a/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.33-r1.ebuild
@@ -51,7 +51,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)
diff --git a/dev-libs/libpcre2/libpcre2-10.34.ebuild b/dev-libs/libpcre2/libpcre2-10.34.ebuild
index 91c82fa3b0a2..c04bb5531392 100644
--- a/dev-libs/libpcre2/libpcre2-10.34.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.34.ebuild
@@ -59,7 +59,6 @@ multilib_src_configure() {
 	local myeconfargs=(
 		--enable-pcre2-8
 		--enable-shared
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
 		--with-match-limit-depth=$(usex recursion-limit 8192 MATCH_LIMIT)
 		$(multilib_native_use_enable bzip2 pcre2grep-libbz2)
 		$(multilib_native_use_enable libedit pcre2test-libedit)
diff --git a/dev-libs/libpipeline/Manifest b/dev-libs/libpipeline/Manifest
index b94ce2a9d61a..9fdabf361ee2 100644
--- a/dev-libs/libpipeline/Manifest
+++ b/dev-libs/libpipeline/Manifest
@@ -5,5 +5,5 @@ DIST libpipeline-1.5.1.tar.gz 987822 BLAKE2B 672da75a22aebf28e953a9a399d641bae8f
 DIST libpipeline-1.5.2.tar.gz 994071 BLAKE2B 997c13bdf632f2be161576e1b21d1be26ea29dc770ab74e4b105f21c926b8ae5e07a605b72ec56f55a55db3a3c1d487cfe64d571363e040612ea52b445f0bc3e SHA512 721024cea4e8dd85ba31af23e6f65b6ab2323e4006a769674d18101744a5a990aa9ee9fcd9b35360fa1442a6d4a72bfed0227665d4eacba541808b1c48bc9a53
 EBUILD libpipeline-1.4.2.ebuild 681 BLAKE2B 28546d03f7a93fed012ea1a4bd2734f0e8c1a1f88d67a71d6b729d493013c4cc21245f83f34f2670ebce4e01998cd382f07446b41bb0a27ffbb8caed45d9ae04 SHA512 9c604baa679b254e001b4846777411c753a1cc74e90c8fe491a7a7a7ad2b3f63211d678bcb3e78f2dfd0c48363e841cb36508f12b6facb09f23452813df8111d
 EBUILD libpipeline-1.5.1.ebuild 666 BLAKE2B dc816140ab676a875944fe36051d9b02e1b8c7815392b44c5ac1a7caebabba1e38cde6e0482138c0f93ee16944cbb3085770103c73705c8c55ca931d1691b938 SHA512 dccc099da343be2639cb409c5bba5ce1a920092a7e44fdd302ec0202b910e077d8a221fe4806199431ab108befc2d140798fcc2424d297530fdd8c73052fc4b1
-EBUILD libpipeline-1.5.2.ebuild 683 BLAKE2B 1821048d7a209acd10e0f14449d3d0769d54691164a6a750ba327e899dc84df3df34ef63ce632e8b4f93760083a168b5d8da9fbc613bba0c19d8fe8cb183c1d7 SHA512 9d1bc1a889109b68908dcb21880b60da4c7e6e9f87747e29d1172e8775425f5c3be5f1ac58c540dc0aea721bf739733ade9ca8f2c10556d064aa20d0af598928
+EBUILD libpipeline-1.5.2.ebuild 677 BLAKE2B 90fb089e73870426df4a6475a95100edae0fb1785fc9d92ad5ef7e42b7545043039bf3ff71437d1e00a2bea1adb5b1f3be7877b0693c2c3f9ef3dd6bc6f72762 SHA512 eef7b26799a7c87bda4e3b3055c1a405f5ab5b339f86dddcdb5ec6e03961d26711876447844ffcdc0e100313aea3826ae04570d8a4b2f294aff07a241e01b9f9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
index 23c2772e42ce..525581405930 100644
--- a/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
+++ b/dev-libs/libpipeline/libpipeline-1.5.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/libpqxx/Manifest b/dev-libs/libpqxx/Manifest
index 99d481e19a4e..d59560b0ccf5 100644
--- a/dev-libs/libpqxx/Manifest
+++ b/dev-libs/libpqxx/Manifest
@@ -1,3 +1,3 @@
 DIST libpqxx-6.4.5.tar.gz 715081 BLAKE2B 4f1356dc5fc9baddd8fdea6095541f4d90657ef0211edec7796ddd3693933b8d37d5bb14e19249a2e4627b85aef11c582b0ffac0226c8e99a70af1d2b0396e5c SHA512 b6f79c4af93876eaf859626c2deae3b23bd4fa1a438390bc01513ccc48b90565d59588f6977e7475bb7b8dbeb8b1c8ef2a4737d8eb4d15682531fbf78590ed5e
-EBUILD libpqxx-6.4.5.ebuild 2160 BLAKE2B 65ae066fe1eaccb812a311e11c0271d83f4fab08a3263959837b5e972b65d21fc7bbc66c8a398f5bfd1fe9feef5dd7429ac7105e7581dc2627d49abb2501f547 SHA512 c639c9af5b2536aa531e486378def308cef49b4ccd4c1b75f132bdc244ab8bbe37f23241df5082e0f1540186da2139350311b3a01a5ad1ea82fcf42e7e0da49a
+EBUILD libpqxx-6.4.5.ebuild 2159 BLAKE2B 736ecb513d8d2716a0afa4fb60d25810cf86464f55ada3fbb234205352502f1625ee13bf1c7c6b2112554fcef9fbc6498297ea2433fa1779497fe82cbcb0ea32 SHA512 5ac18b50f6a8f329ed97da21685092ae5dec66ce0b8129a8d4496864d8447dbe70d507e6780943b7628db3e041f4ed2cc55ced699596a426eb386f19881ce6ca
 MISC metadata.xml 597 BLAKE2B 2371e4c701506d5e8b4eb0938325a6cd909ad874badbc000a7ea831d2e7ff55cf1b6f4fbb3ae09f9392850319f9cbbbde083492a20cf1209e94139f7b1ceb927 SHA512 c732dc922e3ac9e63a373dbe8b53ef8fb93d87c7cd91a1db1b94e89fe33f3109b818cf0730df36b00f2abf1dc554e1bf261f39db807cf61775b8177db231d37f
diff --git a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
index ec7eeb15d713..73e7e07f579a 100644
--- a/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
+++ b/dev-libs/libpqxx/libpqxx-6.4.5.ebuild
@@ -76,7 +76,7 @@ src_test() {
 	fi
 }
 
-src_install () {
+src_install() {
 	use doc && HTML_DOCS=( doc/html/. )
 	default
 
diff --git a/dev-libs/libsigsegv/Manifest b/dev-libs/libsigsegv/Manifest
index 934c755fba15..ee001f8f6aad 100644
--- a/dev-libs/libsigsegv/Manifest
+++ b/dev-libs/libsigsegv/Manifest
@@ -1,7 +1,7 @@
 AUX libsigsegv-2.12-skip-stackoverflow-tests.patch 461 BLAKE2B 021932c6eeb8a4a3a538a7a2d9c04e777aa49bdff15db9439f4cf835a42f2c7cafe6d560ca4c957a0d57cdb00b3b3f68432ff8528ede15927874a62c6b64e027 SHA512 9bf6ff64bff1dd8550b97bbcabb7ccae24bae7af200dde7c296a237c4c149cb78e42bc7fcad3c76554ceb550ab39ce65134b53ad1e521dc6229f0141ab047cdf
 DIST libsigsegv-2.11.tar.gz 448744 BLAKE2B 3fdf79efd9ce392887e1b133d5ea54637587411c3654b9cc4ae55b8cdfd05d41e56e76596edea7ee3dd09feb865dae56a67d2312033b07b491fbaca291fd1fe4 SHA512 6d60bbaa704b86c12a32a6b0eadd30fa7736d0e0ff8a1c45af1b15b7b7d4524f39902fe3f7f47a100bc2586e32aa25bb575e3d859d9ccb5fd7e99ba4e62f7b02
 DIST libsigsegv-2.12.tar.gz 451408 BLAKE2B 3f2f37965dfdd5f8a7db3d5baff975003200e7ab157498524f8c99c60c285a5a8a1cf978ff3a69977d52604dc44493ac6d6d00476fca3380b285282b35873f99 SHA512 27986e8aaf4357ed131032aa7c281a5a28c5759530c62bb76f034aea33959547dcaae805e06347a1f532f0488b72fbbbdac4400f74e8d3f2128511526e8a5913
-EBUILD libsigsegv-2.11.ebuild 786 BLAKE2B 43961bb2a91939f01bd6df9670a3960ab9c6ae3caab506c0151c5bb2b2df657cbcbacca6357d73e3dc9ed3417cef138698fc7ebecf3ef3ac7ed35be494194fd8 SHA512 784bb994d8cfec08e6d62d40b5f1ac63758ccd57618f272d4634a0a03cedd2e1acf6f8d36fa06b66934816c278b4205f061e64707878120c749e4ac30396c620
-EBUILD libsigsegv-2.12-r1.ebuild 774 BLAKE2B ebc73e8a8fa3d966677119a8a5b0f7bd202e067a48cb08a10baa07f959719ea0e4b3d397314def5987aeb80350b97fa3abd2e97ec15e5717d422e51f836149c3 SHA512 0f11ebca2105578aa455b86ce124dbae54b5a6083d8929de70e3e498492322c54f10a2d523050c8fcd50b7454df090662ba332bdb64e3c3273296d6ff3d57dcf
-EBUILD libsigsegv-2.12.ebuild 787 BLAKE2B 89c066f58afd48d58499a673ec486efd101cfcc7c0fc9cc42ffe2159352e8e07c9a07748af8df9c290bf7436ebb21361fdad274b84c160f8ae929ee3b80fec8e SHA512 3b13bf2003ebbb743d8d87150174b56934152129db0f6b56f6f65560832268efa7bd1b8cfe8b88e019a636eef5ea1324ced1b82eddee32aecee385ec37f1a1a3
+EBUILD libsigsegv-2.11.ebuild 784 BLAKE2B 73b884cd749f6832fbc999eaa20a825aa7750fda60364ef87ab4618c59e98491fc99526c114a66d2bc68c98a228493f463119277d0455587c45244e559f870d3 SHA512 60f159536743c85c33b5bcf33cfb4d4fa88f6a62eadf5005dd421308e1a2f1e0034c577fcea0b122d5046bac5eda0fe89beb5f654a4888fb1a9d935e39d5db1e
+EBUILD libsigsegv-2.12-r1.ebuild 772 BLAKE2B 8ab8381feee9de878f285718d38db70896310395cb7a8e0b96c255369c9d85ee7ad60fc220fdd5a3b46f7b126e66c7126dd8c3cc179b814a739ed75d205a4fd4 SHA512 1bbf762f7bcb4ac83e168b2b654528a37d4d0f405bf93e188980fadcc78770d1c5c84e49eac6414fb887cd6ac3a2200fe0fa0370ab920e3f90dfee4e21da9f4d
+EBUILD libsigsegv-2.12.ebuild 785 BLAKE2B 350dfe17111e1e8c8afa6c9deaaea970ce1ea769a3c6591483c2388cda2769866d1cb2e479d0bdb353c278d199564a99bb542b3b6cd03c1b8fdc8ca1e139d206 SHA512 b0103e0c0c0a5a5878a4f6dec3d8aaf04d11e96c67ebc42af9fee2bab9cbdbe2b732cb05ee08be6af95d537804f397fcca0b96a089a109b4717ef665fad7ebba
 MISC metadata.xml 811 BLAKE2B 648cadc6a317684a62fcdeceb885b3bb153841d57928e19a84ee20a0c0dbd8626343fecb6cf2367ef195cab26b9909c6c129a4a2afc999353300b48911317711 SHA512 7f985e3e2e50e351fc14e4932f30ceab0989346183ba87c0dd16a3dc874dd0e5534984e4bcc327dc1a4c0d15e78c89aeb8491b5a8c8789b6ae42dfdb89c18fb2
diff --git a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
index 4cb02dd461be..aff78bfa71f7 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.11.ebuild
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-src_configure () {
+src_configure() {
 	econf --enable-shared
 }
 
-src_test () {
+src_test() {
 	if [[ ${FEATURES} = *sandbox* ]] ; then
 		# skip tests as they will fail
 		ewarn "Skipped tests. Please disable sandbox to run tests."
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
index cf4a6bd2bccb..b96708a8c486 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12-r1.ebuild
@@ -24,11 +24,11 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure () {
+src_configure() {
 	econf --enable-shared
 }
 
-src_test () {
+src_test() {
 	emake check
 }
 
diff --git a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
index daab877388a4..7087b3ad69e4 100644
--- a/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
+++ b/dev-libs/libsigsegv/libsigsegv-2.12.ebuild
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
-src_configure () {
+src_configure() {
 	econf --enable-shared
 }
 
-src_test () {
+src_test() {
 	if [[ ${FEATURES} = *sandbox* ]] ; then
 		# skip tests as they will fail
 		ewarn "Skipped tests. Please disable sandbox to run tests."
diff --git a/dev-libs/libstroke/Manifest b/dev-libs/libstroke/Manifest
index 5a35c428d991..a4ae04049f1a 100644
--- a/dev-libs/libstroke/Manifest
+++ b/dev-libs/libstroke/Manifest
@@ -2,5 +2,5 @@ AUX libstroke-0.5.1-autotools.patch 734 BLAKE2B 3590484c7a4b96b7faa09eb7e2267365
 AUX libstroke-0.5.1-m4_syntax.patch 1100 BLAKE2B c86fed17159d3179bbb538c1c467fa5a34133b6a43d30f2e2862158e0756ea8ca8654ca6f450219c9222cc3612fefddf6170922f410a9c1119f48439acf5daff SHA512 bfe54a1c60c381e01820f46998c1ade66bcc5b816d20d8736334cd097f94fd06921c7ef17ae42e1f4f47090a7a9a6db2121a9960c140ad7dcb4d5ac3acf6fded
 AUX libstroke-0.5.1-no_gtk1.patch 1046 BLAKE2B feaaa0206f74bc1206ed464ec3f29c76e2f51c83f78c6821d2184b833e1718638b11757ab3f8cef9464884dc11a3158fccb9f1f9fd166f50ee83f556b447b25d SHA512 96004186c51e617fa53f1bbaef5f58c6572c5acf0a6acf2d9e7be618c443fccff5feb8dd7bf77a9a435b8c5b334e1babb3cbd739e71ec6d7fe7feda1c66607f8
 DIST libstroke-0.5.1.tar.gz 174270 BLAKE2B ce642aff20f731ed8dc6aedfcdca0370e4e9789bdf1fd7d4157745ea7375d5e5f9c7a2f00739d886ff348c00ada36c3bef0ce68f18d9b0dd52eabcc086776334 SHA512 03431d4cd39174aadb6cfd00a1c487d34ae9cf4b1db9e9d01d563f2a661f01979f474b87099fd2bfb0e54653416a1b9dea988367674a3cc6134e16b62810a0c7
-EBUILD libstroke-0.5.1-r1.ebuild 702 BLAKE2B fd515dc0eb10413c2d5662fc812fb99c0ecd8beaaa598785745ffeab70f22b1332126464e47a22477983a9ca50b9fbb5aec4ea4dc52b88ac7a48cc142365cf60 SHA512 202fc790217450c2088c88499200dd307e0f026d7370ef785b3dedb8b3d890dda6eaaf809e8bff36e01f1ec89bfb9a58e4255efa5cbb314a7e978cca7d4587bf
+EBUILD libstroke-0.5.1-r1.ebuild 701 BLAKE2B 0dfba06740020bf8edb38ea4bc57d2dd21281854ac5f0624f1ee56dd0dddf69dedd7ac2f963d935e48acee7730736674c552114995ef93f3d2fae84cf75a7e08 SHA512 1c0dcf56d5b6ab63524db303c8b4cf1ba84dcfa5f2b0ae416546c4503ab70c304bee72423041c6436cfcbf0ec090fa1a150b942925b7714644209f584b5a8c30
 MISC metadata.xml 261 BLAKE2B ed5cc49462c9e948e13f3455fbf209661aa04522f3753db7c674bca0528d7a384beefcbdfc5fcc0542dd08361d7953c06cbd19753bfe4dca2ff649ebc283bbd7 SHA512 318bd063baaa5dd560bcfdb87ab4d60edfb4dddf69884a84ef084a38399cf2ba84e69b432c816cce8e15d3dea253f395f41a1a654017a6eef30478ab8961cb51
diff --git a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
index a1c0f4c691a6..05b7e5912ad9 100644
--- a/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
+++ b/dev-libs/libstroke/libstroke-0.5.1-r1.ebuild
@@ -26,7 +26,7 @@ src_prepare() {
 	eautoreconf
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 	dodoc CREDITS ChangeLog README
 }
diff --git a/dev-libs/libtommath/Manifest b/dev-libs/libtommath/Manifest
index 8e4358955100..5b17de275e2f 100644
--- a/dev-libs/libtommath/Manifest
+++ b/dev-libs/libtommath/Manifest
@@ -1,3 +1,3 @@
 DIST ltm-1.1.0.tar.xz 2125456 BLAKE2B 3aca7993704341f6a81e7fbef35389ac8ecd957dd78b5d576f0305d37493c3ddc32462cd787de2fb67d8e165417b18fcfde70accf991cd9433ff87591d8265ac SHA512 6d1b8b09d5b975a2b84ef6ab9cb1cc63db2f0503a906e499cb9d7eaba3f487be6e7f69bf692b188f888418c61ea563aa7e2411638d8979eac426b3d603ad1b91
-EBUILD libtommath-1.1.0.ebuild 1515 BLAKE2B 6ca2a936307cada9e4ad3649de622e34a6cfe2511a9800a99eaf1af0f9e9cb155791f5d456361f0013be3cd489c88ee9114ef8af20919339115cbf6fc7c09aac SHA512 7bb5ddf0fd62f6ffbc94ce0718cbedd7528beadcdfdb8e7e137b05edcc54cf334e9ecec15f7193d29c3c83582f2d20bbd21963447d7325e1c7d599f42d965533
+EBUILD libtommath-1.1.0.ebuild 1513 BLAKE2B 1039316aabae65bb1e3b99cf9690f484f9a5927dc7684777982dbed51a8e05be59e121d926c5d856685e65ce8f52c2d1d451d5a2d1f813e744413924a97ce55f SHA512 e4cc81823f747ee5840a2ec37f9015fbe19c991d6031e01e200594b57ad7fe8ee7b494d9f22b21b2d22e503b91aa6f634aa5ea4f1cd9566383027d0e11af348a
 MISC metadata.xml 2967 BLAKE2B 8adab466c3bf4d4e4b2368e56c7cf35c6a0e03f0dc9a237070e56bc224333876accb0c229d520f863041c0ee48b380225121d47554bb5aa511ff5689dd0e4e9b SHA512 73ce667c4bd2943f848274ee3952961d8b09c2c1faa4920cb74f9d8630470119c7e55a112b3c7dc2243c3746f75fa15db5c143e05e6739d2c9c19536f09a937f
diff --git a/dev-libs/libtommath/libtommath-1.1.0.ebuild b/dev-libs/libtommath/libtommath-1.1.0.ebuild
index 25a050e6fec6..a8999f221b1d 100644
--- a/dev-libs/libtommath/libtommath-1.1.0.ebuild
+++ b/dev-libs/libtommath/libtommath-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libtom/libtommath/releases/download/v${PV}/ltm-${PV}
 
 LICENSE="WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc examples static-libs"
 
 src_prepare() {
diff --git a/dev-libs/libtpms/Manifest b/dev-libs/libtpms/Manifest
index dfe08e2b6f67..f7e44913d30c 100644
--- a/dev-libs/libtpms/Manifest
+++ b/dev-libs/libtpms/Manifest
@@ -1,3 +1,3 @@
 DIST libtpms-0.7.0.tar.gz 1203837 BLAKE2B ca5a3b78dc63c09c4ff084124838fedeb5be0580f709ad6165680159ba7ba4b1f751b9fbc67f6b5a8f39b82bdd420afb47087412a47b72cbe5b418a97a4860fe SHA512 92d1eb5d1a1cae08e97cceaca56fc9bc6d43c54a93edae2accf19807a4e93e19d88064a0b11db796c79d32c821e6b320ebbacb65cd20da3e5b1205f3b861cef2
-EBUILD libtpms-0.7.0.ebuild 526 BLAKE2B 8b2733898a602de83f3c5fba8c036776cf861d0499017c3ce159c6b81ab70e5c28c897ede2256136f0e189b2195c2c127020459a80f26399748bbab5f612bc57 SHA512 97930480883c9b12f459df78854e3e89e21225169d9d4c0c594f3bf2f3aa8d25e9c0712b93420f90594604f9a481032d510544eb2c6d08e513a2386870fbad4c
+EBUILD libtpms-0.7.0-r1.ebuild 663 BLAKE2B fede09b0b2dc21512c6b36c29764d38d3171887ff58ca893c52f21c7ae8734c598ba0e6b12f550becc154a59181d86f86c9207c40accfa56f9cbd971140364e8 SHA512 653431c4728c6efa1f0e0449f2ae41b5791806afc00e8f53e31b0460b4fc947498c245d928c30705c2b2911206dfa06da4877b425a4561fbbcd602051cd0d398
 MISC metadata.xml 370 BLAKE2B eb4d1a4a8e56cbdcb5b7f86029feb6e2151967f7b4801fbb3a8c2de35840969a4987ca2aada95792cb35ab03702715b1f66fe966c176969de743c64775bed0cb SHA512 5a2f5a0089bb0c54dd36821005a65cbe8c4fd05f1d7e0367eaff02031a39c749e005e5432da334081304af8c55b330b549821819455f1f0919d4525a254ca5c6
diff --git a/dev-libs/libtpms/libtpms-0.7.0.ebuild b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
index ea28c3dd94fe..b13d07d50237 100644
--- a/dev-libs/libtpms/libtpms-0.7.0.ebuild
+++ b/dev-libs/libtpms/libtpms-0.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,10 @@ SRC_URI="https://github.com/stefanberger/libtpms/archive/v${PV}.tar.gz -> ${P}.t
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="libressl"
 
-DEPEND="dev-libs/openssl:0="
+DEPEND=" !libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
@@ -25,3 +27,8 @@ src_configure() {
 	  --with-openssl \
 	  --with-tpm2
 }
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/libuev/Manifest b/dev-libs/libuev/Manifest
index fee0139e27be..b58224dca997 100644
--- a/dev-libs/libuev/Manifest
+++ b/dev-libs/libuev/Manifest
@@ -1,9 +1,7 @@
-DIST libuev-2.1.0.tar.xz 247388 BLAKE2B e2934fb79e32bf61e22a7c8fcdd6371f089c5e8a4f5b3039c10c90abd852d08c5612f7b871ef705afdca68857a270dfd133a1436cd9f49876e0bf47b903e6328 SHA512 82bd68c75f015284d3757886720d1a0e5689cf71b40b896410e5e4e952761fe05b090a33e0787f632afa7726567667e4dbbbc6270129828656953ded6d28d02b
-DIST libuev-2.1.2.tar.xz 248092 BLAKE2B 7229acc6ae0e55a5ceba00e970a9e7b4b11049dc4f4435643e0541a7b3c75ac300ffc2839da0eaa7b3819a5910d20b608247812d32c028ff19c0cf3735d2941c SHA512 65a35f1e2cda5383267ba47bc90e2cdd769e5fb1318c11969c8f44262d8a5b2edad522688619aa6e9219c278286ba9ff997967f9281aa4f667fbe9b0842bf0ee
 DIST libuev-2.2.0.tar.xz 245680 BLAKE2B 40d0912dcec56d58863411e034c6ddded3470bc2ea3a9f49d36fa0ef924e9ff206cb96ef93582134881ce8377938688d44cfa04d7e533321baf7cfd754f0dff0 SHA512 700c91100c61af2101a6d1756eed97aaf51d6b1dc3a59f90f668d8bb6e3d817aa6f765af5acbbdaeccd4382a97c8e99d2a13ad679fc8582891e0546baa6f001f
 DIST libuev-2.3.0.tar.xz 247932 BLAKE2B dea136cbd34788b7156a5ce1b8390467fde77a21b6fb4c7b27068b87254eb42034579bcaed3228dcfacd00b320668db915557230ebbb8da9487ade2359a5fabe SHA512 dc6cd2d1df5336027d8df77fda17b9d9521d955ffa013a5e83958d6b4f981f14f5b0caac3e68e4fa4a8a00bbe8001a18de54ebc441b4231a2d17600c762f80d2
-EBUILD libuev-2.1.0.ebuild 534 BLAKE2B 4150427bd0e11f554676c94e81e83133558c64295861e0d0ad126f4800f7546e86aa24709754aee3d766d6228f9aac25990a9d5c572c6d507ae57d820b198a5e SHA512 da87d2ddac8efd98e103319718bc62e4737b2c8609df22b8f7064ccc66ddd10d003f7aee299c8a898658f4ce22a0e8feaaae1d1e220c0a0d59b710a2ae32e286
-EBUILD libuev-2.1.2.ebuild 534 BLAKE2B a87a2d9f2abc15dfbc0aa0f9e118fbf4b7c43f622d410aace856d9b9983b3a7574656add4335904526974cc0f96423fd95eae42f5d00e3d3e084e8a93bccc3f4 SHA512 b1e88c77b5c4a352f78c9b8e9f7835570df86e63e7e5dd5ae3550da7122395a97bdf0004bba8c7e0938a541f6c8d8b7a55d642d137d7f92889007560a3ced797
-EBUILD libuev-2.2.0.ebuild 541 BLAKE2B 217a18faa003337f8ec1e7cd92859a614d0764f52272f7b8690af10b83f71aee097b835e4b2249b55617ba80c0ceb99370c0606eec23a16158ccc5ec02a85437 SHA512 6cab65a348a30b3b2e1413e40551be6957320fa85fbe039d314072d2ab3a2f714a49907c57f42b1f7f34bef1af3dfabd069a412b0bbd2ce3e0778ee104d67f0c
-EBUILD libuev-2.3.0.ebuild 531 BLAKE2B 9c2416bdc1c33010cce85f05c38909d2d6cedbb850aac11ffd9d00c5481961d3f23eeaa68f48130dd8a8f04f8d56a4350bca6ca89b66df857ecbffb3a1521934 SHA512 70f22a65ced336d528fa421fb3bfaed1e6388f7f333b9ff3eda1a2012b765e5371b72264875e5fb93ab195619fc818533205d226ca22e59fe046a09c1f1b2aca
+DIST libuev-2.3.1.tar.xz 247596 BLAKE2B b2d6a7034aa27a80c17438e4329cba59bc4f047b2879662f9900e886f13a948f2c507732d5c5a4abbb130e42af9ba8a935724d1542f3c929a60198889ac7cce9 SHA512 bd463604a89f5bd3e749375f450b376ed1d57b1195b69a5bcfd247fe92c4d42d245bbce9a7950f5aa5a13ce75abeeee028073b7d4356b7770d8821aa501113a9
+EBUILD libuev-2.2.0.ebuild 543 BLAKE2B b63dd3875a0e0f905ac84104f376dd4d3a2770f9a7cef94a99ed2585355a48c7aec38045dca593ab9be767a33ed77bac595200cd946a5a16b3bf21f707871094 SHA512 d0395069771ca607246ffdd995fa45080f20dfdf1012a27296354b254d9d7bb16cb7b469d2e1ad5b7412fff61848985016eddde3bbe6e0eeec2895ed01c21f32
+EBUILD libuev-2.3.0.ebuild 533 BLAKE2B d65f03a5fcb2abd1038257e0473d47877c96e0a5000a1f2e422f6db8fbd8bbf9f3afcbf2eee3b68581a7a348b1ba6215265c6f21bbd5ece68d50761e104758b4 SHA512 aa6855e9e93ec7b9c9215e2a997d6d72cee1aa82edb454c1f4e57b098f2134a5f68d69a38183ee3dbabd5ec92490abe1dee21c5fea2b0b465c7b1807fcb60254
+EBUILD libuev-2.3.1.ebuild 533 BLAKE2B d65f03a5fcb2abd1038257e0473d47877c96e0a5000a1f2e422f6db8fbd8bbf9f3afcbf2eee3b68581a7a348b1ba6215265c6f21bbd5ece68d50761e104758b4 SHA512 aa6855e9e93ec7b9c9215e2a997d6d72cee1aa82edb454c1f4e57b098f2134a5f68d69a38183ee3dbabd5ec92490abe1dee21c5fea2b0b465c7b1807fcb60254
 MISC metadata.xml 697 BLAKE2B dcba433b09e4af6c7a3e849ec4b084545f84d08faa409b7408ae95d3f2922632f08237b6c51e1274a09299b0b09cb2031d809a8f5957f75206573695e7a9b11e SHA512 5250db4faa8c97ffb7b2a7df81b1afd4300358e2f223e1dcb15e461521c816abb09aac8c333315e506c325464ea404a4651009ce2f82b7a1270cbb35020cd4ff
diff --git a/dev-libs/libuev/libuev-2.2.0.ebuild b/dev-libs/libuev/libuev-2.2.0.ebuild
index aab6a4daf462..b5c9b2d941bd 100644
--- a/dev-libs/libuev/libuev-2.2.0.ebuild
+++ b/dev-libs/libuev/libuev-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,11 +13,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-src_configure(){
+src_configure() {
 	econf --enable-static=$(usex static-libs)
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
diff --git a/dev-libs/libuev/libuev-2.3.0.ebuild b/dev-libs/libuev/libuev-2.3.0.ebuild
index 2980b3bbb0e2..c4a3bb57a119 100644
--- a/dev-libs/libuev/libuev-2.3.0.ebuild
+++ b/dev-libs/libuev/libuev-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-src_configure(){
+src_configure() {
 	econf --enable-static=$(usex static-libs)
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
diff --git a/dev-libs/libuev/libuev-2.1.2.ebuild b/dev-libs/libuev/libuev-2.3.1.ebuild
index e82786a75198..c4a3bb57a119 100644
--- a/dev-libs/libuev/libuev-2.1.2.ebuild
+++ b/dev-libs/libuev/libuev-2.3.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="A collection of useful BSD APIs"
 HOMEPAGE="https://github.com/troglobit/libuev"
@@ -12,11 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static-libs"
 
-src_configure(){
+src_configure() {
 	econf --enable-static=$(usex static-libs)
 }
 
-src_install(){
+src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die
 	rm "${D}/usr/share/doc/${PF}/LICENSE" || die
diff --git a/dev-libs/libvarlink/Manifest b/dev-libs/libvarlink/Manifest
index 822e29fb57ac..1b73c9a2e84c 100644
--- a/dev-libs/libvarlink/Manifest
+++ b/dev-libs/libvarlink/Manifest
@@ -1,3 +1,5 @@
 DIST libvarlink-16.tar.gz 56886 BLAKE2B 6c65199ced429eac733d1114cfad59c4514d299bd3bba0d4a9907498655545fd9edb9999428f39df936cd1e6710bacc08c04f05710e80f0ceb974b43809b9c22 SHA512 8152fc4fab4e9e829c2bc1585e479c23b0329c59da0be8712ff64dbbe01cde9630f228ac7edc06e9faa39dfd3d38007032ec6ed561e2363d4d33f65856f1a271
+DIST libvarlink-18.tar.gz 57708 BLAKE2B 035a3cad38d2429fa7a1bde049d6c5772ef10ef65040179839459d8672ef7fc619ff2a250ad48b108a9068c1f927226ad4ec08fa355b6c6f30a8ab8830422e9e SHA512 a0f2cfe6a3ce3e7c08b24436d4210691d6334ec903cb3d590627595ee3bda79bf4e22e7c72c7ea8ebe817e4e2b045f86d2603ae56b3fd7d429fd281fd7e5e2e8
 EBUILD libvarlink-16.ebuild 614 BLAKE2B 722d69431a69960ec702b12d2e517786f4f41c6451e8755a5c66cdcba63bc11dd1ae7ccfda4581afcf95af3ee5be5dc2d60fc24dd74a639dbeb3404a32ed86ce SHA512 9c4d527a1775c84c8d6acab718df04f497cc162d60aba0ea659b720aee81984b3f187d78c78512ca6c926ae8ad72320c7970d0632378662aadba8804798c6ed1
+EBUILD libvarlink-18.ebuild 614 BLAKE2B 1797a4622ae03f6a5907743ef3aa6d1330b933b2e941bb26b7cf9f904783a2a8ceba0a2a4bdd6af4b2cd2f3e3f3a30f916fc087e660b73a63f54137c591d241d SHA512 c80a0018ba7d21d5875cc3331d241b78c71c54de65c59837c49edb839304906d4d2862245f664d23120242c3b871757704ce5eeb5ec9f3e2f58aed977f423de1
 MISC metadata.xml 327 BLAKE2B 9b7695e2581a6bf4ee1b9906b19c8ad04b2b2db2c78a93cfd2def1bce4e7fd02c79bdf3123225acd3758fcfe660a71780542b2fd00109d38b171d085d3945260 SHA512 e1e61bf472281418c1e3f4a673decf0c2c82ef82630c3a7c06fab8f58721d3e0fb8fb8b634a37914d65e11d24173967f339b9383d93488ff44a39903478011ec
diff --git a/dev-libs/libvarlink/libvarlink-18.ebuild b/dev-libs/libvarlink/libvarlink-18.ebuild
new file mode 100644
index 000000000000..43b326cc7cc6
--- /dev/null
+++ b/dev-libs/libvarlink/libvarlink-18.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="C implementation of the Varlink protocol and command line tool"
+HOMEPAGE="https://github.com/varlink/libvarlink"
+SRC_URI="https://github.com/varlink/libvarlink/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+RDEPEND=""
+DEPEND="${RDEPEND}"
+BDEPEND="
+	>=dev-util/meson-0.47.0
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dtests="$(usex test true false)"
+	)
+	meson_src_configure
+}
diff --git a/dev-libs/libxdg-basedir/Manifest b/dev-libs/libxdg-basedir/Manifest
index bf989cd66d4d..0d884bd93fb1 100644
--- a/dev-libs/libxdg-basedir/Manifest
+++ b/dev-libs/libxdg-basedir/Manifest
@@ -1,4 +1,4 @@
 AUX libxdg-basedir-1.2.0-buffer-overflow.patch 898 BLAKE2B 24db3713a2a85901f0b7c0353bed955ca377e4fe1c84b02343e191945203db500722a0efe15a263885952a526eaa7121231054d27e4d86bb72c937f019d52f8c SHA512 265ded0f9fc7448021281eb48ed77977eb2f8f6275a18ba329dc9ad5a8c7e41585add4cb989af34e8f135a8545b1548763253204ab5905f78d90c9852546aa25
 DIST libxdg-basedir-1.2.0.tar.gz 30159 BLAKE2B cd9eacf6d32e0f27aa4a9092fb919f027fe77905cf8cad2f3d860d93f9784bbcf85336704fd9241d58769e48b2a8a7e4b4ed306ff32328f1ddc7cce7b014dc09 SHA512 8584405d45e0b57e570666b6eab6d99d70411d00f88965826c9ed0292372385668f190157a10ff536f3a5a59fd0031b332ecbb8a38ac64eda1b04a0603997406
-EBUILD libxdg-basedir-1.2.0-r1.ebuild 966 BLAKE2B b093464b19eab8cc0892f9471bdc8091aa8069e00069f260699f73079c36e3887e91bce79eb9d4e8626b3418010439bb6c9db3bb4fa2b92541be0993cee6d471 SHA512 6d809f91c4965f2cd55ce8e031f7782875bca12172f17192e522db6560ad511e7c6ff3cf2df04da4d724bf89490ec5649f5a9bdec720346ba017d27af6dac8e0
+EBUILD libxdg-basedir-1.2.0-r1.ebuild 932 BLAKE2B 4ddcf915507dacf3825fbacfb00a9382788b697428f96301ba9bd0a857407bce56b7a88fee9b8da7b7e09500c2b76d7a4e0fcb4ef1b6afb1e2b80f4ed0687c87 SHA512 3367b047997e09db8f30fce3e75af7d4f07cda36fe88190f5222b677fca4031d28284d42efba2a2733850ca51804330ebb91243c0ec2520e34036cc362c83b1f
 MISC metadata.xml 258 BLAKE2B fbb6080ca66a25c598b8dbd1366020c736e21b80c080dd1ab706a48379f2a5e9e1f1ca3dd6835a3c462f8465702b3277e5c30653e5def11a1bbe2f497d502b6f SHA512 2186459dac52b0c063cc8a6d83c1895a1dcb4d1cef3c5c0a50d2658ce8cd4140cdf50a28032a2add1f71ca6a03bfb80c9293c8c0af668623741f5b6f90b38f7e
diff --git a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
index c52589ef574f..f7055c8310b2 100644
--- a/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
+++ b/dev-libs/libxdg-basedir/libxdg-basedir-1.2.0-r1.ebuild
@@ -26,7 +26,6 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		$(use_enable doc doxygen-html)
 }
diff --git a/dev-libs/libzip/Manifest b/dev-libs/libzip/Manifest
index ca84397488b0..8ef6a8747beb 100644
--- a/dev-libs/libzip/Manifest
+++ b/dev-libs/libzip/Manifest
@@ -2,5 +2,5 @@ AUX libzip-1.5.2-mbedtls.patch 707 BLAKE2B 1905d00a6d8185cd5e6223b9ec6e82ffa5bc9
 DIST libzip-1.5.2.tar.xz 725724 BLAKE2B 3d67fc3ed9a242047fdeb1bae7fdbdcbed660853bbb36590b082646619e1cccb1dd49506248bba66759e27691f9a83ed186731eb57f47cc5e21f07f28e391387 SHA512 1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643
 DIST libzip-1.6.1.tar.xz 732932 BLAKE2B 6f63ecb56767b730e5c5639c01e3e050ed64d1c1508b11d4cd1c75e2834988e14140a5e49ba25454d77c40c59b101615a9e00823066a35eaca0519147a75f5e6 SHA512 dcf3790933c95f66bdcbdb276497b36e57776103b0b1064a94479e84eaa0a09df8dd91509cb4ccab3a6724f0650f076ca1e332d73acc94b653e99a3e94a64574
 EBUILD libzip-1.5.2-r2.ebuild 2280 BLAKE2B f102a555784cab5a21fa0e49d5d2d965b1af8739551a02ce7a8c901ca6ad9dc5d40430fe263f561482d3f528d7ea94d52a3d23e3e346523b0842c20c38299b6d SHA512 f6d34b19bc4ae80a8b57dc7ee5f23f86b659dccfb8a1c0891fd8d94e88d99466759b2d62b416d79cca10fc572a478900d3ce98e185f95c20ba6c6e7d6bb5a817
-EBUILD libzip-1.6.1.ebuild 2274 BLAKE2B 16dfa0ed548741d805440cef657b7d07eaf8d0eb8f74796a7a83592214a9c3c1fe6e332a3fcae91da3f83bb432b8055e6ef1d6a9472752fc8390cdfe2beff0dd SHA512 2941d0fbb7cfc15493fdec538c846e696d1d55e92d6d24e2483dcda6adf86aff0b8d9d62c3e57e75fdef2064554ff8f279453aa2179809c27563d389d01ea6a6
+EBUILD libzip-1.6.1.ebuild 2287 BLAKE2B 3d33de546205fa55fca0feb1cde8cb0159de71c98971440b23fa42a39d7c577c057b8c1378f1cf9b326a3800a0451abb9ab44b1e22da5f84ebcd2403ad1423f9 SHA512 0d7a9b731bf4150cee092312e99f75a35152db181723332bf117f7a57632415959613a9fe89316756ff0db59746936587ef82b37f2f25387e89b5626abaa2740
 MISC metadata.xml 411 BLAKE2B 9b9ed5a214bd0ada5651c71831f103af8729535fb0ddc43cbab1ccb14cbfcd4103052b2549b739ded6caca6dc9f65bac346a00ed55806e37c77de367980b1bef SHA512 16b33f8e04a089007c9744141f12d04df43f1a733aed098fc6759d68616849b884180cdbafaf6694c8553de86dddb95864beeb76447f3dc241b83846ef651e3d
diff --git a/dev-libs/libzip/libzip-1.6.1.ebuild b/dev-libs/libzip/libzip-1.6.1.ebuild
index 0e5d64337ebf..27ab2b357dad 100644
--- a/dev-libs/libzip/libzip-1.6.1.ebuild
+++ b/dev-libs/libzip/libzip-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.nih.at/libzip/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="bzip2 doc gnutls libressl lzma mbedtls ssl static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-libs/mimetic/Manifest b/dev-libs/mimetic/Manifest
index 066b7f4596d6..bea1fa98232c 100644
--- a/dev-libs/mimetic/Manifest
+++ b/dev-libs/mimetic/Manifest
@@ -1,3 +1,4 @@
+AUX signed-char.patch 1024 BLAKE2B 333955f24190ac0327cbc8ec786a91d62f431169aa157966ba592b1132681635bd231f893bdb7b70c849aed2d3910aa488a9813f7f00b8688d3bb46000076a10 SHA512 23f79103ff31d70d992a777118bc733f3fc52b5fc21b6827c19b0d40a099c11b74eda89feccad2690f83a4cc3f8e92d918d111cf9cef025b94481fdd75c3fb63
 DIST mimetic-0.9.8.tar.gz 556716 BLAKE2B 16dcd2a869a5ec92f8aeffca52f41aa1773ad1446302cf827d25ac27c407bcb7e59ed3f8868a00102ec19ef874da440e72f80cb42150a20dfd962af5173901f8 SHA512 4157eecb3e26af314d475c91192a357d6da35271a07a07b037d5037e9af84952ce2636874e86df0e94e8887dcfdb8f594a1ba04e6448181e436b0e2675f48f58
-EBUILD mimetic-0.9.8.ebuild 902 BLAKE2B 33656bde8ec41e87e3029814e7e45ba717a69c1f94d189543b98c317e6aa95dd5231cb381fc3884371ee4d08196e5d9b68e017211b493e056dc2312406b66deb SHA512 0133eebcbaa4de6bb4dc623b5fa6b58edc954d1fb058cdf092c73ef60bcc88aed0bcb29d46176c70d412496e45ba53f655fe00614f0f32f25e2739e865c6d514
+EBUILD mimetic-0.9.8.ebuild 951 BLAKE2B dea52f7d511ff1c0a11752477c2f94e7d547c3f425a64e46cb590efaf116f917d4d8a984035395da39a11959b1f844c3065a2c0a9f4c1cbff34fb5f4a5729922 SHA512 897f203937ee81452058c6acc1e2b703968a376a10d06b1fd0c9ef12502a13bd62ac63f9e005e757af383c3e197a00cc72f137b08c0b71053d9f7a589b601d7f
 MISC metadata.xml 293 BLAKE2B 34185556fb4bbb3af0e496075cd2422d5025f963a30d168715dfe6b941562ba8c3a734b975fce56b7078f6013c5eccf71b004d074beb7db11a4370b3669bde66 SHA512 83880131b4ea4a31515c133e27dac9deb71563c05baafbade66750aa0d00404ab51d42cea9dbd3f8774a36f3464c06e812578aca7fc17370507a9c74f4849fc4
diff --git a/dev-libs/mimetic/files/signed-char.patch b/dev-libs/mimetic/files/signed-char.patch
new file mode 100644
index 000000000000..df33df9e2b72
--- /dev/null
+++ b/dev-libs/mimetic/files/signed-char.patch
@@ -0,0 +1,31 @@
+Description: fix FTBFS on architectures where char is unsigned
+ Fix error
+   base64.cxx:30:1: error: narrowing conversion of '-1' from 'int' to 'char' inside { } [-Wnarrowing]
+ by making Base64::sDecTable a signed char.
+Bug-Debian: https://bugs.debian.org/859963
+Forwarded: via email
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2017-04-10
+
+--- a/mimetic/codec/base64.cxx
++++ b/mimetic/codec/base64.cxx
+@@ -13,7 +13,7 @@
+     "abcdefghijklmnopqrstuvwxyz"
+     "0123456789+/=";
+ 
+-const char Base64::sDecTable[] = {
++const signed char Base64::sDecTable[] = {
+         -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+         -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+         -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
+--- a/mimetic/codec/base64.h
++++ b/mimetic/codec/base64.h
+@@ -20,7 +20,7 @@
+     enum { default_maxlen = 76 };
+     enum { eq_sign = 100 };
+     static const char sEncTable[];
+-    static const char sDecTable[];
++    static const signed char sDecTable[];
+     static const int sDecTableSz;
+ public:
+     class Encoder; class Decoder;
diff --git a/dev-libs/mimetic/mimetic-0.9.8.ebuild b/dev-libs/mimetic/mimetic-0.9.8.ebuild
index ffa4669138a1..3f54ec09712e 100644
--- a/dev-libs/mimetic/mimetic-0.9.8.ebuild
+++ b/dev-libs/mimetic/mimetic-0.9.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,11 +11,13 @@ SRC_URI="http://www.codesink.org/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc examples"
 
 DEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=( "${FILESDIR}/signed-char.patch" )
+
 src_prepare() {
 	default
 
diff --git a/dev-libs/mongo-c-driver/Manifest b/dev-libs/mongo-c-driver/Manifest
index 973bcdc54ffc..7f74ced5e769 100644
--- a/dev-libs/mongo-c-driver/Manifest
+++ b/dev-libs/mongo-c-driver/Manifest
@@ -36,7 +36,7 @@ EBUILD mongo-c-driver-1.13.1.ebuild 2482 BLAKE2B a023ec4ab0d023c30e6f664eb120913
 EBUILD mongo-c-driver-1.14.0.ebuild 2551 BLAKE2B 63c599838498a5893429ff5def20a62f50205e9c6eb8cbc09fd32bcdacd8b70531cc46041023999a634f990c4982a3b94a027cef2314e1b6d5e0a8edb8d9768a SHA512 3ad5c4651b4c3d00c9c01159648750f46cc52e8c9c910ca5534518c7ee7255bba6069ef5a26f5734d52b7a978cdf089ffac52af10fcc15c41a573e6cd6f7fcb6
 EBUILD mongo-c-driver-1.15.1.ebuild 2536 BLAKE2B b4d2263f92d32b3605188b6ea91d8dd1a3100ad13e73c300b6efe5a684483a9669c389d591c6681c5f6a2a1501bbc1d2fc4c1db88533c868ca1b4fe30348203c SHA512 393ffad442d3db5ad0661459f3ef9cbe9d37a5087079436ac6c534dee378d207c802f928b6dbef13626d6c77026971215c52413e8ea7bf21167f74526b9b6560
 EBUILD mongo-c-driver-1.3.5.ebuild 2171 BLAKE2B 62807837e21c6ce5c098fb5160aae99b01d6dd01550d3bd837ca727616036ec453a9e37f0b4ae71979bdce01344a265d0ccc23d324d9827084bfc302b980a6d1 SHA512 1b22d611b3c235883d4115fbf82d800fae0fd81453d2b4dff8abe8dbeab065b04e2abd506ad6050c10862a7bb7f28cc7ad41b08bf16a53598c20eabcaaec4cd8
-EBUILD mongo-c-driver-1.6.2.ebuild 2111 BLAKE2B bcbe79dce0d232531c12b14ad8b71e331890e69edbbcb99bef624dc4ec6a7ec5a15c9eb690ebff6ecfa02aa29b0a6399f60f703c48c8296fa405a47174bf0f72 SHA512 443893f785cb06ff8fda8e8282e3b30ca5aefbc5494bebbed8a3a6b5767d35eb48b558c0b86f8d205d99bd5589c8526b0550daacbcc32f7e00f8a6e57ce17766
-EBUILD mongo-c-driver-1.8.2.ebuild 2169 BLAKE2B 44401091a3f3c1a29c98aa96c5b23dbf9577e8bcb6da015d2e1e03bdd63fe754405b46dc41840875b02dd80051b8d8f1ca812e393e32344335b7697bec9dab17 SHA512 7ad66c5e6016f19f2e22e103c58be133f3d20d9cb4895a0be9a8b7145fcadae7c42d86b98b236253a6177498a852a1e7fb9158765ccd1d2ef2c92cf8ea4fb81d
-EBUILD mongo-c-driver-1.9.3.ebuild 2172 BLAKE2B 91ad7531fbfb2eef3515f876571419cb99a322b54af2ee289b5972e36cfe92c64f5cc7a3a265ded6688731644fdfca58d7625197215f65a9395bed0396979ace SHA512 117aa59dcb014d1b51fb26295998ada692db5ec4a5f4033bbaff31fa8c4bad07764b15e31501ef443da6fa25040a694db51d12ad34dc1c73d15d63b857a7b586
+EBUILD mongo-c-driver-1.6.2.ebuild 2070 BLAKE2B b2a25755c6a37247c42f41134684387b2e584a241a411fce98c96f057ef18c050bc4e8ec3aadc4de716fa7369ca797ca75cf9ac2fb39d3dba0827190d9cad2be SHA512 22a44789068ec7277d10feb6d41b82526b09aad1213ae8b9827131e63df1d78ce07704f295178cfa085a6c6c645f7d456150caca51265b00dd8bf6cca2c6f42c
+EBUILD mongo-c-driver-1.8.2.ebuild 2128 BLAKE2B ef502986fe7b125c8abd168119797b89706209b0f6c7a2f99dbf4a0e9de93687babc79d504e366ba4bdad52215e2f5c4c72f259f81ea3bd70c627591389cf9dc SHA512 87607915dab15ffbe9f2dea28a243d14ec5c20d7290fd9018a57a7e31cbe4bc62b731f236da06d246823b070ea2230b588159a8001e792ce7273f492452811fb
+EBUILD mongo-c-driver-1.9.3.ebuild 2131 BLAKE2B 59aa363b4bffd5ebcabf8644341884b9cba4caa7afbe03dbaab01c08aff11c29b2d1b3b4e3f109a0f792b67f8b3d5914b59d8aad48c9c2ab065c36820a8fb3dc SHA512 eedb120627a3a4510783b42dc03985a595bc2ce1e6cfe75fdec9f1748ab506b9549a2a8a5e0d7db05d2fef5032a115d03eb798dcb8f2982fa2317dbc01783633
 MISC metadata.xml 334 BLAKE2B 7e10c3396a8bf28586240a95cc10a42de507d995b9f67dcf3b016cd586a973ce7478fe3974188dfb215123c8ca7188479d0d5be46ebcbb6b7790472f4e6ce225 SHA512 80ff1ae78c264618a7d5253d80ea5f4d1a15a568d5215d03dbe3062a591ec1c99d6625feff3b7baabe314bb284b5e5340c873b8846d05fd932f8cbc78df00d34
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
index f66b7f0c74b9..574171d957f7 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,11 +42,11 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-libbson=system \
+	econf \
+		--with-libbson=system \
 		--disable-optimizations \
 		--disable-shm-counters \
 		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
 		$(use_enable sasl) \
 		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
 		$(use_enable debug) \
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
index 1c81a8f60b99..044a37200616 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,13 +43,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-libbson=system \
+	econf \
+		--with-libbson=system \
 		--with-snappy=system \
 		--with-zlib=system \
 		--disable-optimizations \
 		--disable-shm-counters \
 		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
 		$(use_enable sasl) \
 		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
 		$(use_enable debug) \
diff --git a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
index ab6b5baaaf37..9bc7a5d5f33b 100644
--- a/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
+++ b/dev-libs/mongo-c-driver/mongo-c-driver-1.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,13 +43,13 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --with-libbson=system \
+	econf \
+		--with-libbson=system \
 		--with-snappy=system \
 		--with-zlib=system \
 		--disable-optimizations \
 		--disable-shm-counters \
 		--disable-examples \
-		--docdir="${EPREFIX}/usr/share/doc/${P}" \
 		$(use_enable sasl) \
 		$(use_enable ssl ssl $(usex libressl libressl openssl)) \
 		$(use_enable debug) \
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 3f40ecddf058..0907fe2d37c1 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -4,5 +4,5 @@ DIST mpc-1.0.3.tar.gz 669925 BLAKE2B 4b5a1db5220b58070f9356041f44f021c2c9ec46aa4
 DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d713e2f6b38da16e2e382248b446d9da01ea89fe7202b795b08929b7c42c89c2c1e9a57482faf01ee697beb SHA512 72d657958b07c7812dc9c7cbae093118ce0e454c68a585bfb0e2fa559f1bf7c5f49b93906f580ab3f1073e5b595d23c6494d4d76b765d16dde857a18dd239628
 EBUILD mpc-1.0.3-r2.ebuild 1053 BLAKE2B d3abc21b9e65f07312e203af6575851127ed912ab565573e9954c73bdbc5ff5c4db1c2cfd4f9001c9d9976ef725756735edb60083d9cc1af9933e5e3f1e66938 SHA512 837665d4aac419b82184201799252e930506acb9935442f54b61c02394a360d2f3bfd92a3b424e49ca24290acf7612074eda11188111bc70fc3e0aa83b7cd0d6
 EBUILD mpc-1.0.3.ebuild 964 BLAKE2B 4085d9b59282cde0860b9d39a0dc4774e3939dd850f0d568afa75a70b5e3c515ed9d14778c1e0c33d159a00c69d5c0bc0ac90d233098cfb3a4005786208a89dc SHA512 8812e628e26e6f51b3d3f10c6368e7f39df5c9bdd3e8e367a8bd1526331955c01a994f56affe6ac05e990decbd22b1b7ab1540684e3eefde0524854935bb99a1
-EBUILD mpc-1.1.0-r1.ebuild 914 BLAKE2B a7e21376da1a0859a9990cba49f4273003b3f0cebdefb69e550cd29444ee7275882ed4d65f60e73622356c687c361120f83489d915a8dd4d482197213acf005d SHA512 784caff1026ee699e555b0c1b990756fc3d1b5cebfd4b32f30771abf683f77f2c984b4351f03b9c55e515296446a320fbd9c0fd3e32191b7dd7f8aaa2a883ab8
+EBUILD mpc-1.1.0-r1.ebuild 912 BLAKE2B 633b1f4c7ee8262acd1a11111840423b95d17edeb6b13763472941e96d4894e20e90c6cbacc56ccfb2639dbde1044922e7b60aa7b3d4fed7acebd9c0eb48cc2b SHA512 44ec3c47d46c3cd7c0acf83c85d91358ecc72647c2e83f6f58a37985a6c2e392961e47894c5aa328ad07a5bef6826fe0664749027b5241d95a45ee029dd97f26
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
index 4891febb76a6..d4018e684546 100644
--- a/dev-libs/mpc/mpc-1.1.0-r1.ebuild
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index d8c017db2cd3..9e5bcd7ca88e 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -15,7 +15,7 @@ EBUILD mpfr-3.1.3_p4.ebuild 1786 BLAKE2B ccbcb872172511c722e33acc0f4b13c2555a365
 EBUILD mpfr-3.1.4.ebuild 1610 BLAKE2B 557aaa3ee1253dfdcb92c784840f8244a7e618df289b01d274e19c8257a64a71a1f6e510eb11f155fec82a84726a7727cc253554d7c7ff697c624f7cbf692b44 SHA512 50ee30de97dadb782d165584234d3ab37ef9e5876f7f755b57ff1af3971fb88f948915dd0b280ee6d5884031946d19e1edd22bbf356af7784fdabfd397b01d9e
 EBUILD mpfr-3.1.5_p2.ebuild 1672 BLAKE2B 4cb61b40f2d8495d460ad6e804ec8ecf6bf4ca0a376e0f05ad8c7e05fa36213738a754c715d5c14b07182b7fe667a7465492fd4c9a64e34a8b46b53a606e5f57 SHA512 2f12a3322a252cf29b21189b8456b4e429165303e123d4e0c88b0c96eadd8a8c34c1f94ef2c69e2bd46169454b9cd98525e34e6bddbed8cdbf5b953a1402ecd9
 EBUILD mpfr-3.1.6.ebuild 1589 BLAKE2B 6fa4f04532cd8256e0d1c00553fd9a26111f4f0f93629309dd48a68e832dce61b0c0a845d724e833c612ae425b6099eb1e541124d043e34c9a68397a5a7642b3 SHA512 d8c79a6ceadacf078c47e3974b678a37d1204365cfc31cbdf7ec0adf59cfc6e18774e5e1987522627f43b1597d28013ea4ff8ca44c48ef9e3b1d48ad40fd3332
-EBUILD mpfr-4.0.0-r1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
-EBUILD mpfr-4.0.1.ebuild 1698 BLAKE2B 6357828969ceaa9854aa801fc52cb02a273d8f25cf20bc082fc3e4226b8eacaf8a6f28cafd6db7c58f6e1d597d7b179a95f6052f19ee0ad89351c87f7a01b8bc SHA512 e68e3ca70ab845ea8762be1ba670d533ca714963f8ddf03af07575a7ad0603810e9b22871413c17d6828068e07f06bbec6ca8aeeb2c161d3cc32dac9e346cbc8
-EBUILD mpfr-4.0.2.ebuild 1692 BLAKE2B 1f19fdb58b2fca4734fda4f45e7625e706658c2cd2621ec18e23fce854cbf84b20a226a44caa88e83c9a5363e691decd72342963411ebb4248dc94d4f0122753 SHA512 27292eca2c1eedb9b177bd14e414aad175b9d40c4028fea8fd41f1419d6424de329e0a310af0df82fafa72e36136a56a0d97b55393dc5833ca0dbc9ecdc41eae
+EBUILD mpfr-4.0.0-r1.ebuild 1650 BLAKE2B db804f84ee5ae52a90d957f4d00faf2f61e32d1a140bad2d3262b898f98bba88c1c3f6d9669d8c8eda1fed0160df6c70966f9a858f6f73625b593a50a03bc22a SHA512 d050682903c5e8c30b6b70c8058658ae40d867fe3e8208dd91e92b979d44f4babb290e8f2ffd7f85ac68626bceef45a2dae57f855ce044fed5a47cbe76c10c6b
+EBUILD mpfr-4.0.1.ebuild 1650 BLAKE2B db804f84ee5ae52a90d957f4d00faf2f61e32d1a140bad2d3262b898f98bba88c1c3f6d9669d8c8eda1fed0160df6c70966f9a858f6f73625b593a50a03bc22a SHA512 d050682903c5e8c30b6b70c8058658ae40d867fe3e8208dd91e92b979d44f4babb290e8f2ffd7f85ac68626bceef45a2dae57f855ce044fed5a47cbe76c10c6b
+EBUILD mpfr-4.0.2.ebuild 1645 BLAKE2B 4a45034204dc57cf4484224b3c18ff57bf493835dcd7b00a2c26ccf751a39ebfa576bc5a27ad4bed3b0c630959bed9ddeedc64bc9fd4c011ddff9d6ac6acb0f6 SHA512 8650b9635c70714dd4a3d8be265a28be5dbded40466da62e979b940507791a763ed9fdaebf3cea0631d3cfa7de75ef6087f7357f2d0b7f545eb29db8c800a3b8
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
index e17798a663b1..578353773d4c 100644
--- a/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,9 +41,7 @@ multilib_src_configure() {
 	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
 	ECONF_SOURCE=${S} \
 	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/mpfr/mpfr-4.0.1.ebuild b/dev-libs/mpfr/mpfr-4.0.1.ebuild
index e17798a663b1..578353773d4c 100644
--- a/dev-libs/mpfr/mpfr-4.0.1.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,9 +41,7 @@ multilib_src_configure() {
 	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
 	ECONF_SOURCE=${S} \
 	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/mpfr/mpfr-4.0.2.ebuild b/dev-libs/mpfr/mpfr-4.0.2.ebuild
index eccdc09a8c68..30badfcc384c 100644
--- a/dev-libs/mpfr/mpfr-4.0.2.ebuild
+++ b/dev-libs/mpfr/mpfr-4.0.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-5.0.0[${MULTILIB_USEDEP},static-libs?]"
@@ -41,9 +41,7 @@ multilib_src_configure() {
 	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
 	ECONF_SOURCE=${S} \
 	user_redefine_cc=yes \
-	econf \
-		--docdir="\$(datarootdir)/doc/${PF}" \
-		$(use_enable static-libs static)
+	econf $(use_enable static-libs static)
 }
 
 multilib_src_install_all() {
diff --git a/dev-libs/ntl/Manifest b/dev-libs/ntl/Manifest
index f40bce159c56..a2c3882521ea 100644
--- a/dev-libs/ntl/Manifest
+++ b/dev-libs/ntl/Manifest
@@ -5,6 +5,6 @@ DIST ntl-10.5.0.tar.gz 1278729 BLAKE2B a061ac4e0989ea671c51a22904851e5b7919f3a7e
 DIST ntl-9.3.0.tar.gz 888710 BLAKE2B 153a6f1bd11f27ef2944e4df5e941c4ddbb1783449e2a72aa1a272fcf169997b01646cfac63ac3af5a85a7f9a4db99a664503615d323ba54784849e764316b0c SHA512 dfb4ac7a66aaddcf5d0d0c9fcaff253b0196a9d9f727788127dd18e131528fe60dedf8bfb864503225fc5796987aec9c7019b74e0fc12cd12c20aa33a9cf9d7d
 DIST ntl-9.6.4.tar.gz 915256 BLAKE2B 78d8415bb1fe858881f997383ca9adcc8af2499251fc1b2e8e2211a8c7b8edc249ef28f3705e302d438c19cc07bd31d8b36681cb6b5a846d4f0b35ff09d310ff SHA512 ec8a4deb6996b31140edff978e07844ea8e30327491a6777d3982bffec01599b0cb5cc5dca297c8610ecb7ac9a4eae3407a59736fed840a2415a52a159370868
 EBUILD ntl-10.5.0.ebuild 1477 BLAKE2B df1abab9af41dfa2e74767a5d29ffb21f630291b811b9b15233c071444f3424b9fc10cbaf3168cce9670d90e86aea30c258a072454988bae98c5219251480811 SHA512 4a192510603542f0d269efe628922042c4a867741373f5ed5d0acbfc292620dda7e9ff7549af2e64e09dc63a900b33c6671c0e0e362210680ba853fd662a751f
-EBUILD ntl-9.3.0.ebuild 1802 BLAKE2B 32198f507fef9c63bf04ab635d864064bfb6b3546ac24b0473cb0a26477e2a067a699037bd1383d1a8c365a8240679a5fe66d447a1b642b476da746994ff69c8 SHA512 b42a5db2046c7479cd9d70ab34d86bf4e46586bfe89eb54b817c3afa582f0ab7686498901be5772379c896a67bede573d7f403578a55954915c3d2a079f3bc61
-EBUILD ntl-9.6.4.ebuild 1730 BLAKE2B 92cbfb4ee75e6fcb06ef6ae9917ad7626857f2d1f6a14e96266b2587e7a74b216ead29c70503fc8208184b56441f3935d8d658c1b4bba6d1050d3262dac0301d SHA512 ebab0acab8dc7e7c6fd57a87ed4bc58f613d617e6ea9ee02d83be15f68cf07dcdb0d4c6da2f620c359d1cb5a693b03548d150fcead468cf0958d711b19a13c6d
+EBUILD ntl-9.3.0.ebuild 1803 BLAKE2B 8fbb3743fd8ad0dcfc982e39d17e7ff853ee4711dad0621c3baf209e4eec60c42205bf333d602048194411ca61a9199f1031a14bc510e576d04ad1954e1137a6 SHA512 ccf8254177675efa4833f9042349d7cb45991180a328b1369371a654c50e841076312841a127e8004bdf837c7140f89bccbd9ef1fcf96a6f3a7708a2b976bd17
+EBUILD ntl-9.6.4.ebuild 1731 BLAKE2B 65923c6eb86909476d4763b19a0a98fdd5aac72519a2cf2a8ba3296339a50e14f0735ace03b0a52d0ef096a8b85f2bdad9f9fd38cd92d0b8821bf3679fdca8f3 SHA512 b9c617747de890d894c004006ccccf6b4660f38c758819a66ec70c42e51122a55141d59619ea62aa3046ea358ed12ee12de20c6a8ea5f544ce51b7b6482c386a
 MISC metadata.xml 552 BLAKE2B 86ae637ba8e3735d4bc3fa5c31d044a0fad0cf62706e73b232af2ffafa8bd90c90d07e672cabe4a14a555fa314bd8d82f4a533f07ac08adfa6144296d42f320e SHA512 001c3010e5ac7e00b79a6415c91313b90afc64be532b71bbb909a88deb956f3c9aa053f1affbba42eab7c1ffd0de5948076ad7fcbe290865d22988a207ecd25e
diff --git a/dev-libs/ntl/ntl-9.3.0.ebuild b/dev-libs/ntl/ntl-9.3.0.ebuild
index 50bb3ea10db7..e2a691d8a312 100644
--- a/dev-libs/ntl/ntl-9.3.0.ebuild
+++ b/dev-libs/ntl/ntl-9.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -74,7 +74,7 @@ src_install() {
 	fi
 }
 
-src_test(){
+src_test() {
 	# the current ebuild need static library to run tests
 	emake ntl.a
 
diff --git a/dev-libs/ntl/ntl-9.6.4.ebuild b/dev-libs/ntl/ntl-9.6.4.ebuild
index 971d4e14c572..e672e758c1bf 100644
--- a/dev-libs/ntl/ntl-9.6.4.ebuild
+++ b/dev-libs/ntl/ntl-9.6.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -77,7 +77,7 @@ src_install() {
 	fi
 }
 
-src_test(){
+src_test() {
 	# the current ebuild need static library to run tests
 	emake ntl.a
 
diff --git a/dev-libs/opencryptoki/Manifest b/dev-libs/opencryptoki/Manifest
index f7066b10e591..8a3a971a5070 100644
--- a/dev-libs/opencryptoki/Manifest
+++ b/dev-libs/opencryptoki/Manifest
@@ -1,6 +1,6 @@
 AUX pkcsslotd.init.2 664 BLAKE2B de96f878e55ce5346a3846c99deae28e540964cf4a7dcd42e2893cf540484fa6b3bd914400c2fd39067e8cfc29d030691fd0e4e4fb83b229bc2c03085e5df2f0 SHA512 3bdc6d2f87b2209163ad08915afa900f9c14324d3e48619cffe462c3c651996fe0e0b485eb6331552fcb22297cfa7bda9b6440a8bad9419d6835a047f1b2a0e9
 DIST opencryptoki-3.6.1.tgz 1068197 BLAKE2B 0e7d867bd21863f56471ac2c8664148e5a6988ffc30e71feaf960245a1908d676c1791f2b751de4bdd694096bf7360af3a8f79df895eef1b8f61391aba09aaad SHA512 1874fabba6d3da49596622c7f8142a37329df95f129cb08319bb3900a944dde1ae5ce9d845d400726f4bda4579c730012b9bfd6c69c6d5a16b1f75b28a0ba4af
 DIST opencryptoki-v3.4.1.tgz 1014416 BLAKE2B f95f9c4923fb7ce283f2031c21221ec2dacf1afca50a5fcdb4e2e173c952bbc4402fda56664428087a2c5b33af8a94aba9fa361ef5c0e4f0b865391cbc304250 SHA512 98643463102f70226255f17a7c49cc454cce377404155b9624e77e36c9f03fb30c216d1769177666489a539e0886b071103a089c565f8fbf120c2a53239a2dd6
-EBUILD opencryptoki-3.4.1.ebuild 3122 BLAKE2B 002036c45163500bf76e52b67e1178f55b22795e0490ceb955aef751874b19c2262f81e25b370b826e3e892de85c94fdb38afb6a4fd33a4dedefaf6fd2311935 SHA512 4aa6b7c580ccccd8e60f7a6c9510eeb86d8c33b6b79375dbb2fcb9f1711036ab014cd0f5e6419a6e37fc13e1a5d2a54bd6e2018f4deb553d4fde65c1949b6127
-EBUILD opencryptoki-3.6.1.ebuild 3134 BLAKE2B 3b8a0ba2d3988fab6c212b8620ca28934c39a5db333c77f3ffcffb44eb768734363358abd909e2e54eee18b0ee0e60d3cd89b1f8ddef4620a749d52925f21d11 SHA512 97d822d8019a30293218f69c1ca5740f78ca31a1f980318030aded7eacbd2a4bc67bd14b12429ae07964d5e56097721e5ae91fe658d07eff2ae343a84a8b9a6a
+EBUILD opencryptoki-3.4.1.ebuild 3085 BLAKE2B ec9aefcf4acc5e8839962682e930c2ed1195bd015a22cafd343e1e8473986289645c1c6282c1346c679e18b1bf451cbd500d078fdbc9d5fa58c1730af0247959 SHA512 3e5e197a2b9bbe336a4ad10e2b0c3733d67c033c5709e22193dc8152af7f299251ed0f0bd5cb2597acc3111d781c3060b2a86ca7b5479a1d0af86fb2df793679
+EBUILD opencryptoki-3.6.1.ebuild 3100 BLAKE2B 8775c159cf881eaa7d3b2f10125c84b34ed008490e06f7addf110b9cf4a27a884f02a43c32bdc31508de0f0dc51afadb1e5842f9d28a84966223be2a85158046 SHA512 d44e5d8f572b380245a9fa330fb423867e7cc1118a3c3201cb41414768510e3cb34ee513c7be6af166461b73f60c84c843800af400d1ff276501b1f11fb23512
 MISC metadata.xml 375 BLAKE2B e00a1038bf53c0b8a93ee545e4674dcd7081a70874f5a3fe94794cf65b47d34cd94ccf512c8340b8b84170205840afbdc785dcd49b8391cdfdb655830a483c6b SHA512 fb29b7702172d4e47fe7cb29ec502f9ff0e1f713181ea5af7834a776b2844f4f5d51972764d4bf62088325c498d48a17479856ba5d24ef050af3d3f835c58352
diff --git a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
index da43888b4524..99428ccb4f77 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,6 @@ src_configure() {
 	econf \
 		--localstatedir=/var \
 		--enable-fast-install \
-		--disable-dependency-tracking \
 		--disable-debug \
 		--enable-daemon \
 		--enable-library \
diff --git a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
index 35d8afef5833..f3666b16096e 100644
--- a/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
+++ b/dev-libs/opencryptoki/opencryptoki-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -63,7 +63,6 @@ src_configure() {
 	econf \
 		--localstatedir=/var \
 		--enable-fast-install \
-		--disable-dependency-tracking \
 		--disable-debug \
 		--enable-daemon \
 		--enable-library \
diff --git a/dev-libs/openct/Manifest b/dev-libs/openct/Manifest
index f3494773a8b0..2c41e57778d5 100644
--- a/dev-libs/openct/Manifest
+++ b/dev-libs/openct/Manifest
@@ -1,4 +1,4 @@
 AUX openct.initd 502 BLAKE2B 5f583c50b138d9017aecbda25aeb74f09643ea461be3449c50c4ca61a0379c50bf22036cfe46ec3e606519ddd94a49add053da48f8987d5e6f2e790408ad48d5 SHA512 18cb14070252c3f1babe117d5f6fe91639b1bdb07fab953573ba143e5cc49b55964ae56427f0cc741fb3d90e54eb2eec863864a340229929ad5f2aab21723f23
 DIST openct-0.6.20.tar.gz 702818 BLAKE2B 13637fa914394e1e553d750062535c879ba11c6587c42570e2bc92c4af9f732a9b0dfc06e2140f4965480363f8d65bc5831f905910d734c36034ccf1916ad302 SHA512 5175b418847200dbd4af0d8ab09546d94568639c67db67bdea93c68cb042c7ef901bb356784d6b1d9f4de914535eee5a450b39a15d1ab9a676ffce790a408a3e
-EBUILD openct-0.6.20-r4.ebuild 1803 BLAKE2B 4e1d95dd5097cd482d67b59cc20d489bec801d494a5742ecc29a06885308ec093d9ee6790f9e5ef7824e06895b3dd07608fa299eff18ee011d17ea5f14e90d06 SHA512 820bbab2551f4d69c4816b4a47d32dbbf0453e02fc9752da07231b491e5ff022de3c4799af75256331c369c8a009a5e71a170d89fc3b84bd5e499c281dcf4e80
+EBUILD openct-0.6.20-r4.ebuild 1725 BLAKE2B 0eba59a2ccce46349feb70439ff7e105d6637028fb50f4fe0d82f741aa8634cfeef5a37115b61b88dc5b552b1cd4d7d0072780ef6c6bb27ce9204e0a7be69bbd SHA512 4a2d69ba889afd2968eb4e605781fdef3c1a9e22d100d52570b0b680ec947b44e53392f0a55d01926e197ac63e50634e47c39334b0ac1405816445048d23d1e5
 MISC metadata.xml 559 BLAKE2B 37c964c92180aef50b1af8902e5f5466627038019ed50715a80fe0a0fb512726dea43d494e134cc7f9c7581406d5071efa948815405a9c25ae17116c93137e84 SHA512 b893e775d0ae84baab3a0faef0cbc3e9704b28b4a079326444ee7ff1178f241db33f8cf8d2ef95685345eebb783cbb41d5a7fe0dcb9ece420b902ef08a867032
diff --git a/dev-libs/openct/openct-0.6.20-r4.ebuild b/dev-libs/openct/openct-0.6.20-r4.ebuild
index a56bda771ccb..fbc214e2fde2 100644
--- a/dev-libs/openct/openct-0.6.20-r4.ebuild
+++ b/dev-libs/openct/openct-0.6.20-r4.ebuild
@@ -30,8 +30,6 @@ src_configure() {
 	use debug && append-cppflags -DDEBUG_IFDH
 
 	econf \
-		--docdir="/usr/share/doc/${PF}" \
-		--htmldir="/usr/share/doc/${PF}/html" \
 		--localstatedir=/var \
 		--with-udev="$(get_udevdir)" \
 		--enable-non-privileged \
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 713da985ccda..ad7fb7c545e6 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -3,6 +3,7 @@ AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2
 AUX openssl-1.1.0j-parallel_install_fix.patch 515 BLAKE2B a1bcffce4dc9e0566e21e753cf1a18ee6eac92aca5880c50b33966d8ecb391f7430e1db6ea5a30ee4e3a9d77fb9e5542e864508b01c325011e368165e079a96c SHA512 0badd29ec8cffd95b2b69a4b8f8eecfc9ea0c00a812b298a650ee353e3965147fd2da1f9058d2d51744838f38168257b89aaf317287c55a7b76f16a69c781828
 AUX openssl-1.1.0k-fix-test_fuzz.patch 485 BLAKE2B 4dc2ef2b2c1935c8143c939ed6b7168fb070edced8ae47732f1ae9fdabe19887f846d75c15cea33680a54058c9a99f981a3c6a35fc84c3a6c360b4d2b920bc04 SHA512 68590479f096f3da920a5d293f27babd541ce1946944d5540f78d8341b59eeda92fe24743f7351b565e06421d7a2da77e331ebe1e5168023f6602aaa7376a038
 AUX openssl-1.1.0l-fix-no-ec2m-in-ec_curve.c.patch 1235 BLAKE2B 26997a474013c379a7d019d69203a5199ee17df07b28c86d06cebad3093ee62af9e4e568f3bc44ff4a5e8b555a5634d666446b35ce850c9c8668d920ef32bba6 SHA512 8ddfc077d3035b766175810b2554310935c8d1875044bf95abf8590ab5eeeb68357545566e7e8a50f95d9e62be68c72fdb58fef28497b154d44f08169645a08a
+AUX openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch 1380 BLAKE2B 3f206c0b4404f8708abe4b6eb004054c81b85a2f96715f5b110c3815eaab9aa73c27cc37c64d61cd25d8bca19ee76c58bc4cf451aa39fee3fd13f1f106442a80 SHA512 51860ca97a636801c41053d78d94e17dc1ce0d925231660ab0c307061504e16e4819d1b846cbcb5b862a1e6d4c38ca625a3da211268295b51c14367f0b387112
 AUX openssl-1.1.1d-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch 4247 BLAKE2B 5e181869569f9ca34190ba11fb1c66c12cfd6760aa85f423a65761886f15c120d0262528eb81847b1ed18a5e2c7610ff96790da7dac6815ddf3d025530c06349 SHA512 eafa940295b3cdfb0e9f1d1e337b4ce793f0dc8fae0fc5d0fc8e7029b9d6a99071b6b3d2b25002b715f3d5d7dc129f48700eb19e60e115610a8c4752a6d6bbfe
 AUX openssl-1.1.1d-fix-zlib.patch 1567 BLAKE2B c83a3016caa8ae6f3588a6649929d32ba890f7df776a39656bc870965aa305f89c3253b284a1f1b7bcc78b88042a01ab6fc93735d972bc4a2da1fd4f2ad225de SHA512 0b073723910cf4bd72d2e922e280cafbb807b040f4afc84f06973a45ff386b4a8505297af4894953d3fa61b8a68b42858345523705e43aa58846478976e2c566
 AUX openssl-1.1.1d-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch 2434 BLAKE2B ffe10db9977e70379d957df117f9e73469279673c531dd70fa78d84299efed1cc30402ca0bb5ae944b2aea649a1da1d3fa47e6b747b0f488a84f5eec2cfc10f2 SHA512 ac800f2ae4a88fcd51b61f5de5e77765b18f4a997dc334541dce995e6d3e04784752ef273fef033cde21c3d6aaf379751715b98cbce491bfd31ea4770fe78f63
@@ -15,5 +16,5 @@ DIST openssl-1.1.1d-bindist-1.0.tar.xz 13180 BLAKE2B 680bd7400d3dd3930067ee7efa9
 DIST openssl-1.1.1d.tar.gz 8845861 BLAKE2B d3155f07b487ebd8dd4fe25396c874f9af18b5cfd7e622298d29c4f2c8ce14ad4534609d321314a4bcd0d44414e1306190340daaacd3c8fca061c04498446244 SHA512 2bc9f528c27fe644308eb7603c992bac8740e9f0c3601a130af30c9ffebbf7e0f5c28b76a00bbb478bad40fbe89b4223a58d604001e1713da71ff4b7fe6a08a7
 EBUILD openssl-1.0.2u.ebuild 9866 BLAKE2B 1cae2b67bf0ce3644b82a5a1c069f8192740ec31f9588f876fd5601dcb46d633972e48dc2a21be0b185ed760fba640551db11e9713c90ee101dbdbc60f551f38 SHA512 d12c2f167b7cd4769b72fcadb797536fcc57c596cf0a1a23923e91c655fdf2c237da9c1292c7495b8d0a67482a1f53d2e1697ef5b33de68f301ca34c5c721f12
 EBUILD openssl-1.1.0l.ebuild 9596 BLAKE2B b90dab20cb55693a944efa1cd6a2e9422fd7f01e618d50ba74f7f2c46c7fdf6d91621d1380e000ea9e531997dc43c38324965d1abb3c4f668cfcf0986e599c8d SHA512 699210aeaeb1796c2cabd33c917a9dec91f1d0ae7a6fd8ed3ce62f90b02e9001722615eaa767d4d479df1c3e79e6c69025f65a4353a5800a0003f36a886d9f89
-EBUILD openssl-1.1.1d-r3.ebuild 10379 BLAKE2B 24289179c01645281f67513662c331562e60996f507610541918270e8a3f7c98a107548c430086ba8684f4c8585b8b91ce30b9278f678a225221abccb145e6fc SHA512 4d8ad683c97fd3d1eb585d94aa279a5fc584e0c8cc85dbf347a9c7b93c2c0543b7c0abf28ba8ee9c1542a3c2082e001a5be852783a4db8c144841623eaaa6b32
+EBUILD openssl-1.1.1d-r3.ebuild 10437 BLAKE2B c0547f6c506f81d6c878edfb1f63ecb862cc963ec2f8ca96a78034c646f9c1e40992304345128e9b99c083af209f8e9cfa55623714a09eddd44ee065ab096497 SHA512 86a68e02a62403d3057715e5ed9b72807570e8e5fa01602536c396481cee09a4fb97031671143d2f8aa15fdc4a7239c19354e5994cb1e387df812dee8e15af28
 MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7
diff --git a/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch b/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch
new file mode 100644
index 000000000000..3771684b2517
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-1.1.1d-config-Drop-linux-alpha-gcc-bwx.patch
@@ -0,0 +1,42 @@
+From 19ded1a717b6c72c3db241f06787a353f1190755 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 18 Feb 2020 10:08:27 -0800
+Subject: [PATCH] config: Drop linux-alpha-gcc+bwx
+
+Its entry in Configuration/10-main.conf was dropped in commit
+7ead0c89185c ("Configure: fold related configurations more aggressively
+and clean-up.") probably because all but one of its bn_ops were removed
+(RC4_CHAR remained). Benchmarks on an Alpha EV7 indicate that RC4_INT is
+better than RC4_CHAR so rather than restoring the configuation, remove
+it from config.
+
+CLA: trivial
+Bug: https://bugs.gentoo.org/697840
+
+Reviewed-by: Paul Dale <paul.dale@oracle.com>
+Reviewed-by: Matt Caswell <matt@openssl.org>
+Reviewed-by: Richard Levitte <levitte@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/11130)
+---
+ config | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/config b/config
+index 2213969f90..e39481ca2a 100755
+--- a/config
++++ b/config
+@@ -498,10 +498,7 @@ case "$GUESSOS" in
+ 	OUT="ios64-cross" ;;
+   alpha-*-linux2)
+         ISA=`awk '/cpu model/{print$4;exit(0);}' /proc/cpuinfo`
+-	case ${ISA:-generic} in
+-	*[678])	OUT="linux-alpha+bwx-$CC" ;;
+-	*)	OUT="linux-alpha-$CC" ;;
+-	esac
++	OUT="linux-alpha-$CC"
+ 	if [ "$CC" = "gcc" ]; then
+ 	    case ${ISA:-generic} in
+ 	    EV5|EV45)		__CNF_CFLAGS="$__CNF_CFLAGS -mcpu=ev5"
+-- 
+2.24.1
+
diff --git a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
index 8800d05fac78..97a1002fac78 100644
--- a/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1d-r3.ebuild
@@ -50,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-fix-zlib.patch
 	"${FILESDIR}"/${P}-fix-potential-memleaks-w-BN_to_ASN1_INTEGER.patch
 	"${FILESDIR}"/${P}-reenable-the-stitched-AES-CBC-HMAC-SHA-implementations.patch
+	"${FILESDIR}"/${P}-config-Drop-linux-alpha-gcc-bwx.patch
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/popt/Manifest b/dev-libs/popt/Manifest
index 077eba9551d5..66e5782b4fe6 100644
--- a/dev-libs/popt/Manifest
+++ b/dev-libs/popt/Manifest
@@ -1,4 +1,4 @@
 AUX fix-popt-pkgconfig-libdir.patch 519 BLAKE2B d31d6d121f745f208c743aed94c071343efd09b8396c777f7887e8931f87d4fd8e4fa1eff7ec340300a68ae67862cdd7bb05d6bd60e08289c406d3cc9f4ead6d SHA512 8862cb25283f38d734aa1abaa4d29d1f018718be77d03a4f0533b6b8b2518581abf277eefd3b3d56d5f9ab9e00b544e816e83fca6863e86a66dacae0f9abbfd0
 DIST popt-1.16.tar.gz 702769 BLAKE2B 37767ec50118f3675e8bfa780dca7989e092ea71c3ea1e1ab80d7cc13bf20a3b5f0681df2a7e0b1e3404404a0952f7b7f0135083d4166026dc26880a5a17ab3f SHA512 bae2dd4e5d682ef023fdc77ae60c4aad01a3a576d45af9d78d22490c11e410e60edda37ede171920746d4ae0d5de3c060d15cecfd41ba75b727a811be828d694
-EBUILD popt-1.16-r2.ebuild 909 BLAKE2B 193d2e0840610d16c20bf00ed3103c65a22a0c0129401030cd00a2f2443838675395a801de865f25e4718e676b0d3de1c6c65af9d0fe0e7014c8ea80f20fa588 SHA512 c86ff48c3f9bf3edc42bf464032979d394dca4c33415b5c5e137eb66a8417dc658f0c0687d459b20f2d8716dfd0a007908cd4b6ea05975a24355db68455cf09c
+EBUILD popt-1.16-r2.ebuild 875 BLAKE2B e81d5a65337c366fa0be509478c73e8d454042b1cc5a45dcedef12f284a057b6c2554055dbaa5e3ad79ea3c69ee63741450b67e041d7a40e34a2fbc1208394c5 SHA512 1a2c5d5301410f1f5804cf84337f0ae54dea2053783fbf1152e741344f4a86d599f7740225eaf859f7bc4900c2f160083bc82a2958947b6ccbcf913e069db47a
 MISC metadata.xml 263 BLAKE2B da35927a73cc22621ec3170a872817bc1f2e91967dd369f21f6543ce2a02e995eb654ab2c1209bae764ef194788828e00daf5d559d3a26926e6912838075dc7f SHA512 b25a1229f571493fdde40749d60d17d411676854bc3f73810e15edac8a2a930d3633f46a6f7f5a7ec6cf7f36b9ef690a7e03916c7c76869315f5ba1f862fd0f0
diff --git a/dev-libs/popt/popt-1.16-r2.ebuild b/dev-libs/popt/popt-1.16-r2.ebuild
index 1c1080243583..d3f03ec51fe2 100644
--- a/dev-libs/popt/popt-1.16-r2.ebuild
+++ b/dev-libs/popt/popt-1.16-r2.ebuild
@@ -25,7 +25,6 @@ src_prepare() {
 multilib_src_configure() {
 	ECONF_SOURCE=${S} \
 	econf \
-		--disable-dependency-tracking \
 		$(use_enable static-libs static) \
 		$(use_enable nls)
 }
diff --git a/dev-libs/ppl/Manifest b/dev-libs/ppl/Manifest
index bb4266f50fac..400cbbb384c1 100644
--- a/dev-libs/ppl/Manifest
+++ b/dev-libs/ppl/Manifest
@@ -1,6 +1,6 @@
 DIST ppl-1.1.tar.xz 14734820 BLAKE2B 2c96d86b534c7f06569bfe37d0ca1938b0c7c708b38d62e210d868db005275e392b2cc9e6dded7d4a5bf1e901136c298b0ff86d2933dc89b4607d5ef9e286b86 SHA512 ae0503fb3eac494fa3edf5d5c9ec61e2419e6e2fa57d30323f7d0360ff080b033686410c7462f5b2ff5514803451cb91e9c0fc14cf953485c5f5fd664448cc27
 DIST ppl-1.2.tar.xz 14136236 BLAKE2B 060b73384dac558dc8b2b0f1027ed0aa270b0adf0992c2ca1a281fa7bcdf959cba3a9e8ee29e978d12c3eee606b819075c5bcab59f4aed24fbf1c5512b5e2c36 SHA512 b509ed85fa6aedd40119bd4c980b17f33072c56c2acd923da3445b6bc80d48051cfa4c04cce96f6974711f5279c24b31cb3869f87b2eb6a2a1b30a058c809350
 EBUILD ppl-1.1.ebuild 1594 BLAKE2B 1ba5be59ce7903eff44c29b1f7da8961bc963c6eff3de09e400de35cb2b47f7a7f4a86f90bca84d1203eddeacf977089bac784a8b11cccb339a89fe84b1209e1 SHA512 3bb479007912a81237e37052077cc436fc6662ac5566ab8e69ac2897843acb79a2c78767cfcb37b90bcf3876ed9eb53f42aec362e4d697de5fd39c57cff38913
-EBUILD ppl-1.2-r1.ebuild 1305 BLAKE2B 59322ae53b8692ffbf0e19322790db29c669cbaa974a1f53330abdeafedc1b12b8ada729cead24fbc4ae8bacbfddbd47e2b58d4b3f6c9ed2fa45b9a5be513944 SHA512 aa9991b0c96ae26b59be875c3bfc36566bcf021cec2e8aa5bd158354f7158224dc4b847469532b8374718323f3d0a7f4c7150e5dba650f807b27c428c35d9ed4
+EBUILD ppl-1.2-r1.ebuild 1259 BLAKE2B d2189b47bb91065fde4312154a90782b4b889dea139eac446e798be6be9112610c3c62a3c36c3059c63a8a25b2d388c662273feee96f4392ed74d939e6862efc SHA512 78666f60f00f5b8376cca440001a415e167bfad549a865e0bbcadaeaca5cd4730b665b5c2ddad3c87a47e1d1b60b5fb6a753886130def75b486d239d484b0b6e
 EBUILD ppl-1.2.ebuild 1598 BLAKE2B 579d3a070b7f167bf8765933988818312d17adc5c03ef11e75f893ede5f4f482ee289bf8d1e493f89fd6ed3e341cdfbb1d0cabbc067dbf9f5325e425c0d45bc6 SHA512 70063616f31d2d1046962c6e57c8c869549d5adece4d4cd12c2517774841b3615b02f640b315c6746681ea67f0d01b727824b3a99e514d4741eaa0243907bb97
 MISC metadata.xml 354 BLAKE2B 77e58ca8f59039d9814e8388a7fa941fe88130fadd21720447f050f09cbccdf289153f15874c6f48cd7d8720841d181e4904e515df87c3a16fc8673283b41b4c SHA512 5f42b5399f8961160bd6ed9db93c11e2f7c7f1e750c227068fb828ac7519c927b55786d7cf60481d21813d48af51e7cae7e1c8baca12f8fbe6a1f4e701377a50
diff --git a/dev-libs/ppl/ppl-1.2-r1.ebuild b/dev-libs/ppl/ppl-1.2-r1.ebuild
index f522c2384bc9..12b2ca6d0371 100644
--- a/dev-libs/ppl/ppl-1.2-r1.ebuild
+++ b/dev-libs/ppl/ppl-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -24,7 +24,6 @@ src_configure() {
 	local interfaces=( c )
 	use cxx && interfaces+=( cxx )
 	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--disable-debugging \
 		--disable-optimization \
 		$(use_enable doc documentation) \
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index 65e9c2951499..7c7d4fda0ba1 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,5 +1,3 @@
 DIST qtkeychain-0.10.0.tar.gz 38488 BLAKE2B 229270158f08a17e391a68bb6eaf6a1924fd1e5caa9ba026e15619dd159d1514894000a74301a2f2dda706f0629b5bc06afeb38191700e834d412c9cff505263 SHA512 de35d1a39c717db5c8c3b8a59571e96ed8925836a7043dd9f236c284bf92de4875c4b53686ba73244bbc84b55a88d44316a16da3012e50cbc7594fbf0b1140b6
-DIST qtkeychain-0.9.0.tar.gz 35614 BLAKE2B b8fbcc3737808f8415f703cd92dd1f036fd6d1d83c056562e0142f67a234ddc29ad7f029ce9f520c8bcf179d8b99b5cf8b702ad010763956ff0fb8ce3f030934 SHA512 d8e7895169e9746c234a156e00edb939926d14da1a5eadab7cb1e67790958973bfd11c9c04c6fa5cf776aafbd0af40dcd50c683f1c80bef60d47d1465bb350df
-EBUILD qtkeychain-0.10.0.ebuild 932 BLAKE2B 91ec247f117241d8ae27897b73374a958ce0cf52750dd49344205adef858e3d7ddafc1b4b8a910b5e37391289bf8a35459015412f538b18e5eacd803a46e3890 SHA512 0341ff7bca49b5fbe1e8b6402fc06167be4b411d16ebdb44c9b7ff2dd3a82fb2e014d576bbf637481ff7137ffa21c9f49c98b54b15ffeae955aba8cf75fc2ebb
-EBUILD qtkeychain-0.9.0.ebuild 931 BLAKE2B 1f474cbb462ca859cecd2ea916fe6f701e189d8261aa8955f6af644b450fa8371c8875e7fe223bad760b0f674a04c6d679c49003e932cd3483dd73d19fe8945a SHA512 227b0b3d20de80a1ad2268c64ccdb1e1625b716e757f7c6dbc42fa6d1b6df67730bfcb12348012b33b8a6e4c5f79a8c04e0ba21bdd58abec72b0f35ce7893b7b
+EBUILD qtkeychain-0.10.0.ebuild 938 BLAKE2B 2b0251e751e81cc2d5494f1b0f7e309b5241ee68cdb60b32b7ec2091fb251b8319cd0cdb2112b425c4f8711cf7b0b311cb193014a576331deaebc8320c844551 SHA512 357938ed56f41518b4d872c528770e341fc456dfc573b5d326ac9f43368a85f9c8fbbf1f7c952bd219ee5c46f8a09ea3f2be19e62fd4da191765ea43fa5a7b84
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
index e8195563832f..e26facbfa95b 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.10.0.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Qt API for storing passwords securely"
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 x86"
+	KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 else
 	inherit git-r3
 	EGIT_REPO_URI="${HOMEPAGE}.git"
diff --git a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
deleted file mode 100644
index 3272ffda360c..000000000000
--- a/dev-libs/qtkeychain/qtkeychain-0.9.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-HOMEPAGE="https://github.com/frankosterfeld/qtkeychain"
-DESCRIPTION="Qt API for storing passwords securely"
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://github.com/frankosterfeld/qtkeychain/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="${HOMEPAGE}.git"
-fi
-
-LICENSE="BSD"
-SLOT="0/1"
-IUSE="gnome-keyring"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	gnome-keyring? ( dev-libs/glib:2 )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-"
-
-DOCS=( ChangeLog ReadMe.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_WITH_QT4=OFF
-		-DQTKEYCHAIN_STATIC=OFF
-		-DBUILD_TEST_APPLICATION=OFF
-		-DBUILD_TRANSLATIONS=ON
-		-DLIBSECRET_SUPPORT=$(usex gnome-keyring)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/dev-libs/redland-bindings/Manifest b/dev-libs/redland-bindings/Manifest
index e143bfd1955a..5a82c484b01d 100644
--- a/dev-libs/redland-bindings/Manifest
+++ b/dev-libs/redland-bindings/Manifest
@@ -3,5 +3,5 @@ AUX redland-bindings-1.0.17.1-php-config.patch 1184 BLAKE2B f22aac3f4753f11c1473
 DIST redland-bindings-1.0.14.1.tar.gz 792557 BLAKE2B fac20e9e2fbf9a4ea7299ef0b4a656ea3e5f1cbf436cd31c80e81be40dc95e074e557925b32ecf24091ce3cfe882d681318ae8402e14baf1e0966ec8a0a892ed SHA512 5e037a96f857c95bf4b9277d98c7de1fa41c4ba7e49e199eeb516458343587c796a10e857679c889406b22bca8617828a2bccd07c31b73f2366cdea39cefad15
 DIST redland-bindings-1.0.17.1.tar.gz 933290 BLAKE2B f58524c30958200af1fb3ec0f63b8aa9f3fd2120297321299cdd225ff9eb331f385c4418ed25987b955857e5046b5c6f0589210b807aae0dc6abe0b758d48cfc SHA512 c105d1232555d226d98efdc1e4edc1b6c953fdd004804e40926452b8f91d30159319a50af68fc3cfe242cf180d85383ef3ff925cc65ed5d0652096cc51f4d7c0
 EBUILD redland-bindings-1.0.14.1-r2.ebuild 1332 BLAKE2B 5d77239fca6df79e8568b3c40c01b80b93c0e654b0a5eccef701ab98e4dce990f9abeeb861fabbf99a6b9a5cf7beb9caae5d77875a955ce157cd05ee5da2f492 SHA512 425f2c8986ee134e7e6649e915616e2c17a0ab583b70459ebc0280c6321691dc4d6aa7c61fa568ff024ba9811408b00c551cbcb376c90fee32de7796aa71bbc2
-EBUILD redland-bindings-1.0.17.1.ebuild 2653 BLAKE2B b3ab9239ec293e96940efc94ff0a1d0e9bac9d7067b578870642d979d9e46363f7d4099c7051149bc191f64810cc741a50239841135379fb9276c6d33b8627fb SHA512 90c5e62338df3c1918f234256428201fa548387a4a9f4ce652a878a1ba8d28eeb10418048a147a172ea55aa9eabddb40705bc6b5dffd1f200427dc822645dac4
+EBUILD redland-bindings-1.0.17.1.ebuild 2654 BLAKE2B e2d9817c25e7830523064b5306b8cc286f4e78a417657cb01bffe754b2c61fc8e637c98ff2d345a3e9d570cdd6cf6116c2e7808261b9248237f63c15f55bad70 SHA512 f3d22574c9d826766c51b9964ad71b0a77d5fc0586061953de19d9cada5b81c270772a31a1db2cf8d7a08538844157cbd3cff60acc90852810dee654b3c70011
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
index 73d8c3bf66ef..f4203f58c317 100644
--- a/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
+++ b/dev-libs/redland-bindings/redland-bindings-1.0.17.1.ebuild
@@ -44,7 +44,7 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
-src_prepare(){
+src_prepare() {
 	default
 	if use php ; then
 		local slot
diff --git a/dev-libs/redland/Manifest b/dev-libs/redland/Manifest
index 4540cef66e2f..616205051972 100644
--- a/dev-libs/redland/Manifest
+++ b/dev-libs/redland/Manifest
@@ -1,3 +1,4 @@
+AUX redland-1.0.17-mysql-8-my_bool.patch 462 BLAKE2B f1a34d640698149b45a6a23c961690c79c02760b16c1087a79c27e8443cb956e953b02f9d435176c890500e4942cd37fe2c0105295490a3f4a629a651146fe33 SHA512 c796f5b6a3231a150310a889890137a7dd510cc75c8b80fead9db3c8fa4de27a132c58ad261188a6c6359f1debcd9b5ba273b7af4af3242035d4f6bc12364643
 DIST redland-1.0.17.tar.gz 1621566 BLAKE2B ec94cd456a771b97ab16fab63cf6beffe1ce3371c06213faa49162fe452b31a21dffe6c2cc631c10b137f44dc71c2c40c1d7fac0552bbe0169728427b1f47a36 SHA512 363323ffc9e75d4f0e3a3b40952f6241fd0d8b9f46bfd4dd86cf0a5162de35257a8b70ce408a6083c03ba7c388982231a3774e5e9024b262ebb02968f778b850
-EBUILD redland-1.0.17-r2.ebuild 2477 BLAKE2B 520c40d5ee3c03b58cf67de5971659222f94cb197548c141975927a8a9b7c118df75747be97264f69a5cd7d095105a9f4ec9be3a3c96fb75abbd5cc2d173d72e SHA512 82d6518cf23d62e6e36ba037a4273b61d249b3a3fa9f83ba162931105e78258dbec6a036622a56f6c585b1fad7c408794e3d24fe0dd6a30df897c19f396d3959
+EBUILD redland-1.0.17-r2.ebuild 2539 BLAKE2B cf1d63c4f19af85004f7a3216ce866a94ae4c5a1e3ae75b96f6ee802803e490ee8863e4bfe19b38d8b138ddabb61aba4af338a74f393ab5b3fd32ac7b5c5c6d0 SHA512 c2247f6fd0baddd089e380849fb9697c262f614b39bcaff796a91d9d00ecb65ca8a4a8e116be2d8262cdd9c72da8e4389c75d79fff2370e38936c8a511bd5c26
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/dev-libs/redland/files/redland-1.0.17-mysql-8-my_bool.patch b/dev-libs/redland/files/redland-1.0.17-mysql-8-my_bool.patch
new file mode 100644
index 000000000000..a59c456e84ff
--- /dev/null
+++ b/dev-libs/redland/files/redland-1.0.17-mysql-8-my_bool.patch
@@ -0,0 +1,15 @@
+--- a/src/rdf_storage_mysql.c
++++ b/src/rdf_storage_mysql.c
+@@ -445,11 +445,11 @@
+   /* Initialize closed MySQL connection handle */
+   connection->handle=mysql_init(connection->handle);
+ 
+ #ifdef HAVE_MYSQL_OPT_RECONNECT
+   if(1) {
+-    my_bool value=(context->reconnect) ? 1 : 0;
++    bool value=(context->reconnect) ? 1 : 0;
+     mysql_options(connection->handle, MYSQL_OPT_RECONNECT, &value);
+   }
+ #endif
+ 
+   /* Create connection to database for handle */
diff --git a/dev-libs/redland/redland-1.0.17-r2.ebuild b/dev-libs/redland/redland-1.0.17-r2.ebuild
index b106ff79dde9..78f47b1290f9 100644
--- a/dev-libs/redland/redland-1.0.17-r2.ebuild
+++ b/dev-libs/redland/redland-1.0.17-r2.ebuild
@@ -25,6 +25,8 @@ RDEPEND="dev-libs/libltdl:0
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.0.17-mysql-8-my_bool.patch )
+
 MAKEOPTS="${MAKEOPTS} -j1" #500574, required for both src_compile() and src_install()
 
 src_prepare() {
diff --git a/dev-libs/rocr-runtime/Manifest b/dev-libs/rocr-runtime/Manifest
index 2cbff3ffae44..1b0b41d4381a 100644
--- a/dev-libs/rocr-runtime/Manifest
+++ b/dev-libs/rocr-runtime/Manifest
@@ -1,5 +1,5 @@
 AUX rocr-runtime-3.0.0-cmake-install-paths.patch 2719 BLAKE2B 66e262fed83f839d87e3d31658ac7373bba7d6985d0dceecdc9d34a4734a5aa877007aa6f26d1ee9bbe8c3d232eb22b5dd98379d67c89e3e94a95c1d2e29c3be SHA512 d5ad7aa6d6531616448c131817cfc41044dcab0bb71baf5a49819996370ad8d9bf239132b54bbab1650634a953e05ff3aa5f6ee300f2aba14a70e74d3c44bcfe
 DIST rocr-runtime-3.0.0.tar.gz 327908 BLAKE2B 0d95ecc22d27e470dd46f02aca012c59e8d0b0bd76de21133a1198d2daa75547600d95ea6c3a3771da36ce3fdf5e197b40ff68543b71adf36d33079a9d9496ab SHA512 e1a1eeec67bca02defc6f502e94dab71e48833737cc0f45552781c5b0cc36bff9147b2c477d6c2c3c9bd25654569ad1d91cd06aa81fcf412657a489cb56c5674
-EBUILD rocr-runtime-3.0.0.ebuild 955 BLAKE2B 41d814de38950b018c3537725e8bab60b0e426bf63f7e8759c3a5c13c7f71cf289c83c92de63f7dc0b5cf48d28a5d44b6ce3e23365a3eddd32dd5ad08a235219 SHA512 0e4401b7c91bbe678be49aa1aee9f68d978946fb3ba021aafd4136837ea91dc76aae98dad7330d37d7e1d49cc87f49d318fb376cbebe896ca18734ce7346d6f5
-EBUILD rocr-runtime-9999.ebuild 890 BLAKE2B b92632162e54ec641d958a7fbdcd6019fe677dd0904ea4781b85f0bc47e3e68d35b8c62a29cccebaa9795f1c72a6132cf5e0af371f6e359e6c3ac6322e763f9e SHA512 f580ef94b771e601ed4a4fccb836acdaa9a90faf1cf10b4dbb467dc0bb19f3066e4a626fa31cbed45da832bafb56e9cba2f5b7852369e94d4bed678d6912af11
-MISC metadata.xml 720 BLAKE2B 79e9a058e954fd4d4d7d3490f5cda3e157ac772ca9dcb973d14bae4cfe572de2edc4f6b36c8ec1803632dfeb30c734552566ed1100d0ef89c74fa7386baadf3f SHA512 3a13dc340357222fbab6e417c63c83905c3c5fb9aacff18097ba954eae0cca26e752749dd0da031658de5ab96a30528775ee55403b09b36b17c98f108bd6c1d1
+EBUILD rocr-runtime-3.0.0.ebuild 957 BLAKE2B 45bc4d6779474edae379f8bfcf0f042eb98d928ae306371c485fbae6b641ea3f2be1a7748cb5837c3e8c8af7f9420ac9ca8bfa10f175362cbd9ec6231bd55821 SHA512 75335a26cc5a5e0de8218f2408bd19668480bff0a609b9af536e7a23423bc28fe14ff8885a27928891b6d259d5eea73ebc7f2e0a798e69380af0f3cc4f785acc
+EBUILD rocr-runtime-9999.ebuild 892 BLAKE2B c938e361a2b3ef16679e930c9869f25ab0aa720e5e9eedf30594d2f12a9e146170c4ad8ca525824c56e99ed7de01b30348eafc62a6e7664bfd348fd14e1d5638 SHA512 f4abede180c99aab95038ca9bb5c721c9c6ea4a5d955d20c997f86cb51eb403f8a45e9c4ee32ecd413f16f9fa701ae36b4576f783a7ce58f69975a79ab4eef5a
+MISC metadata.xml 721 BLAKE2B 6a608a5a2063e626a9a39bf775ad840442cb797d07ff933b00ca763c11b024cd07a552dd0620b46bec7f4e8b7c608e898047822bd6e4b8e8716c2159a4e4eebb SHA512 71cd9916573d9b575cc42db8c878a27922e005fb31096902c1fb59537ffc9f84f23be8d8b4f53f3855e815d86d81e9012f4128fe4bb7d71490a8aa36bc9a444b
diff --git a/dev-libs/rocr-runtime/metadata.xml b/dev-libs/rocr-runtime/metadata.xml
index 53844ebc13ea..e13e7321708c 100644
--- a/dev-libs/rocr-runtime/metadata.xml
+++ b/dev-libs/rocr-runtime/metadata.xml
@@ -16,6 +16,6 @@
         Radeon Open Compute Platform Runtime
     </longdescription>
     <use>
-      <flag name="nonfree">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag>
+      <flag name="non-free">Enables HSA image support using <pkg>dev-libs/hsa-ext-rocr</pkg></flag>
     </use>
 </pkgmetadata>
diff --git a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
index 15d5461b129a..d6ba469a09fe 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-3.0.0.ebuild
@@ -23,11 +23,11 @@ PATCHES=(
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="nonfree"
+IUSE="non-free"
 
 COMMON_DEPEND="sys-process/numactl"
 RDEPEND="${COMMON_DEPEND}
-	nonfree? ( dev-libs/hsa-ext-rocr )"
+	non-free? ( dev-libs/hsa-ext-rocr )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}"
 
diff --git a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
index dc116fe5ed4b..29470ab6f6d6 100644
--- a/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
+++ b/dev-libs/rocr-runtime/rocr-runtime-9999.ebuild
@@ -20,11 +20,11 @@ HOMEPAGE="https://github.com/RadeonOpenCompute/ROCR-Runtime"
 
 LICENSE="MIT"
 SLOT="0/$(ver_cut 1-2)"
-IUSE="nonfree"
+IUSE="non-free"
 
 COMMON_DEPEND="sys-process/numactl"
 RDEPEND="${COMMON_DEPEND}
-	nonfree? ( dev-libs/hsa-ext-rocr )"
+	non-free? ( dev-libs/hsa-ext-rocr )"
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/roct-thunk-interface-${PV}"
 
diff --git a/dev-libs/roct-thunk-interface/Manifest b/dev-libs/roct-thunk-interface/Manifest
index 7afe53c56058..412d1e9da9c6 100644
--- a/dev-libs/roct-thunk-interface/Manifest
+++ b/dev-libs/roct-thunk-interface/Manifest
@@ -1,4 +1,6 @@
 DIST roct-thunk-interface-3.0.0.tar.gz 2685769 BLAKE2B d8ecf26113357a2a400bc1f2d4b40e38f2bd1bd5ac2c77c189490df9bcc7864f8357c262ad62d6cbf0f62f41edd9e09f5b75ce1e66f3a589d143a3883942a12d SHA512 18756a626d57255cfdd03b38dbc56769e4e28dbe1b00cc1e3d99a39dcd943bafebedc1774c76a191cdaf83b2bce4ac464dc97cbd088894447afddcca50447e9f
+DIST roct-thunk-interface-3.1.0.tar.gz 2688973 BLAKE2B b372e12ba5795a0f1e85f7c904059fbe71e147051f287939aacb165c6ca3068e59694c891e3ebdec945e494df4134ca6e4595e7b00893479387d2326b9af5b13 SHA512 dd63d097a42c8751846a1c5649a9c35c0d5e5dc68b1e8080cb6e333f787851ebc649c36d952aefbefbf9558c914d55c612800e85620b24676d7d2d7454bb3490
 EBUILD roct-thunk-interface-3.0.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
+EBUILD roct-thunk-interface-3.1.0.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
 EBUILD roct-thunk-interface-9999.ebuild 1095 BLAKE2B 71b41207796c16c954b661751fbfbca92e7a6f9321856bf31c396b36b6d8f0dfe7fa01e62d925745dd9af97c2237e8edf4c5c1c694f2b4a44b1498d127b43af9 SHA512 7c85eced9cfd69756f78e31f8a30aa1dd61cda6486bcf3d7d12e2bead090f0f33ffa78004cfda56fb804154e160e066c8c18ebd14ec9a3fbfe6b3081d9436224
 MISC metadata.xml 742 BLAKE2B e4bf5b17c7add51f1fce354e5b68d874808e680e3dce8e514da738a0fdfb8a26076f76cfc5c8091bd11f7ef4576e2d45334590f20f899865b8c984406892b1a0 SHA512 7d0b104b201778561f5e0566c28f593abd8a9c05ea1154a7d58bebb135f15e86cf6dd7f98f9fd5059b054ffac1d64a86404743f7c9bb1a619431f5e911a233cf
diff --git a/dev-libs/roct-thunk-interface/roct-thunk-interface-3.1.0.ebuild b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.1.0.ebuild
new file mode 100644
index 000000000000..9ec113c78ebe
--- /dev/null
+++ b/dev-libs/roct-thunk-interface/roct-thunk-interface-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake linux-info
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/roc-${PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/ROCT-Thunk-Interface-roc-${PV}"
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Radeon Open Compute Thunk Interface"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface"
+CONFIG_CHECK="~HSA_AMD ~HMM_MIRROR ~ZONE_DEVICE ~DRM_AMDGPU ~DRM_AMDGPU_USERPTR"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="sys-process/numactl
+	sys-apps/pciutils"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	sed -e "s:get_version ( \"1.0.0\" ):get_version ( \"${PV}\" ):" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+src_configure() {
+	local mycmakeargs=(
+		-DCPACK_PACKAGING_INSTALL_PREFIX="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+src_compile() {
+	cmake_src_compile build-dev
+}
+src_install() {
+	cmake_src_install install-dev
+}
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index a035ccb49d3b..48a8382581a0 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -2,6 +2,6 @@ AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1
 DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd
 DIST spdlog-1.5.0.tar.gz 270416 BLAKE2B bac6c6650f8347458dd2dd66f318b43a769b0896d68f6a6f1310754527a69feaa52b2f6f48d67c7e811c2dafa5d3863a9a07c738df8c12abed2718fb06254b28 SHA512 78991c943dd95af563c4b29545b9b5d635caf1af5031262dde734ecf70c0b4ae866d954ee77b050f9f0cc089a3bc57ee9583895e51cb00dd1cc6c10ff905ca34
 EBUILD spdlog-1.3.1.ebuild 810 BLAKE2B 7f495e88a4f8bd7f7818f22f6addaee6ed9895b7e9fb740eb2bd0bd6a0faf348f64a8259f7422ba5c0c31eda4840d31abd2971b1dd8cb79655664518df7a8305 SHA512 629167cf132eec58078359c08198afc6c67ce7c2e8049248ca9e5780a81b02d489c059803fcfb913c3cb638e4aa91bad07049dc67e6430590fd4131a996b6a5e
-EBUILD spdlog-1.5.0.ebuild 913 BLAKE2B 1f0b536a67333e5d86ad9434c66323f5571e150b232c862a0768b32aa1da731ca58931cb1d548e86c3c52ac11feda5cbe4bec3a93b6850a4acf0b7a2694dad9d SHA512 3c8870bc75eec1f8e9378cea9ea6f8fbef529d50a5a84e1c52a82312b5d92af97f51d6fce683aba4fffd54620a387483e50e473b2368cad69431427ac556334b
+EBUILD spdlog-1.5.0.ebuild 925 BLAKE2B 56768dd167a3c34ac4bf677e3a9eb8e5ed512323c6e2d451f71e7d228ebcfec1e0aaecca628f3b1e6a2a7e246e0828c1b331ac221a4f1975cd0317dea86a323f SHA512 b3e01691f3c64409dc155ab4baa4f9a7a9b7076a22b905f69241cc58edbabf797ab35a0bd73138fb1b10c5ba897099820ff378917e47b6a4952b3f88cff48b7c
 EBUILD spdlog-9999.ebuild 913 BLAKE2B 1f0b536a67333e5d86ad9434c66323f5571e150b232c862a0768b32aa1da731ca58931cb1d548e86c3c52ac11feda5cbe4bec3a93b6850a4acf0b7a2694dad9d SHA512 3c8870bc75eec1f8e9378cea9ea6f8fbef529d50a5a84e1c52a82312b5d92af97f51d6fce683aba4fffd54620a387483e50e473b2368cad69431427ac556334b
 MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c
diff --git a/dev-libs/spdlog/spdlog-1.5.0.ebuild b/dev-libs/spdlog/spdlog-1.5.0.ebuild
index 060e167a8afd..3327a764a463 100644
--- a/dev-libs/spdlog/spdlog-1.5.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.5.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	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"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-libs/svrcore/Manifest b/dev-libs/svrcore/Manifest
index 98791ab37683..2606e2e0a2cf 100644
--- a/dev-libs/svrcore/Manifest
+++ b/dev-libs/svrcore/Manifest
@@ -2,6 +2,6 @@ AUX svrcore-4.0.4-gentoo.patch 3063 BLAKE2B 1ab4e7eb0dab6990ca7d2c85ab1b05d1868c
 AUX svrcore-4.1-gentoo.patch 3066 BLAKE2B 0acdeac026704f78470289025500a4a8da17d871eb820961aa991f3c230dff0b72f87bc1b769e58c44c72a694e393b16e57b0926b4b63c966c406519f9104ac9 SHA512 f5a16cadbef104c5658176e3684cd0de03245b6ded86d14965d7f98e2d2c65e4eba43d0630199c8c6f18f922302027ab856d1c96f592cbe79207cc327db786ab
 DIST svrcore-4.0.4.tar.bz2 217076 BLAKE2B 1d5b1c6d397552f299554a19c21a81d1df8f449480095102d46bd2c9db8e4b667302f06fd199579dffb854f47fcb6f6ba54d505e3e6d3ccdfcf54dca07363f81 SHA512 4a63e2618ef8f508e71adf212eefae56e3c9d9898b924f405399bb99793de57bd178a3417f9e837c474e7960b6eb8a3cbe775b420c8fecbd974e89b4196b78fc
 DIST svrcore-4.1.2.tar.bz2 263891 BLAKE2B 4d546406e18099857c1d77d479123332bdc721b51f5ad6bae74812b77704d3d6f8fa2ab67848355be7050fc3ee161c534fc7ee1692811fe9829da513f7cba29e SHA512 9d148ec9c568f1183e44006fec83b4e43b0cef56d5a04fce122fab1e9a0c0bfe39919de81c5a4d7adb2258fb7f16b4d327da20cdb4d948810e968c422d62ad40
-EBUILD svrcore-4.0.4-r1.ebuild 810 BLAKE2B 4b5628e4ddab4efa8a1973fbeda6c28791ec1a52e16fb11c5157dc205d8fd7439bcee46c23537976312e7c57db174fa67ecb03b224eb5932c7495af04a9545fe SHA512 86ef888b06b3911e5c9dfdc06df9db13ad9051d25f837bf71a912222eb2bae9e300cfac2a3a05c0d25d02397f2e691a92017a924e1c71b7e9ab70fea685ca213
+EBUILD svrcore-4.0.4-r1.ebuild 806 BLAKE2B 34d2e7ac6d7993ad4f63a13b1e13f031983302174db2115470a920641d2bc0440c70756164ec615c5a593523d0b22ea1b040f8f8a726fae2301c7c74cd305cf1 SHA512 674455d227bf2b97e87586c1b64883a8896c7af7ff41b4c61fec9524fd7067b03cd19264a43aa79536d6ef3ec544529ca4adc86e3d6236f62d6f1c6000ff7bf6
 EBUILD svrcore-4.1.2.ebuild 692 BLAKE2B d4a2ef8b78ffedc502a6a666dc16fa555d5d012aedf7362da87f6b4092f7274a00d3c06d643919ac6532e3700265ee244c0424a000c73fd41394f50c5041ae33 SHA512 105c0e603d9acace34ad5ab9705eec19822cedfacc85fca1940409d652a2bb3eb1621309f690efdca8705ace076ae0e45d63f232da4e6e98d31c3bd21dda103e
 MISC metadata.xml 168 BLAKE2B 95e3160d1d6abb3e5510581fe45ddcd9ad526f89bbc0d3ad226e2782d148a0c71e50426809a87fb45e6fc9356e597a1d271002764caebc79be8846301eb82d5e SHA512 5edd6cda32972ff5e53cf5f883928bd1887b4a45572657f99101284a909ea04ff906b8f4068d247d1b3367bde813dbb37ba11565aaff880d9b500685b0f5a33d
diff --git a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
index 86751402c273..9b17ea88d8b9 100644
--- a/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
+++ b/dev-libs/svrcore/svrcore-4.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,7 +28,7 @@ src_configure() {
 	econf --with-pic
 }
 
-src_install () {
+src_install() {
 	default
 
 	# cope with libraries being in /usr/lib/svrcore
diff --git a/dev-libs/totem-pl-parser/Manifest b/dev-libs/totem-pl-parser/Manifest
index 6fcfa93d8eaf..fb4953bd616a 100644
--- a/dev-libs/totem-pl-parser/Manifest
+++ b/dev-libs/totem-pl-parser/Manifest
@@ -1,5 +1,7 @@
 DIST totem-pl-parser-3.26.3.tar.xz 1314216 BLAKE2B 24b1c7e111456b454022ba7262a1e1483420dbd97b6ec99c0e2631acbb8057134b51ff991d2619e6bda57da6c133e211f949915b0fd62d497905fcd58738b43d SHA512 f059fd9447627268ce5029ed48551b0a2b6c30ba28c50a360d37808ad63fa8423824eef29c7f4d7a752f24861d4c7a7139f321fa2e19085085446e7ed15130cd
 DIST totem-pl-parser-3.26.4.tar.xz 1314800 BLAKE2B a069a7b7c394ab5686e827804dd13df06c6af7b8e515e0a0f5023919ecbf720eb8d52643e35bfb99ff4474e67332e072a3c832ef91232bb4108f282b0bc84bce SHA512 afb02a7c70f2fda9cda67b9daa8bab5f15e68a4afd983fb865fb29de71fe8f5c8fdf716e714e3835ac1c3476ce188c6147924a840c4ba82f0c05c3d3c23f5173
+DIST totem-pl-parser-3.26.5.tar.xz 1318700 BLAKE2B 18cea2edff1206ed9c77ac07fb018da0c9bc5550599b45e363d745166f4828adba6a2f77b763602af011c0a12e9f1f9765402fbafbe097fb69890ec7a9520825 SHA512 ce110d92f60da328272a8135a57ba60785ea4bca1fde3703a734969e7ba5b382ef19dc3b8930a5641d8f8effabf627f7e9b2727ee94e69e6144e0f085079e14d
 EBUILD totem-pl-parser-3.26.3.ebuild 1930 BLAKE2B 840f460efe1d98b7778751a6eb5692ffbb2609089dd74269e1a8f578a7dff0e5402ab8d2690c22c6a6dfc1ceb3863c9038bd244b6f26f0ebb560754410389dd7 SHA512 adaaba47806b4d525f8920684dfc7baec49eb8ffb11e1d7aa745f761b3cdc6ec28187d0315079494e22fd80b606d4141e1b09b852ab3c0f724b3358c32053592
 EBUILD totem-pl-parser-3.26.4.ebuild 1931 BLAKE2B 916390568d34ea59f518dd0ecdaac198a37695431c521ca2513f8a6331b833a8796416d67a726e15c0f804b48b965c42f77c004e1742d351ed30def8b77c0c3b SHA512 92b72748ba77d440d7fc395c91b4ed9321d5e3296399d0874aa7d469666cd5c9bf89b43934bbce170f16d127c3a483617aad72fbb0ddc9170b9ee8e918502571
+EBUILD totem-pl-parser-3.26.5.ebuild 1933 BLAKE2B 72745ad96c7f8e072d28a81041d1fbbb1d7cb67421dfe387e69286548fc45e2042220a2dad4a18234fe5e12157abb19d508564a94f5dcf7f0617fd79df832463 SHA512 7aa9b7d27de83942e49452e7f6ff83edb28c64d8bc2ad83e7386b93b3f8efc19e6452397e14f7820d600420703057038dd32f02590b7e65e465c3afb401ea433
 MISC metadata.xml 522 BLAKE2B 733f895375a3a264b84359f121bf92fd602b62eb562a37e5c5cf8ae7947e8138b32067d276cdc13f7a98f8941130fe93f0a5cac7d8f02ee3238ea7ab5cae4266 SHA512 07c6a9bf474a64950ba6e557b3df879e9c8399c0b09a9e7f585821ee540ea40b7459ad8b7c3af728e8201fbe50193417b3298f186c9caedb1b89b538c7c70206
diff --git a/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
new file mode 100644
index 000000000000..353b21ee7b05
--- /dev/null
+++ b/dev-libs/totem-pl-parser/totem-pl-parser-3.26.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 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 +quvi test"
+RESTRICT="!test? ( test )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.56:2
+	quvi? ( >=media-libs/libquvi-0.9.1:0= )
+	archive? ( >=app-arch/libarchive-3:0= )
+	dev-libs/libxml2:2
+	crypt? ( dev-libs/libgcrypt:0= )
+	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-quvi=$(usex quvi yes no)
+		-Denable-libarchive=$(usex archive yes no)
+		-Denable-libgcrypt=$(usex crypt yes no)
+		$(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/uriparser/Manifest b/dev-libs/uriparser/Manifest
index 81973ce99aab..64d563f6568a 100644
--- a/dev-libs/uriparser/Manifest
+++ b/dev-libs/uriparser/Manifest
@@ -1,6 +1,6 @@
 AUX uriparser-0.9.3-tests.patch 724 BLAKE2B de0681eaa68e4d846853d58804646c2a528f9a2be9bf317111d4b54521fa07fb6834df375c512c8bfa2b48832591706c01beedead9f1e199df5df3526606a205 SHA512 bde6f137503540dcc8a84eba2f97b8c21244d1d0dbf132b9bea07430e615804c4ad639663497955dc97e6bb8292bf2f1ac87b349dbbfc04f6230ce82b8077c17
 DIST uriparser-0.9.1.tar.bz2 372722 BLAKE2B 6fe21d1f5a98564f3e08094b1e27a13ea00baff3c4e09645236d8b08cba5455d49862a2d66fec02057efbb3b3d2e36040aeab31630f516eedd1ef36c84211638 SHA512 c6a4f3b737d4c53ba14148a5be363d93947c8c32755b369726ccdd6e01e8a2293d2c94d448700fc97bb56092696b67965646ae07c9ef31be253e2279d0bc3821
 DIST uriparser-0.9.3.tar.bz2 173073 BLAKE2B daf4d4ef2801850b8b4b3622ec195c7bfdc105cca085ea4a9d3ed9427bf7cf2eedcce4954b679a0ed1a79b7c57c98a1998b0cac27bd2b1de540aa79fdd4b160d SHA512 424419ea7b5f945b37ea06091d59e731c6a7ee76e7998f8a4e598036b3de8b593d62d1af6c6ddc7c31b43fc6795d4a5fa8d50da2508ca19de100a2222106fa3e
-EBUILD uriparser-0.9.1.ebuild 975 BLAKE2B 895468ed4daa08600ce4b93f42f4e891ab125a687b2febe79c02a74b683b337da3f3b77897b69ae2f839a06f29c1e52179c5edfea228e1814bc9104b729d8054 SHA512 12a65f12912213287a5ddfa7acfaee0de6652812371a8a9d1500a7a9f2f2d9f40e2573dc8d87b9f3a6de4a109db04c9efdbbec2d2d42a2b355fc2486787a80a3
+EBUILD uriparser-0.9.1.ebuild 940 BLAKE2B 0c3b4d638419248d19cea2a00f20391019d62761a04feaba8aa644afa7578d555de3ca7f849ed5e8c1732714f8610c0647e824a02772e197f53f3b39092823cd SHA512 277cd3aa28ace11ee9963ef809c364e8faa5680a438d8fea5d13b9288d9b65fd4a879e6bf96cd91be71d91ae789f81101f21bae7eaee4e2a26424770db285398
 EBUILD uriparser-0.9.3.ebuild 1210 BLAKE2B e5de6e838c817756985b67c567328f90bf3bd9a79151db76bd57d4ab09bff0bf620437040c3eeb1b91946e0b34f9b230a22535b4b6bf029ad52c1803aaa884bb SHA512 7b1f78fdd8d432972f5e1b52ffdcc2629b437bf7d826d940f065ba91d8c2a0b65b567af4ae0995a2022e003dfce5ff2e6a976f12a79b4d0d10b8dfb847c01196
 MISC metadata.xml 542 BLAKE2B ea02a2f11456940eeab83ac904b7b8893c0c41428161f0391eeb9aecbeb51f7d22ec215455837932f0a2b193e937ce41290d5e795ab0cc434b23e13b37dc7146 SHA512 6798e6f833cbbb1ebd80cf04bc5950e5bafd8b689d79211a0a778467b9785b18720918b1822106dadcb96044df2ec8f681c3cda049b1bf3ca1fa072f409dfc45
diff --git a/dev-libs/uriparser/uriparser-0.9.1.ebuild b/dev-libs/uriparser/uriparser-0.9.1.ebuild
index b7f5ae2164e9..e5976afb480f 100644
--- a/dev-libs/uriparser/uriparser-0.9.1.ebuild
+++ b/dev-libs/uriparser/uriparser-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -28,8 +28,7 @@ src_configure() {
 		$(use_enable test) \
 		--enable-char \
 		$(use_enable unicode wchar_t) \
-		$(use_enable doc) \
-		--docdir=/usr/share/doc/${PF}/
+		$(use_enable doc)
 }
 
 src_install() {
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index 1f17f4cf85f5..a33f9c56eb3b 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,11 +1,9 @@
 DIST vala-0.44.11.tar.xz 3370248 BLAKE2B c111b6175e6339148e30bedc77f62a9ef3ec912ad0621c9303fc5dba31694173b49ccc433d3681303d64a1e442ed9b7b064f27931369cb13fa028bfc25ffa3c9 SHA512 6111699039ed37084426d7603b82dfa9bd497c66ba7353ee22e8541bf15a2cbb634d315593c093f18c20bac877ae34884e5b570cd25237ce12aa73e941c4c540
 DIST vala-0.44.9.tar.xz 3363004 BLAKE2B b87f8f7d9cda5a77486720b8c542c42ed448cfbb6a1bae899591a799dcf25882a0539c3acef282d0ba42a7ea78d68e7a5d99aa4daa306a70afe6938732d03c25 SHA512 9af559a6cb1680013886a4d425e619503d60394f2c7b1ab897cc7830ee566f8122dcd4380b78b551fbf556cead623c245adc1f7f3357b8315be8c120412a3e9f
-DIST vala-0.46.5.tar.xz 3375148 BLAKE2B 22bf169159d4f4e23398789e46c39d98a7727cd02e6539104963d34bfe569bad25338b3455ffd32413a36f5cd6061a29bdbbdb275f225f1408d6b34967b64a6c SHA512 eb1763d9c4bfe74441640f7228d44ff7cfd9a379b24b8aa906bc59be4514b319598ffee616d3de1db101134bb163715f33dd1d7a0a10ec03246c7ccf62a4778b
 DIST vala-0.46.6.tar.xz 3383032 BLAKE2B c7f38cf617f3a0d5a5915ebedd320ef6a5c3714e21618e95756529e1fb09abc12417f31aeefc0111e828da5c2dabd6195b07bb1cc69c6e74f73d72fe7403637a SHA512 ab24c3ad37af62e38289fd085a33f72e178e0b58c1f24c27c58c1010270a4b0e5cb4cc510b6147c51e5796a7ae63aed3a4ac219b24ff985f2546e25c9ad48992
-DIST vala-0.47.4.tar.xz 3408516 BLAKE2B a531bc4698aa40ef413bc0a139225130f8d82bfa2b890ed33e1993203c9c48c345e10dc15bf8b86a0542814a8a41cad330ce15322e68936b6e6b8c31a3516824 SHA512 96d2453ababcb64db7db754a33e0f2e9d60f831a52c39bd086191659efa5941989bdc35b677b992524860f129d28fbbe8e3071e893991b8c8c21d6948d32377f
+DIST vala-0.47.92.tar.xz 3422564 BLAKE2B fe204b23f2dbc1bc65641f6c49dd1e0be6ed11bf4a6bf099937b366620247cceb71de231ec3dad426c45e3e72de636ba937fa40e943bc8f9c1f2edca69f5584f SHA512 f5c9342976da04f1145425a1d27303f0fe0ab1c5da8261d813345a9baf375e6f2d86d2a551ef792d58a9ddf7ab6a6acbfae14283a2b0ca7a03f21d354b44675c
 EBUILD vala-common-0.44.11.ebuild 650 BLAKE2B 604da5d2688c5dbf4dc78514e69763c54078b68ff55106a5da1759ecbfa4200af0d2580a634fe14bb2f24b5c610d30e19e9105bcab948cde1182b96e483cde66 SHA512 31fd462880ff542d9b27b02495fd66372ec9b7e13f761cba32831bbab8f27e33fd4e844ac75c7fb6f8abe94f37a330f4b2baa1cdee74585e1473f2e0a12a53ce
 EBUILD vala-common-0.44.9.ebuild 648 BLAKE2B 686c55e0db5a97ab597fa96b60f53c7edb20d2ea4afbbfb834d28f7cfb86e5f3504dbb602a59edbd040c9afe9af2ad340f87fe912c48e226e31f017d1a848eb5 SHA512 db9f290ec792189cc5f5b720316ac67181324e00f06066edd85121e156aa01d467a3492681176ce4f71a8783c4f6fbeddc1e17dce6e2d045179388ad7bab4e93
-EBUILD vala-common-0.46.5.ebuild 658 BLAKE2B 586f1e5ce72e5462f9d5dde289dfe2149e516559d14b84ef514b1d11844021c7c0fa2c6449d770e1a6a2493f8940bd45e8b431c9649606960e574063ee4b521b SHA512 b097872ea867e3c51717e9320440b2f4d9df38a5ee88e123ab4a9b60c53415e6eab34c8f2f26567b300ff77579a1364a0e191f510d3bfb1e7d00220f440ff67a
 EBUILD vala-common-0.46.6.ebuild 658 BLAKE2B 8e5902b4382cf5bcd2b87508e21eca0bdd3aa0c2c5478dd7bc1a626d7763cbb2d31086cedf6a07eb34a9dbbbabd625b0735c7add3e7a47205c54bbe40b15c0da SHA512 e9f4486436e88db15ee82af8fb8aa704f320b65bfc512c7aa9f35930c9f95eeac3512ae2eff10006617e1748db066425013053a4e22d426a864127a22509fba2
-EBUILD vala-common-0.47.4.ebuild 658 BLAKE2B 8e5902b4382cf5bcd2b87508e21eca0bdd3aa0c2c5478dd7bc1a626d7763cbb2d31086cedf6a07eb34a9dbbbabd625b0735c7add3e7a47205c54bbe40b15c0da SHA512 e9f4486436e88db15ee82af8fb8aa704f320b65bfc512c7aa9f35930c9f95eeac3512ae2eff10006617e1748db066425013053a4e22d426a864127a22509fba2
+EBUILD vala-common-0.47.92.ebuild 658 BLAKE2B 8e5902b4382cf5bcd2b87508e21eca0bdd3aa0c2c5478dd7bc1a626d7763cbb2d31086cedf6a07eb34a9dbbbabd625b0735c7add3e7a47205c54bbe40b15c0da SHA512 e9f4486436e88db15ee82af8fb8aa704f320b65bfc512c7aa9f35930c9f95eeac3512ae2eff10006617e1748db066425013053a4e22d426a864127a22509fba2
 MISC metadata.xml 325 BLAKE2B f1a8eb879889fa0b33809e44ee815a95f07c1d65d1e4fcb3af8797e27f258f76e7774b4a8eba9677a9e6c8a1051fbbe70a0f3675a12f9d52531d361f70826087 SHA512 3be77f30dff008c941c9513d9b8a4c689aba5f2f1005ecdb98f6cf9bc1000f562bad638cddd373f223a5570b40ea83e44656dbf848544a96ce0d166cc46805e2
diff --git a/dev-libs/vala-common/vala-common-0.46.5.ebuild b/dev-libs/vala-common/vala-common-0.46.5.ebuild
deleted file mode 100644
index f66b34153af7..000000000000
--- a/dev-libs/vala-common/vala-common-0.46.5.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="vala"
-
-inherit gnome.org
-
-DESCRIPTION="Build infrastructure for packages that use Vala"
-HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND=""
-BDEPEND=""
-
-src_configure() { :; }
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/aclocal
-	doins vala.m4 vapigen/vapigen.m4
-	insinto /usr/share/vala
-	doins vapigen/Makefile.vapigen
-}
diff --git a/dev-libs/vala-common/vala-common-0.47.4.ebuild b/dev-libs/vala-common/vala-common-0.47.92.ebuild
index d55cd027cf53..d55cd027cf53 100644
--- a/dev-libs/vala-common/vala-common-0.47.4.ebuild
+++ b/dev-libs/vala-common/vala-common-0.47.92.ebuild
diff --git a/dev-libs/voikko-fi/Manifest b/dev-libs/voikko-fi/Manifest
index f9377829f854..3ef3cc7c6458 100644
--- a/dev-libs/voikko-fi/Manifest
+++ b/dev-libs/voikko-fi/Manifest
@@ -1,3 +1,3 @@
 DIST voikko-fi-2.3.tar.gz 694602 BLAKE2B 454afaa76be00645b8640f84c2c91ed0b31be5b46c98d31bba0f4967dce27919eee6a6c452941b3878b498c7f913a413a3d143d658bc38da2a07b32d876ac317 SHA512 b3478cbb6aecebcc25e1c4bce0881a657d664c11190a22c1c2c4ca7e7c62b4c4fd5d396718fbadc8c5ab3c9db5d4349d6cd81440a1394cf4c2f77c52ae608018
-EBUILD voikko-fi-2.3.ebuild 771 BLAKE2B 487a1fee5066a6972fe04ee6a608e60d9aafb9caf8215d7267b9d3c9a4241183aa3195265a763c962e21980ce7fe39b8884e4c927c63e1fb2a18fa1e837b800d SHA512 cbc2f6b9e07edf068145d023e613a99607d2b57974229f0b4755418627b21adf4f2c1f7add10d9a3d5b50a60b330a622e46ac620102c12459b7bc4ca7de4df81
+EBUILD voikko-fi-2.3.ebuild 635 BLAKE2B df42cfd58115a7a0111413a0cdffe00647d00278f3f4e340f23141ce98e13df2c67e23aa659492b999ceedc75b75800bced1cb72c4bb33d7d25a0bd4f3acf27d SHA512 da935e783d55c1530586cf2106870291ada9dad586ed2658b2a59aa49eefc74eaaaffc22d2164d8dd95f00a6ad63e8bd734e2c75c8017b8b7015cca2c0a08ef0
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
index acd48c7ef5e8..fe39034097df 100644
--- a/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
+++ b/dev-libs/voikko-fi/voikko-fi-2.3.ebuild
@@ -5,25 +5,21 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..7} )
 
-inherit python-r1
+inherit python-any-r1
 
 DESCRIPTION="Finnish dictionary for libvoikko based spell checkers (vvfst format)"
 HOMEPAGE="https://voikko.puimula.org/"
 SRC_URI="https://www.puimula.org/voikko-sources/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-libs/foma
-	$(python_gen_any_dep '>=dev-libs/libvoikko-4.0[${PYTHON_USEDEP}]')"
+DEPEND="dev-libs/foma
+	dev-libs/libvoikko"
 RDEPEND="${DEPEND}"
-
-python_check_deps() {
-	has_version ">=dev-libs/libvoikko-4.0[${PYTHON_USEDEP}]"
-}
+BDEPEND="${PYTHON_DEPS}
+	dev-libs/libvoikko"
 
 src_compile() {
 	emake vvfst
diff --git a/dev-libs/xalan-c/Manifest b/dev-libs/xalan-c/Manifest
index 946d5614a3dc..af56e2ec6d7c 100644
--- a/dev-libs/xalan-c/Manifest
+++ b/dev-libs/xalan-c/Manifest
@@ -1,6 +1,6 @@
-AUX 1.11.0_pre797991-as-needed.patch 5376 BLAKE2B f00d1c7274a8d49e7ad9c3d46ca001bfad513dcde220d7d2109c1a87411246d7ccd66faedaeaae6ee148d958bf7ace2a0e188f322dd7b1f0382a9c2f28f6dc82 SHA512 c68861162bc6fd0c90a5c52cffed73d7fa0733f7b6198d06c6b728f7324b55e2e19e6e062ec67787f80ee2c31b45556431ea529ea8c6d4706d547fcb4fdf9ae4
-AUX 1.11.0_pre797991-bugfixes.patch 1652 BLAKE2B 5d015161a921db987fe5c66134686a8249e6dd26b4a8edc20e2e85e5959b76320a9b2c2c052bcca89f84f2af4e0b1bc1fe0cf4745aeea3e9a61bc82df8e3573b SHA512 5103993c7549d7d65e8c3555438da43eb00929d786bdf5046c8da99b3779e73c2b0029affa40c28a0492f1498c1cad2fa48091aa5a51dc28630bbe59e50724f1
-AUX 1.11.0_pre797991-parallel-build.patch 2714 BLAKE2B ac0b0184fec7dff9b6d1b36e2b1272b4d0636a103c45e0c16ef141072f431a08bf6852e48ef8031566f01819298102580aa4f9fa509342fddf0297c8465dc031 SHA512 1b21006f19266f1c285f6a730cc3aefc714d2da77b0bce5519a1ed2434cd465ec89b5638320aacf19ec88a2bc974ad3777e2c6179cf137d9d92a75fc4d2c6699
+AUX 1.11.0_pre797991-as-needed.patch 4803 BLAKE2B 1dd127bb9fd93cc58ac0a09e45354df5b0e8eaa4e53b9eb0f8a6d96f00e1606fe202b46ea4f9e105c0d20fd58a52761df1bf52f51e19fb70892d5909912db30e SHA512 f0805dc8456ed803d92e2b913d4996881078e402ad053be5175aeeb6126b6e752a39e02fc1d4f37853e5e2aaee229a82c11cc7e0b298d3474e4d638d3fd0025b
+AUX 1.11.0_pre797991-bugfixes.patch 1409 BLAKE2B 78c628ae10560bf950c7fed9ae4c28216bfb97bc7936064f20ee91403e74297d0b15ea1755901f26d900e53ba935fee937b726bee65511272e305f2731bdc94d SHA512 3eaa70d2936b7091e036d936ff8b35cbf2399ccbb81444b8a6a9583cbd11aa865e7f927a035b1d0223c172eb8de891e4da3b7113b155dfc4e8b19d0da5c4c4da
+AUX 1.11.0_pre797991-parallel-build.patch 2530 BLAKE2B 2d88ed70b30643cae4bcf6a88de56706fd1f0cf5b71e2d12dd24812217ce06023b08b8914dcbcfd828e8c8ba8b116d227d621cc785fbd3591a2d2d502be5fa37 SHA512 be994c118b212b3b96409c273b01d2b00b0a8b0f7ec53338f8efc6ec9d9dccd4fb6fdcaf7c365351024a965e96992ff23ba849c90d6d6aa1e7086c51c763cbef
 DIST Xalan-C_r1153059-src.tar.gz 1573651 BLAKE2B 5e684b80bc962776c1e0102a97023ee3a9b9357b6fc05e02687971d5d879b01a5dc426fd6ab2af68a7ad6ec48a799d70fd912a4e3a30d8e3a22a954d84d21f59 SHA512 2382c1343ae97d0196d84053139758d3b3b7574bcd835b754e34acdc6ab708a58fc23d2f27d41870c768c78a1de7be1bb6031cc78d205b6024f1ad7cd6fca653
-EBUILD xalan-c-1.11.0_pre1153059.ebuild 2346 BLAKE2B 93171b40c421413e8b5ce2656e08fcaaa5ade224ffd4902fbc61b16106819dceac23749c683d71b8cb8b6b00ecdacc4ec98eeb49bd0543fe8b0b9f89161f091f SHA512 cea55607e6c31c142826b47cdc5e5da17ef0cc7751791358184e81c6c6c2be4395f8477b61398eb067eb1c44a4b1921d719e28137161999c0f15fb8b7bc91c29
+EBUILD xalan-c-1.11.0_pre1153059.ebuild 2180 BLAKE2B a31ce8f492efc514caec802d6d855d0329561d47c7692c3bc864415c545f644decd633427eb03f4065799215f80a8fa8c0e309391f6542f808e876bb036b249d SHA512 948a65343d58b40f06aae2cf4625782679528e714a1f3de5f2ecd10062135d4cdc39d49a84b1248989e7b42d3ee11e7ea83d4aef4ad9ee5fb06cd062aedc845b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
index e8a9cc9d03b3..791da1cd7e75 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-as-needed.patch
@@ -1,6 +1,5 @@
-diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
---- xml-xalan.orig/c/src/xalanc/Makefile.in	2009-07-27 00:23:08.411122528 +0200
-+++ xml-xalan/c/src/xalanc/Makefile.in	2009-07-27 00:45:09.514777553 +0200
+--- a/src/xalanc/Makefile.in
++++ b/src/xalanc/Makefile.in
 @@ -174,7 +174,7 @@
  
  "//'$(LOADSAMP)(${BATCH_XALAN_UTIL_NAME})'": ${XSL_OBJ_DIR}/XalanExe.o
@@ -64,9 +63,8 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefi
  ifeq ($(PLATFORM), OS390)
  	mv *.x  ${XSL_LIB_DIR}        
  else
-diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in
---- xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:23:08.431122558 +0200
-+++ xml-xalan/c/src/xalanc/Utils/MsgCreator/Makefile.in	2009-07-27 00:43:47.674693543 +0200
+--- a/src/xalanc/Utils/MsgCreator/Makefile.in
++++ b/src/xalanc/Utils/MsgCreator/Makefile.in
 @@ -29,7 +29,7 @@
  
  $(XSL_BIN_DIR)/MsgCreator : $(MSG_CREATOR_OBJECTS)
@@ -76,9 +74,8 @@ diff -Naur xml-xalan.orig/c/src/xalanc/Utils/MsgCreator/Makefile.in xml-xalan/c/
  	
  $(XSL_OBJ_DIR)/%.o : $(MSG_CREATOR_SRC)/%.cpp    
  	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
-diff -Naur xml-xalan.orig/c/Tests/Makefile.in xml-xalan/c/Tests/Makefile.in
---- xml-xalan.orig/c/Tests/Makefile.in	2009-07-27 00:23:08.514445103 +0200
-+++ xml-xalan/c/Tests/Makefile.in	2009-07-27 00:45:50.541094978 +0200
+--- a/Tests/Makefile.in
++++ b/Tests/Makefile.in
 @@ -62,7 +62,7 @@
  
  $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o 
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
index d86f1bd45f4b..8b7f618bb8b1 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-bugfixes.patch
@@ -1,6 +1,5 @@
-diff -Naur xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
---- xml-xalan.orig/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:23:08.507787691 +0200
-+++ xml-xalan/c/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp	2009-07-27 00:53:50.781756249 +0200
+--- a/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
++++ b/src/xalanc/PlatformSupport/XalanNLSMessageLoader.cpp
 @@ -28,7 +28,7 @@
  #include <xalanc/PlatformSupport/DOMStringHelper.hpp>
  
diff --git a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
index 46d9659b0f0a..da2c79572984 100644
--- a/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
+++ b/dev-libs/xalan-c/files/1.11.0_pre797991-parallel-build.patch
@@ -1,6 +1,5 @@
-diff -urN xml-xalan.orig//c/src/xalanc/Makefile.in xml-xalan/c/src/xalanc/Makefile.in
---- xml-xalan.orig//c/src/xalanc/Makefile.in	2010-02-23 10:51:30.058353490 +0100
-+++ xml-xalan/c/src/xalanc/Makefile.in	2010-02-23 10:52:53.251679288 +0100
+--- a/src/xalanc/Makefile.in
++++ b/src/xalanc/Makefile.in
 @@ -84,6 +84,10 @@
  SAMPLES_DIR = ${XALANCROOT}/samples
  TESTS_DIR = ${XALANCROOT}/Tests
diff --git a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
index 894d99b5b6be..8d8eda0a2222 100644
--- a/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
+++ b/dev-libs/xalan-c/xalan-c-1.11.0_pre1153059.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
+EAPI=7
 
-inherit toolchain-funcs eutils multilib
+inherit toolchain-funcs
 
 DESCRIPTION="XSLT processor for transforming XML into HTML, text, or other XML types"
-HOMEPAGE="http://xml.apache.org/xalan-c/"
+HOMEPAGE="https://xml.apache.org/xalan-c/"
 SRC_URI="mirror://gentoo/Xalan-C_r${PV#*_pre}-src.tar.gz"
 
 LICENSE="Apache-2.0"
@@ -15,22 +15,19 @@ KEYWORDS="amd64 ~ppc x86"
 IUSE="doc examples nls threads"
 
 RDEPEND=">=dev-libs/xerces-c-2.8.0"
-#	icu? ( dev-libs/icu )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( app-doc/doxygen )"
 
 S="${WORKDIR}/xml-xalan/c"
 
-pkg_setup() {
-#	export ICUROOT="/usr"
-	export XALANCROOT="${S}"
-}
+PATCHES=(
+	"${FILESDIR}"/1.11.0_pre797991-as-needed.patch
+	"${FILESDIR}"/1.11.0_pre797991-bugfixes.patch
+	"${FILESDIR}"/1.11.0_pre797991-parallel-build.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}/1.11.0_pre797991-as-needed.patch" \
-		"${FILESDIR}/1.11.0_pre797991-bugfixes.patch" \
-		"${FILESDIR}/1.11.0_pre797991-parallel-build.patch"
+	default
 
 	# - do not run configure in runConfigure
 	# - echo the export commands instead exporting the vars
@@ -47,19 +44,12 @@ src_prepare() {
 
 src_configure() {
 	export XERCESCROOT="/usr"
+	export XALANCROOT="${S}"
 
 	local target="linux"
-	# add more if needed, see xerces-c-2.8.0-r1 ebuild
-
-	local mloader="inmem"
-	use nls && mloader="nls"
-#	use icu && mloader="icu"
-
 	local transcoder="default"
-#	use icu && transcoder="icu"
-
-	local thread="none"
-	use threads && thread="pthread"
+	local mloader=$(usex nls nls inmem)
+	local thread=$(usex threads pthread none)
 
 	./runConfigure -p ${target} -c "$(tc-getCC)" -x "$(tc-getCXX)" \
 		-m ${mloader} -t ${transcoder} \
@@ -73,24 +63,23 @@ src_configure() {
 src_compile() {
 	default
 
-	if use doc ; then
-		mkdir build
-		cd "${S}/xdocs"
-		doxygen DoxyfileXalan
+	if use doc; then
+		mkdir build || die
+		cd xdocs || die
+		doxygen DoxyfileXalan || die
+		HTML_DOCS=( build/docs/apiDocs/. )
+
+		# clean doxygen cruft
+		find "${S}"/build \( -iname '*.map' -o -iname '*.md5' \) -delete || die
 	fi
 }
 
 src_install() {
 	default
 
-	if use doc ; then
-		dodir /usr/share/doc/${PF}
-		dohtml -r build/docs/apiDocs/*
-	fi
-
-	if use examples ; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r samples/*
+	if use examples; then
+		docinto examples
+		dodoc -r samples/.
 	fi
 }
 
diff --git a/dev-libs/xapian-bindings/Manifest b/dev-libs/xapian-bindings/Manifest
index 13cd54a5328d..a9b66fc9905d 100644
--- a/dev-libs/xapian-bindings/Manifest
+++ b/dev-libs/xapian-bindings/Manifest
@@ -8,7 +8,7 @@ DIST xapian-bindings-1.4.5.tar.xz 1118884 BLAKE2B 507b06f0121e5a56224250bfe7b197
 DIST xapian-bindings-1.4.7.tar.xz 1121700 BLAKE2B f8492113b76aba322c975aa2b957a627a32e5209d8b79f435dc85c899cf14619af6165265e624e2ba8806f3c91dd35d71d98c4a47f5d6f4fba1b7fb83700c0d0 SHA512 c904cd3abf19d68495b0487ea77265fdc92a3cd8b1c2437b89034efd349ce41198bbc4abca49f259f71a1ba0fd269b2cf9b6dd4c1607678a73cbed4de9c5a1d5
 DIST xapian-bindings-1.4.8.tar.xz 1123812 BLAKE2B 5aa496ff3cfe06a40fa8db6a04cdc9041f4a0d9f12c7a61565f10c7d360490a7c8a7c745d91c9eda45b9d9bc58bd6a2bbae02aa9dd7ff1949ac59f7e09b090df SHA512 f979c32b096ecdc7a71b2bd032c6d0e7131f3d304e47e44005989ca79ea1f940c39626c60a8e52ff3cdb2cb380aa5ddf82a99bae08e06629c0bd47d8e0bfa7cc
 DIST xapian-bindings-1.4.9.tar.xz 1123628 BLAKE2B 918748bb99b826485127b16511ae2fe6e7965102738308fc675eca3018c8a7131fd65f54cc396912367c4c6f43c7c28b1ba07591567fe3ae646c3e1480439d0d SHA512 cddc6cedfd571d565619ade0a4c9bfee8d688ca3d06d77368c8d673d3c9d1296b652122836debc84a4d54724c2bf0639a009396bf587ed4b8901a6bfe508851d
-EBUILD xapian-bindings-1.2.25.ebuild 5545 BLAKE2B d4fe43fcc1937c2a4a4c10c74cac6efb46e4ba249d632be140304f7491a0f375d48aab77b7760f9fa5dd2b9e526d78265831e56e6be077ab84809d8d6649f82a SHA512 605fea5ad80768d473ae9401460e1aa6bb0584bd0c92a1efe7db5b5e8e46cce7494e1b1b8c35c051d49f936c22b780ac2dc7e6bf0a0573937a7fea30cec6b519
+EBUILD xapian-bindings-1.2.25.ebuild 5544 BLAKE2B 64cfe936befc74d5685fdd66345b0895afe4fb5ed0e98e48d527f86438c67ae82ba2cadcf4c47cc737ec5566b38ae396486edb0f3cab9534e1a5667611817d71 SHA512 2dd73f4bdffbdf6599e0a013138e3c49bbd3ec52c77580d9201c8700a8f0ef8967f273acba2f2be3e54d032b0406bbec997f0a9a28e92bbe45351b329b27fe76
 EBUILD xapian-bindings-1.4.10.ebuild 6529 BLAKE2B 81b8fcdc400147e6ad5a30e9a0492e941b96f995ee8ed1aa4e747ca2996f45366b0a152e58f09f5d002585381be5d229001cc7b501de5308ce38dfda153351c5 SHA512 82a698624c1ebd05cc87865320b77b002c621581197157238f961980e06a6ead84b46b6c7d0728fc2eb606a9df32844ac72c70517421b3a8e6fde9eacd660db6
 EBUILD xapian-bindings-1.4.11.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
 EBUILD xapian-bindings-1.4.12.ebuild 6529 BLAKE2B f53c0745ca0e3054a47ae9fe487e5ca423eecb23f233d6feb76f865393a82c65648af92bc28eb224f46361960f9c9a84b47826f46dbf0a891fbb83eef3826455 SHA512 733b0aabbdd185700dd0954c3a9e20c46c5509b70f1f44de6d340cc54d2d71265b0c0924ed4555f6378649ae3d624975c58172601f7463715d7945b580d45724
diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
index d3a25cc40126..163266c3fa7c 100644
--- a/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
+++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.25.ebuild
@@ -156,7 +156,7 @@ src_test() {
 	fi
 }
 
-src_install () {
+src_install() {
 	emake DESTDIR="${D}" install
 
 	if use java; then
diff --git a/dev-libs/xerces-c/Manifest b/dev-libs/xerces-c/Manifest
index 8cf1bc46490a..412fe3c3bd47 100644
--- a/dev-libs/xerces-c/Manifest
+++ b/dev-libs/xerces-c/Manifest
@@ -2,6 +2,6 @@ AUX 50xerces-c 43 BLAKE2B 8ebb0cf0aa79e028271751f981c9b0818af24bf3640a5109ecca19
 AUX xerces-c-3.2.2-fix-XERCESC-2161.patch 42804 BLAKE2B c55aa5ff9d0ca8b716aaffb25435b0a1fbfc8684dc601dc009e3e44f3608c9c21ca3190a25d4813f7e34d75f070ca5de5554e35a2408d65f168b6a8715a156e1 SHA512 04d8cf6e220b7a7dc09a8dba4ff763dd8ccb133a81a5338d64a5cdf2c039f2d51958ec7eeea8ca04eeed8433c3239df8d74e6c697ac8c2c3476e8917d02507a5
 AUX xerces-c-3.2.2-fix-XERCESC-2163.patch 715 BLAKE2B 39ae9de0166675c2269da164aaf6c637ba04761c12c5d8b227d466575b056d64846bced57651c70926a78403da16fd0e86ba4b267dfe70a144bcf3cced3d1536 SHA512 c5c0e753d22b61fa5047cef3748cf3baaf30f4c6ba4d89152d856f2f65fe311841ea590ec0c9291347b5b7f96047f3e9c7b524798ac2ac96bcfbc8b40d634596
 DIST xerces-c-3.2.2.tar.gz 7100953 BLAKE2B d167299797189ef181c384ac49095e8bc4cf4e0c7d646e72840a19f56c6eea060168d2c2d29c29ce6cc76dd44e403bea4c3dcde67f964b87f3abc807ad0b14ad SHA512 13709b47b61d957d736f34b774dbc7fbd85171eedebd0cada41fd1d17929e6c42904c882b1e1d4f9b4fd464938b62e5ebb127187b4974dfade6a593e31471e80
-EBUILD xerces-c-3.2.2-r1.ebuild 2974 BLAKE2B fa110b88f0e47f91b165ecc680fa19c718e739cde395c1587d844ddb9de204e6ef1aa7d25e6f3606becb63191e39c130a5df04dfe7787e0fa0c878fef4c4a936 SHA512 2bd4d428c897b8ce642d013e3e9dec3d2b123db8eee2fcce022c24b6e6756cf07edf8509784a00efe3b97c3fb32d84d91443cff565f2eb70bf59c13818f3b07c
-EBUILD xerces-c-9999.ebuild 2885 BLAKE2B 9c708f9ecba39d4c466a8a461169e58404acd4967855c4d5c2e15baa0a0f4ca5d52b00f935cfd4696bfba305d8d7d8ac67dc549b421c98eb2add67641ec433de SHA512 bcab58b4292237e7d71b284d058f0a3fa1b50c1a4b9c7d26f7b4458fa9ae75a6ec6313baaa9ce15885c65d12e6a43d428b26cdf3e73f133a23e9e7a56a1b82f0
+EBUILD xerces-c-3.2.2-r1.ebuild 2973 BLAKE2B 1a8f8885d24d764607c30a8885e8597c619fbce6b265766d798b162a1ec42e8f0c0a805da640204adcb3fd64117d3bd5ad6e22157455658eb5a237bce5736e16 SHA512 11971abc1d5c2576e9d2c8c5f25b348ff06e88828fa7e26d825d6f2fd33966673c264a73eff8185ae2386f22d47981af98a2119cf8825442bddcdb95e1f3d22a
+EBUILD xerces-c-9999.ebuild 2884 BLAKE2B a69a9d474232d4dce30c5e86f225e96c57b07aa18263d0de9e3afc1d56518da9c64876412f84b10c0825fe2c85abe1be54b2ed551c168cb7281b0e374468a553 SHA512 fbf54973cfd79e1b3f8a5b7a342a4b3ccdf4aa3e1e9485d5a1c9dc880fc716ef6a0e832be09ddbbedacf630c3dd72c69baefea2315595eb05f41411751f9d2bb
 MISC metadata.xml 768 BLAKE2B fabc57ee82dc82444461b1ec25ebda2af68a8eb00c6f44cc24de70daf96fd245acafc04d1bb75ffbb780e1b0877d7862a119264b81402df2e9c2f20ff252a166 SHA512 e447b67df2d7e7c3fb7cddc1dfeaf7c4da734ba71b1b0138abf63f8d0c5c42d0f2dd8cf6a281d4a88da32f4c073d81fab91f3fbca92d50d6bc9855a64814784f
diff --git a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
index 92179df8b117..018c4ab7d02c 100644
--- a/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
+++ b/dev-libs/xerces-c/xerces-c-3.2.2-r1.ebuild
@@ -95,7 +95,7 @@ src_compile() {
 	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
 }
 
-src_install () {
+src_install() {
 	cmake-utils_src_install
 
 	# package provides .pc files
diff --git a/dev-libs/xerces-c/xerces-c-9999.ebuild b/dev-libs/xerces-c/xerces-c-9999.ebuild
index 58bfc849abd0..aaa442c31bfc 100644
--- a/dev-libs/xerces-c/xerces-c-9999.ebuild
+++ b/dev-libs/xerces-c/xerces-c-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -91,7 +91,7 @@ src_compile() {
 	use doc && cmake-utils_src_compile doc-style createapidocs doc-xml
 }
 
-src_install () {
+src_install() {
 	cmake-utils_src_install
 
 	# package provides .pc files
diff --git a/dev-libs/yaz/Manifest b/dev-libs/yaz/Manifest
index 90b3435197d0..b94a780aeb2c 100644
--- a/dev-libs/yaz/Manifest
+++ b/dev-libs/yaz/Manifest
@@ -1,4 +1,4 @@
 AUX yaz-3.0.47-icu-automagic.patch 899 BLAKE2B b6eafa42b369a76f085efb0b89424c4c182c1604a68bebd7f8fee47a925fdc859973bfceab912b8aeeef2aab288f326fadc0ba2fb63e6e13d047c9811ea326d4 SHA512 55185162a381ae3cb7a880568b2a0a04c1b2f7d8e579e1494df0c2047d021648bce15d223f99a36f59e8b1a14fea161a128a2c01ea7f0e5b2e167e09cf6f856e
 DIST yaz-3.0.53.tar.gz 2164681 BLAKE2B e42a97d63e031f14234258c7c44735a615ebc83774c1532d7e1b50f1f231dc933168e41a1b35a139ec193e694f6253336a666daad627a4aae9a0c7ffe34ca360 SHA512 537d54757e401c1b29ad2120209b2cd038f26ff7f43ffc3c1e22808e12a1580aedee3880478e951fd4b3057ca9af4a34afa2a64c0b8ffcbec24f76deb83ddc89
-EBUILD yaz-3.0.53.ebuild 1389 BLAKE2B be2ecbeb393ab937d1954d207c7771c1a08d76e56da497941aa9761f615834a39e046db6494aa216c7d02693e7ab58c5c3041b69444f29347fb0ad7cb05d9db0 SHA512 f9610094f2e362be826b77f1f34cc03ee21af7125ec1f9fd1debfc877645d28cca83d2868706fe0e05a5af2ff809dee7b88911d5b9bcdbe4647e0359bb671158
+EBUILD yaz-3.0.53.ebuild 1396 BLAKE2B 44b84778e2730c251bfbca2f78cbf98dd966d96dcc55584949067e6a98291f2b9ad0f6b5e4ed285e304e01050e6301b40250d09010cc0693f319eb47559351f1 SHA512 844b0341b78642bdf42fc9d113596141e05c7d84ca8746a9f8f479c3243827a1746357e16598f0cae6b2799faac8a83df38f49828f669bf17a122094367ce77d
 MISC metadata.xml 256 BLAKE2B 318bf6f45e4874d05ebcc06bd5a382e319a403f7b22f1b51bf1e04da415cafa199ce19e824b373cd38ad831c20d3ca3696d61cb68bda85b4c5c17d60ce32194d SHA512 60f3694b1a080bbe91b43f5164f21459526f0901618d68c8d77f942813ef8338b31cfbc585a73e56cbc5d8ab18f91ec9ad97814f6b98f6443b5ccf06fd68f4d5
diff --git a/dev-libs/yaz/yaz-3.0.53.ebuild b/dev-libs/yaz/yaz-3.0.53.ebuild
index 3b2163a22588..81d6963f5918 100644
--- a/dev-libs/yaz/yaz-3.0.53.ebuild
+++ b/dev-libs/yaz/yaz-3.0.53.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://ftp.indexdata.dk/pub/${PN}/${P}.tar.gz"
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="debug icu libressl tcpd ziffy"
 
 RDEPEND="dev-libs/libxml2
diff --git a/dev-libs/zlog/Manifest b/dev-libs/zlog/Manifest
index bec934718e15..3ef46b02d4eb 100644
--- a/dev-libs/zlog/Manifest
+++ b/dev-libs/zlog/Manifest
@@ -1,6 +1,6 @@
 AUX zlog-testsuite-flags.patch 599 BLAKE2B d94678371fb64eaf64d48c0d6980cde20bc9ccd3f0865a02c8f0374af553ff8db25601c5bd548e8f83bea1be80f8da2444669be621a4546710643c9d70e326ad SHA512 003c62b10274102dcec16c4064ff8cd93767bd34ac8c56e71cc07dec7d24a07e380341324f6d19141f43e6d8bffc3f4678a7b7ac493341e83bc237ab069ff164
 AUX zlog_no_werr.patch 497 BLAKE2B 506c3709043fa5d64475011dac251598d3d153bfdeb61947badc2d0937bbf62342370df3afba8e86a536ceb395376b311c7f5ea4f625ad24c2ef5b5c510492cd SHA512 5f5d343824a4d8ba02ce7e588b5e6a7aaf5465c1e76d1b26aa4f412d34d5a61d33a307d4d0521220267eaf883cb90ac382fb849fe406375f04c2a1ae9050c77f
 DIST zlog-v1.2.12.tar.gz 120048 BLAKE2B e9f48d8ee3e0bfc14674e96426f9343c27e0f666541b017a438800a6707bb158ca79f564e6cb10d953e4bff6dc839d76a3d3fc0f54c128bfb4b00e5fc86dbecf SHA512 4e1d773f33f9202702bb5e80f4dcc6f8ab28480a8515ad8b9562ee68703c065c2f18113124535c7163e240013ad121a6ce311a0fc04ac6c32971509ec33615ec
-EBUILD zlog-1.2.12-r1.ebuild 720 BLAKE2B 25d21a53d58adb32529aa94c457c63423fe6f90db485696b206fe513f0b4506787fe9bdda385fffda502fb7384152d22fd8e5113552bd804c0c7fa402db66b9b SHA512 67ca62b1b5a3cba60a223f6695ec93921ff1dcccb2a4d3bbd1d00be3ca6d54522c9eb3dd4e916640084b03cb5b6f392983a9b0e860752d3c072a5e0e34d209e6
-EBUILD zlog-1.2.12.ebuild 626 BLAKE2B b26fd8b3f5b2421f8eca8a0e7b257124c7332abd92a86ab707788f6667cbabd4db1578c8b980ddc8622cf833d01ad81831a3f12e9eb37e82aed874565269c732 SHA512 22122d73e3c3218eae890a224b503e2d8b8f79df749cf54195382e985a74a3739f2d177acd99bf22c8fa2e066d77ca5b8d805f388af4e41f3a41343fe3d36c00
+EBUILD zlog-1.2.12-r1.ebuild 719 BLAKE2B da0b3b6266786d15f0fef4a873a9391659df3a17707dac82549e9b8014154f03e5c8dc6b3ef1df8de11bff39bba1a527b4b1aa18d74f44c4ba9507127021eb82 SHA512 0be10099b28d0766e66d4ccc368d92d0fa76668b57ddcbe0e6f033e6dde53790c13f12b7a4468e1b6dfbcf64c25b091e3e99b6bb6fca25c7d0f2380a0bf6c95b
+EBUILD zlog-1.2.12.ebuild 625 BLAKE2B 7fdb101df894a485214f5efbdba5d7ed9055bb68872f26aace9a130934b9b4b0c957c0ff91d2cac780b159d61442c73e699132e7df7dea1cb56f21867083adfb SHA512 b04f73ec3974de6f045397c3b79f900cb68bd08b40da2c06e1556cd882d1ae514f966b3672dc60855da09feda1e4ca732ec7598817afdea93797541635b02913
 MISC metadata.xml 343 BLAKE2B cacb9dd07a85e4fa26b7fa703ea340117be968590c91b6e243d34642a38e6af506cc9d6d39c48250ffd288fa8dce7296cd02d37b7d5620af4d8d1edc74806af9 SHA512 1332dbac3769edb28e8c4241821fe5977619ae93b7fe29c58759ed4305b1a28cd51dd4a4d74b4d7db086bf6383e2f771b0e79804434ccd5ff6353e0d1b8d0f61
diff --git a/dev-libs/zlog/zlog-1.2.12-r1.ebuild b/dev-libs/zlog/zlog-1.2.12-r1.ebuild
index d49daa11b495..2dcde049b63d 100644
--- a/dev-libs/zlog/zlog-1.2.12-r1.ebuild
+++ b/dev-libs/zlog/zlog-1.2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,7 +24,7 @@ src_compile() {
 	emake CC="$(tc-getCC)"
 }
 
-src_test () {
+src_test() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" test
 }
 
diff --git a/dev-libs/zlog/zlog-1.2.12.ebuild b/dev-libs/zlog/zlog-1.2.12.ebuild
index ca74561e511e..6e6621253781 100644
--- a/dev-libs/zlog/zlog-1.2.12.ebuild
+++ b/dev-libs/zlog/zlog-1.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,7 +23,7 @@ src_prepare() {
 	epatch "${FILESDIR}/zlog_no_werr.patch"
 }
 
-src_test () {
+src_test() {
 	emake test
 }
 
diff --git a/dev-libs/zziplib/Manifest b/dev-libs/zziplib/Manifest
index 9f6174cf67b0..f4e6cddfc35e 100644
--- a/dev-libs/zziplib/Manifest
+++ b/dev-libs/zziplib/Manifest
@@ -3,6 +3,6 @@ DIST zziplib-0.13.69-html.tar.xz 152536 BLAKE2B 05f14b2e6d2e3af4488096eabc161422
 DIST zziplib-0.13.69-man.tar.xz 10988 BLAKE2B 2c3c5cfd17b3d3e17a3e72031b2246e32c9fe471b9578a4717c128725493054ceafc34763a763d31cf5532f082a596a6bceb8e417ef70476a59f4daa0a14b587 SHA512 5a804896a2d06b1d32d6b8715ffdb374ff7179145d033e919acecd46426dad3e44d4889adabce33e7f6bbc18e2b70b50a8a059498bf4f1f3d6844dda90c33c7e
 DIST zziplib-0.13.69-patches.tar.xz 5000 BLAKE2B 4612052bb8a312831daec9283cad8593b2161e2acd76122a982339154cd76d58b5398c61f605e3e29e0f63399c9a176710f95a1e6632ff4e1249ac596978006b SHA512 16190e20b8c722f3aee8e77ef7cc24026976b067402430c833d21761a13e32ed5f2eff543a2c13469e442d01c2ed5ae373badd6b8851c962852d6c09620a0d91
 DIST zziplib-0.13.69.tar.gz 1132204 BLAKE2B 92e9f5e95665c7a47d1e472f570402e3c174d404abf461bed644ea8a37ff7661ee98b8fa241728aae375e32c470f2f48a817f72410eeda81a6a3be6e6bdb2635 SHA512 ade026289737f43ca92a8746818d87dd7618d473dbce159546ce9071c9e4cbe164a6b1c9efff16efb7aa0327b2ec6b34f3256c6bda19cd6e325703fffc810ef0
-EBUILD zziplib-0.13.69-r1.ebuild 2362 BLAKE2B 20052cc6ed87b6c7e3a7f7a02d78c0384525bdd541575db1b4bfb9da38a8243f3b0787e2199bae7ac6e6179b559baba0aac3563d816f11df9360990c8c65c0a7 SHA512 a394f3cda3073374f3efdb5889782e225971d6027e34087e9b19aa19d5edf2af4002e15ce74f96b1a8b359b6c16b6001611609f91c5b5bbc9fb45205149719bd
+EBUILD zziplib-0.13.69-r1.ebuild 2361 BLAKE2B af4642c8a4984606064d25849dfa92ca4cba3081782a4f3fc117b01f7a24bf69ff4cf00509853a8e2740b3406df6a603e9d3a0b0651f84e4c8c2a3c03faa9768 SHA512 844ca1ed790f525021527f4891d607a0d2f9759bf604069b0240acd796b76e921d5a3acb74a5713544d2784de56e768414ade79cba775b67f46da5282692048d
 EBUILD zziplib-0.13.69.ebuild 2321 BLAKE2B 001e06fe6a5597f9bf3f71fa3513fa08cfb5c99b999376faaa1f2201ae2bb4070d4208f7c9c1e9817120eb75bc997871e604f20d83a9a5ce98520ecb5d500bd7 SHA512 73b06d0a465c7340ddc38444ce44a30e71e90d36db7e9a5f965376fb9d49aac72fbbf1b21b58d105d8d7e7e20ce2beb4710b932761c509963b9889c4035661d9
 MISC metadata.xml 244 BLAKE2B fc7489e331f708001ddc94cbb6b4e2c22d80c32883cb48c8044da1c8326143eed049e7f867342bb5b389f9252949f89dcb3084369729d52e49a8924d842d4693 SHA512 73f6d031dd2239ef69ea83120b253dbd61d8db15603514a673da83c3cbe9f7f881613e5fa3387917428b994bab1bd466e49ebe2c7a68829f0f2551e0124620a0
diff --git a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
index b87be22ddb14..2157af9f0a5f 100644
--- a/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
+++ b/dev-libs/zziplib/zziplib-0.13.69-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/gdraheim/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc sdl static-libs test"
 
 RESTRICT="!test? ( test )"
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /dev-libs
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)