gentoo (leap year) resync : 29.02.2020

28 files changed, 272 insertions, 37 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1b9e2b5f44a1..5b8d93e3d5de 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 90317f6488ff..44d38687050a 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,5 +2,5 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b
 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 EBUILD e2fsprogs-libs-1.45.4.ebuild 2219 BLAKE2B 568d10511fbeea8ddc3e025d5f5965dac277c40f65cbbf16630b4195efce3b58c4dfd99c60af78f2253b1570bbfb42cd1e1d8679ffbe854f4608d84d8ccc7549 SHA512 a9751b6f537d6ae10d7783253389c54b0a0f0e7474b8eaa432261354d1b92a4907b268524a9d278d4e97655c57ae08d9c44cdabcee4047ced29de40f1935a7d6
-EBUILD e2fsprogs-libs-1.45.5.ebuild 2222 BLAKE2B 5c93b60ebc8f6e6f94e9931962adf40afc941ab1a02e309386f959a65511bfdc7bdb64c9acbf5ab071b4ddb4683018f2e5fc1403026976c8075b2d70e7e66d07 SHA512 7ca10a3ceb40eeb498f7410c2213d7753b0549f807c2afe94de9b4da17af37fac58a7e47b7b2c1653f9c27c730d77ba31f17e15e63537198ca0cde124a93ad4c
+EBUILD e2fsprogs-libs-1.45.5.ebuild 2221 BLAKE2B 295c1c8b62ea621f85e754a83ce3241a2b1a7e8ea1c92dd7acb915b5d6736d2df57a5fbaa9893608e0b963fe3cdcfe10f335ee6aab48d0911812bfeab3872240 SHA512 de010651a7e89e282fec11ae1567804157bfa5236d611e6094d465e74c6af67813d45a6a916d11488e5408aab7cd45579b178732957c331c81ca3b40ee631d9f
 MISC metadata.xml 399 BLAKE2B 7f75ab727887efba1f1991c5944cd262c95b53dbc48a391afdd67cb5c1f99d9c06753b06c7d28c5472075835ff5da4718eb0c3ca5b9e68a4d83173f223162c31 SHA512 45e90f3d9b83bffd42173290d47dce2247a2eff4d6293b7bcbcf422115e11b8c958a7a13f60b7742a96350bd5a2b37d8e76a807776f943c88833b77782d4f180
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
index 66c44f9efee8..ecd796000142 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="!sys-libs/com_err
diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index f7330ae74475..911762fe9479 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,3 +1,5 @@
 DIST kpmcore-4.0.1.tar.xz 416932 BLAKE2B db429a9a51baf2d3f83d36479c05ac28c1d742dfc9e0dda51486d17958c95751da6295fe9e915359717eebbab3877464284b871dd8ded5a87c01c590cf4eac85 SHA512 982ad77246f59ade74edba15effca6490ac9ac7bb6db7f6194bcdbfddfa735c9bc1b58020affccd945fcdfc96fce3488167f492d6a13dcd6d19c5692505303ac
+DIST kpmcore-4.1.0.tar.xz 420344 BLAKE2B 1a8043c5eb774a3b9b99431543217910120a38b06a17db9db9ae6c577593c2736223e8d466ef62c33224e52513eae52d062584fc8afd86d90eb667af4e923645 SHA512 c45b31a41c62a68aee991be0f7954f4bd2136660578cc60f7fa6f05e56716458421e16cd314b3b9a14b56fdc9377db511c1645e5c41f0446d86a8ac5bb66c273
 EBUILD kpmcore-4.0.1.ebuild 894 BLAKE2B 60be55ec27464546d849fdeacb3f30d00085ffb0dbb6ec6b11f139777268acfc4e38f26cd99120f43c786f45ded5da14b3b723b4b517238b6d31cfd2b0c0fff0 SHA512 fb8eae8d2009055c524265802c9d3523218581b99a9c06244c386b12610e59bb19fa6ff7ba92bcf33c3fdb6b21971175d2832b0722f3712df240bec2cd430f1a
+EBUILD kpmcore-4.1.0.ebuild 914 BLAKE2B e7eb5f772aea9d7cae764b49d5a6c54d54c27ecbdf6960c8cb1745d14f2e2373b68630f9bcc6a1b6d71f9898a6c4f224e48d46b99f5db19856367c6385ee4562 SHA512 0ee6e22370c667d5d5c13d383613f0e3361aeb6d93219f201254f10f86f53cd421c7c483cdd35d071da7c81c5c01fb2e5c5a7a37e0d05bb3d3f4e1fab492b2e4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-libs/kpmcore/kpmcore-4.1.0.ebuild b/sys-libs/kpmcore/kpmcore-4.1.0.ebuild
new file mode 100644
index 000000000000..d9ba96a5b5e4
--- /dev/null
+++ b/sys-libs/kpmcore/kpmcore-4.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_NONGUI="true"
+KFMIN=5.60.0
+QTMIN=5.12.3
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+DESCRIPTION="Library for managing partitions"
+HOMEPAGE="https://kde.org/applications/system/org.kde.partitionmanager"
+
+LICENSE="GPL-3"
+SLOT="5/9"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	|| (
+		app-crypt/qca[botan]
+		app-crypt/qca[ssl]
+	)
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kauth-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=sys-apps/util-linux-2.33.2
+"
+RDEPEND="${DEPEND}"
+
+# bug 689468, tests need polkit etc.
+RESTRICT+=" test"
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index 6ffb2d4d6fff..8d711672fb80 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -17,15 +17,15 @@ DIST ldb-1.5.6.tar.gz 1637795 BLAKE2B ac70f6dcaa1cd34bfdae8bf7844f1084282ea947a3
 DIST ldb-1.6.3.tar.gz 1628668 BLAKE2B e9b6535eddf49496151e544f6879641c58a614f6de95463f7d0bf1953744953a5d55dde935d39b690d4c87e66914d8de0f0f5d4816a61fdecc81f8797584013e SHA512 a41b1fd2afa9a02dec37519f28e0e720b649c2a0aa6caebeb6697dbefdc6a055ef26500c5ccb0439b495d8c03218920b389fb9601d1cf5ca4d5046f192a5fefd
 DIST ldb-2.0.7.tar.gz 1674063 BLAKE2B e61f7bf4cfefcb5c1bf735c19a00027ce20ef393b613117e5637f7680ba7fcab1798744505b0db88e8bbdab41e0264e0fd1e643110ec47864de02ef315bd0dfd SHA512 0b1bd5970421c32bee1209179eac60682d7304aca597bca11dd477903f59b53a2fbc7d9e1717809e9a8e550564a9ca9139dd1127b9f4cefcc2437d7c8050985a
 DIST ldb-2.0.8.tar.gz 1676902 BLAKE2B b86b24a597bd81ae11382311f3b60aeb8aca78ddbe63413b9a8cdbbfa4f52b05a0d2e325d483e260b15aa396c2ad9f2828ac4b6214af86d891281d05b24125b5 SHA512 23a44968c9b4b57deb3f7b7b2466f140b4d8534a07a5e866545dd108c3d305ee4b0ea9bceec3177fcd09a4efcb4876a8283ca58b5c496fcf323b810666e1e79a
-EBUILD ldb-1.1.29-r1.ebuild 2532 BLAKE2B 543d6698883612ef05f41d7b0cdd0e1b38a4bc2bcb73660046555ce68153c60ca5d38f2c4de28ee14c8d866a012a6a4e5cfb57e4d539830a4ad6cf36556ca271 SHA512 8209dd924eb664b122701f26c2dd1c0fd5f921ee7cf71bec5079688a0e009113e1ab58c9ea2a64cd76ddb43aa81faf115ba5817c8e8e1495c923b3868a8b2be1
-EBUILD ldb-1.1.31.ebuild 2665 BLAKE2B 05df725cd7827565bbfa3292b8d94e6ca1c7e257c26451ce4fa9b4817c1cd83f2cb1227b23cb06131af2d9c02129b155c1fd56050e67131934e1e4a83f7f9df0 SHA512 6f7746e2d6d8ae4405ada1597d75a6345b6043b653cced671fccd6bcee34bf627d9fcd9670a63e3ce4233dbefa33a0493d1df8418a7062cbd2f995960edf76e4
-EBUILD ldb-1.2.4.ebuild 2593 BLAKE2B 61f60e67593d2c60da0dac603249b210527d7c7ecd305d031dc9bef7965dcf0292928a811d8075a9fba2523a07f3f7c7b0f9058dec960bc95e9cccc82245b981 SHA512 4e68eee121bb9cfa147e996470b738a9ca8d73336dc982df01bd73689f10a9e837edd31ba3a988e522e90b1577b09d680cafc6bd1fc824327bded7c88533c169
-EBUILD ldb-1.3.6.ebuild 2540 BLAKE2B 6383c2b1c2ca31db675ad6565bf8b9da414a0182ff9a4a53c22c9886999161a4acddeb3b6ce7f2866ae360b1765d4697ad669cad8b33066cbe569e1e203337a6 SHA512 2c940f146e02db9f5e5e1ea66d544459c0e6b5e5a62571f990edb8bbf9d92c483d6b92923086f7e730d939bcfc16d2198b5026e15636518a3a172a24cc61ee38
-EBUILD ldb-1.3.8.ebuild 2546 BLAKE2B 443f011a12e589fc21d83e24d5c0d5c6a2a70e056bc7b1e3d27ce5223854708f3c827af48a0cd05ee11e4cfa388755dcfabc5db741248e929c5b67aa39175268 SHA512 30d55c78fa1499237be138fa095fd09175ad73ce669c852547636e696b1bf834a422977ae582a798a968af0de656e87eab881f65052fff64d26781f5e0fcd508
-EBUILD ldb-1.4.8.ebuild 2640 BLAKE2B 608e1e98a68c5c0c34d91bb4725d19a5527e126c1ac3a96cc101ca4bcab1528caf0519f9394d63240b089627c6188257abfefc3df158dfbaa83222e4fa73893f SHA512 cd9f3c4a8bdfa8188d2cce093fd6c82d7e1ee65f68ee77116de782e7c2a77ef1ccebd28fc79199e0d195031c0c311e96989ed09a6493a03393f4d1a0d8a4179e
-EBUILD ldb-1.5.4.ebuild 2646 BLAKE2B 7e43d18005139c6078de746aed8b1cffbaba0d4cc4f59b2039ccaf188c0d792a7644e4afde05f9d137d8e771733fa03eaa8b9bfe4d29a90d5b11ced4016c0522 SHA512 79c5d4bda78070235f2f2a4e51eb09028b60fed53dfcf452af29ca1f126cf9910de852b2ece968d7083a082c90f7e5a6b66346994b8333d983aae8a83dbe12b2
-EBUILD ldb-1.5.6.ebuild 2647 BLAKE2B 6c12e7ffa17091834db3faf66800180a4cf27e3ee97e99523ec55950cc1be97905f009ff24c886ccd135bc43f96c29702f68bb25e31f5e2b02e2c679ab8cfc85 SHA512 c91719c0a4affc2047fa98721d14e81037b76201eb13e4198d234d97aa17f6c70d99bb4aa7af0679e5294130741661beb3fe38204562afe25d55eff820ebbd34
-EBUILD ldb-1.6.3.ebuild 2647 BLAKE2B 6c12e7ffa17091834db3faf66800180a4cf27e3ee97e99523ec55950cc1be97905f009ff24c886ccd135bc43f96c29702f68bb25e31f5e2b02e2c679ab8cfc85 SHA512 c91719c0a4affc2047fa98721d14e81037b76201eb13e4198d234d97aa17f6c70d99bb4aa7af0679e5294130741661beb3fe38204562afe25d55eff820ebbd34
-EBUILD ldb-2.0.7.ebuild 2645 BLAKE2B 421f0677a8ad8a8112af5275ab56f303fd0c8118c9f0d2bbd8174f5c8a3fec88f87305ec6df1ad5d5031bc7959dcad1df5131d2a198fe70d55772fe89103ba35 SHA512 2283aa4c180886e9c2e4c48672cb6bc38e202dae3d31a7a3b7eabec3a279d15eabb7dc225a2ae48ad552d81c9601dac6a46ffd67e29251bde23fc91be2329415
-EBUILD ldb-2.0.8.ebuild 2706 BLAKE2B 841f29ee7190db748cb0ee683fdf0ba130c4c02c437f63fa35693e6345dd14362572c5abb2c3887004be523f22efdca89da2a5a0482f0fe53f4c5b5b62c5ca1e SHA512 5625295b5f94a27987e8ae09fefebcac2d169c9a349428f64f47d004ba75d85d827620bd787c887c0e80fc66f34ad5bf670e882e8072ecae9c5389af2e9f1493
+EBUILD ldb-1.1.29-r1.ebuild 2533 BLAKE2B 1b6396c2e02ccd953f66978f32eeaecda40af69d1d7a2422021ed507b86fa7c53a49a4564635b7335006709e6d033dd031b13b1cd354a87a26cb73d4decfcf7d SHA512 49ba82b65d7eadcc2c0c95b1a13e74ac3c2b40d7aad4e917ce04f7f52a65a6790d2abb15de06fbc2cabf90f9f07fb7a7b591d67d7d544e740a828da919a65e67
+EBUILD ldb-1.1.31.ebuild 2666 BLAKE2B 2e10b4c1db7b390f63613ec191c6656a66cf2f1c4ba254fbb7e0e06db06af77ac0ff21e7d852178458ea95ee6fce29a5eed8bee0a4cbc94b282cf01b9ad0c24b SHA512 0dd17abac0462375cee3ea267fedc97e0386cdb60f7efb28884a6055c6bac6948b7a364c809271489322c2fea6f2c3c4fe5c307f2fffa8254cfe59925b7fd3d2
+EBUILD ldb-1.2.4.ebuild 2594 BLAKE2B 52959030dbaf15a8fe9f8dd55cd355ed67880ad0f396e77a3aa44dea2dd5de5cbf6e7122af3f3112c6112685d972f528f7601b478b3fce9ef94615fcbc7c23e7 SHA512 8fe345ec1d9ed74803041e08e0699b50f6f5106bf0fea10d96c4144c1a0b2f4aee4d2952303c1b3900e15909f5a470147b10bfa75005dd21201e3703ef83e291
+EBUILD ldb-1.3.6.ebuild 2541 BLAKE2B ca21a5d1fac9b5c2aa87efb133a144391366867e88f53697c760ea29ca840fb16c3f90f573c261c2ec4e6c28bcdb1225a493a7b2031274264f4a42ab9ffb0e95 SHA512 73c15170d9b178bcc02a2ab22b85443005c59692930081a709d3a70fc9440bdd024d66695ce50f5d3e3096a381e6d2831b6200451fe9bdbdbc017362a621e4ab
+EBUILD ldb-1.3.8.ebuild 2547 BLAKE2B cd8a8179d5e3a6d14f294b8cd1f3699d88bd3435e91ee7bd836dc33dfc4b63e1260f36bdf0768cc10ed50236ae15adb4ff0f4adc2e8b0538c805cbca5b42358b SHA512 578680ded950a2dd84dd01177343dff434505c41df0902f54d5444575cf3d65d55b7274e8412696c20cfd8bfda52e3c751c20079bd3f8800aa20fe6babf20ba2
+EBUILD ldb-1.4.8.ebuild 2641 BLAKE2B dd813cae8bd86dba7edeed0c18fd6d1aeb2975ba88485d4daf65509dd7025cfaf75aca563ecf603925959eaf184fde4aaeb82a6869aac1b0deb18b588fd60008 SHA512 c4b950ccfa1df521db6e82213fd8d84c29ed538b8368fb2c325d463f845b35a8259f50b094d294014e725e98df2d1b3a7f3fff6cddaa7c1894d2076f2080fbd3
+EBUILD ldb-1.5.4.ebuild 2647 BLAKE2B 06ef03eaed293d096a23eef2d16d07a527ea3902d87b9e1bdf95b3d174fb1b83412d2f0fd0b658d7547c50ec7d631e4ac5465c8a32d5992bd5400905922a934b SHA512 68c096a7209e57c37d1ed789f00a3949e7c90aa83801fee8e6941b4ff28e9627782ed6cbdb7fb5b7e5be1cc43aa196ae69d2acdb9e4dea1fc5c0955fa3611d92
+EBUILD ldb-1.5.6.ebuild 2648 BLAKE2B 2c655c275fc9f18fe2e51ff5b5d3ea5ce9715d06ea1b672616e0fe93cc5731b4932bff4a8951cb194476cc9a662938bfe1e889687e7a5b93b36fc2fc5c5cdd65 SHA512 5dec83758f2cc5cc26a39faf0d17a016964aa826f38468276289b342ad04c0514b934316d28a70a9b1329aae7c65f222f6483e6ea3d27de87f942d208fdb4364
+EBUILD ldb-1.6.3.ebuild 2648 BLAKE2B 2c655c275fc9f18fe2e51ff5b5d3ea5ce9715d06ea1b672616e0fe93cc5731b4932bff4a8951cb194476cc9a662938bfe1e889687e7a5b93b36fc2fc5c5cdd65 SHA512 5dec83758f2cc5cc26a39faf0d17a016964aa826f38468276289b342ad04c0514b934316d28a70a9b1329aae7c65f222f6483e6ea3d27de87f942d208fdb4364
+EBUILD ldb-2.0.7.ebuild 2646 BLAKE2B e86b9a1a66ab53c68ef5ce62f1d68b62d305dcc45e263f425746da41fc4946f13cea740cfd76f012c325df314312f8bbf571b6a3463cb1615a3e9301171cba7b SHA512 0847307c1b5b3bd88677e3cbd24c5870ba6f932ad41e41d5ed44c23ccd0376f1602c215893a5dd83ad7ffe63ce9fc79f06a97bed2fe9f2c0c938d158f6d017a8
+EBUILD ldb-2.0.8.ebuild 2707 BLAKE2B 1913bd94db6210b5860683367a76f8921b28d960f40b2d3de3abbb4ba03f6db394493d8a6d6ae512c9a570da60458d7f5dbc807ecee49644584e477d18394e3c SHA512 a3e7882dc30895ef0df88c7e3e343e570425b0555ca9e5b5ecc147be3727abbe5cee5789f4053cd86d9b1777bb47561fa4d7e5e2d4b878a138ef4c3ebf917143
 MISC metadata.xml 525 BLAKE2B 161146886c9d4b7139238e5753f02bbbd3eb4aa6c59415f45710c11b25e80d6e4085036e00808b38d06b671dc976922dacbab9ef3f4f18ed9793d5b5621ff546 SHA512 87a8414b97c3f08fed9395574f7be7739c845c593c2fa324e6928758e455e2ee9d45c2607dba298da2c1e21863878c147e613f6fc3750111952b7e7a7b7ada95
diff --git a/sys-libs/ldb/ldb-1.1.29-r1.ebuild b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
index 9046773f1972..a6c0906ceed5 100644
--- a/sys-libs/ldb/ldb-1.1.29-r1.ebuild
+++ b/sys-libs/ldb/ldb-1.1.29-r1.ebuild
@@ -69,7 +69,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.1.31.ebuild b/sys-libs/ldb/ldb-1.1.31.ebuild
index 74645d7ca7f3..eefafd3a0468 100644
--- a/sys-libs/ldb/ldb-1.1.31.ebuild
+++ b/sys-libs/ldb/ldb-1.1.31.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
@@ -71,7 +71,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.2.4.ebuild b/sys-libs/ldb/ldb-1.2.4.ebuild
index 1d8b072e20ec..cf8a380ede1d 100644
--- a/sys-libs/ldb/ldb-1.2.4.ebuild
+++ b/sys-libs/ldb/ldb-1.2.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
@@ -70,7 +70,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.3.6.ebuild b/sys-libs/ldb/ldb-1.3.6.ebuild
index bdef2b0a6ef1..dd10d39ce1e3 100644
--- a/sys-libs/ldb/ldb-1.3.6.ebuild
+++ b/sys-libs/ldb/ldb-1.3.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=6
@@ -70,7 +70,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.3.8.ebuild b/sys-libs/ldb/ldb-1.3.8.ebuild
index f149a8b31982..c67965ec43e4 100644
--- a/sys-libs/ldb/ldb-1.3.8.ebuild
+++ b/sys-libs/ldb/ldb-1.3.8.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
@@ -70,7 +70,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.4.8.ebuild b/sys-libs/ldb/ldb-1.4.8.ebuild
index e58458823b0e..79adbc97587d 100644
--- a/sys-libs/ldb/ldb-1.4.8.ebuild
+++ b/sys-libs/ldb/ldb-1.4.8.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
@@ -72,7 +72,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.5.4.ebuild b/sys-libs/ldb/ldb-1.5.4.ebuild
index a4c441946d79..4d482e984348 100644
--- a/sys-libs/ldb/ldb-1.5.4.ebuild
+++ b/sys-libs/ldb/ldb-1.5.4.ebuild
@@ -72,7 +72,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.5.6.ebuild b/sys-libs/ldb/ldb-1.5.6.ebuild
index 4a42a5384863..e923eb6743da 100644
--- a/sys-libs/ldb/ldb-1.5.6.ebuild
+++ b/sys-libs/ldb/ldb-1.5.6.ebuild
@@ -72,7 +72,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-1.6.3.ebuild b/sys-libs/ldb/ldb-1.6.3.ebuild
index 4a42a5384863..e923eb6743da 100644
--- a/sys-libs/ldb/ldb-1.6.3.ebuild
+++ b/sys-libs/ldb/ldb-1.6.3.ebuild
@@ -72,7 +72,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-2.0.7.ebuild b/sys-libs/ldb/ldb-2.0.7.ebuild
index 6678e2571e8a..7ff1765745cd 100644
--- a/sys-libs/ldb/ldb-2.0.7.ebuild
+++ b/sys-libs/ldb/ldb-2.0.7.ebuild
@@ -72,7 +72,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/ldb/ldb-2.0.8.ebuild b/sys-libs/ldb/ldb-2.0.8.ebuild
index 714949be4e5a..7907603045a3 100644
--- a/sys-libs/ldb/ldb-2.0.8.ebuild
+++ b/sys-libs/ldb/ldb-2.0.8.ebuild
@@ -75,7 +75,7 @@ multilib_src_configure() {
 	waf-utils_src_configure "${myconf[@]}"
 }
 
-multilib_src_compile(){
+multilib_src_compile() {
 	waf-utils_src_compile
 	multilib_is_native_abi && use doc && doxygen Doxyfile
 }
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 2b96194d1063..dd8180b15874 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -6,10 +6,10 @@ AUX libcap-2.28-no_perl.patch 2599 BLAKE2B 55a6ef3573517e7cd7f367b811a5b6edc2b91
 AUX libcap-2.29-build-system-fixes.patch 6642 BLAKE2B 747ca2279f1b44ed9d89a318fb06e5efda96388020cda126870dba0754e4651a3d4f2c171470da52cd51dfb6f7dfc57b635ac805160dd2bc995337f2bc12221a SHA512 e82497d111ac96b2fe20d245ba731d5e085a3039a4eacd9da5b598d84293bffcf40da50284139006c9d895d4274dd83811ef05d08e50e72fea44ff23873945fe
 DIST libcap-2.26.tar.xz 67172 BLAKE2B 9d1952bd03e1bba5ffa225a5088b8d841c2007219bbb9524f979ac65e472bf932db496acf93984fa77fe42e71d45b85cd603ca461a071fb4742526dfbc5f66eb SHA512 1c2d59f007226405a924950b2c2090393527e06f0692a84e6463e33915a070df61a9070b8f30a624d5630ddd39290eac117e5d440577d1edd48510195b9d12f0
 DIST libcap-2.27.tar.xz 67780 BLAKE2B 7b58d7afdd90281771a302cd9554f067b9e3636b0c052935973d8a0d890490c3933b3513874b788a8c10e37ab5ad9cfa766408c9629b7c8562cb17bfdef87747 SHA512 e32335fd3e0d1564574acc73df7030b5b0fd98875217bffabd76f2765f1a7a6f1369f03df2ee22a1782776838784e342378c10613ea1163d53ae5055ab6a62b6
-DIST libcap-2.30.tar.xz 98528 BLAKE2B 83892df1dc4f2a7605dbbf7332e90f1b696e16060ceba20a3fa3cdd53cb30f6a28d2bd49a4a66b7bc46221f860307de7c22cd7b2f826bad86baad6f510d01e40 SHA512 b2d843b61c3dd583b97c11ad4737b9ea5493eda6bb40da1efdb88b68c0594aeb0a2cebb0a59c749da1c6268ad1f821802d3c9e125a07c2d2457a0eb9df8c0c40
 DIST libcap-2.31.tar.xz 99236 BLAKE2B c4cd5e2e105cc05b2aee2ee6435b9a28c06a91dee5cdd1baf6d94f625d89e134ad35a4493ffdfda7f3ffb0b41aa6e75a20cd705bfe9df570e82d0b6ea4e484e1 SHA512 9f0ef665a52e77356d6028abdead3c3cf75f97406ac09d60a33500222428c581d8aaa7d25d7eb9051d9c73ebfaefa7af5581430e1ecc1dfea73398a3ac7cbc3a
+DIST libcap-2.32.tar.xz 99708 BLAKE2B cbd4676ca9ada4c4dd6dee5137c0bb16f23af5d9a224c81b476c19326f87352fb06e2e123c9431558cd22f91032064ed6de8407d5861728dd141be16957363db SHA512 e2325cf0a1d0509c49336f7e5760e5b339c889cdde8d6c359197aed711423f951ad390a2a3dd4943b03afe152ad8502ea1db9d7ef247148b93e93a3c4895a019
 EBUILD libcap-2.26-r2.ebuild 2044 BLAKE2B 00ba6b0c0fa0ae18b35bdc61c414a7bf969971edd1620bb2c5e88af13cf58aefd820965c77788dbd380f9dd8feef969d56d428b619eb5f820e15692d6c4948df SHA512 ab0bea45d0e7c672bc4fc66827ade8f545db55bfcec941f3aff3ecbf2f3b444a65ec92ac03d81a763c5c69fbd9115da42442c9bf1dcbbe094931283381bcea02
 EBUILD libcap-2.27.ebuild 2056 BLAKE2B 243ed538747bd8d1588dd3ddbb654ebe9ae9f1e121b6fb37aa9888d3461c5d143ed93ce798f1f9b499cf13471751e129ac2f3d55b76124d9e253e3e4b6a530e1 SHA512 6bca40f0b987958c7d244bf64c915aac5b3d60fa4dc503b090b306039d8c23c99932071b1f44a22de25f4e38dc685a5c835eb85159ea2215d6d2df54e7314e21
-EBUILD libcap-2.30.ebuild 2128 BLAKE2B 622799b87c4007a2a1920a2880692e25a26e6316a4b88d4ad97b0e69d376969a7507e65c0bbcac69ea01d397d5a022c16fd7f241cc0973d7512d88c3f045473d SHA512 397c13d66e11b5aac1a0748961c2e5c9bfcae185fc56e3472f63b31fd0f7d8855947cd31e4b8dd2261e82617d1e63509c35f4c9b72f224a0d9790b2d93c352c3
 EBUILD libcap-2.31.ebuild 2128 BLAKE2B 622799b87c4007a2a1920a2880692e25a26e6316a4b88d4ad97b0e69d376969a7507e65c0bbcac69ea01d397d5a022c16fd7f241cc0973d7512d88c3f045473d SHA512 397c13d66e11b5aac1a0748961c2e5c9bfcae185fc56e3472f63b31fd0f7d8855947cd31e4b8dd2261e82617d1e63509c35f4c9b72f224a0d9790b2d93c352c3
+EBUILD libcap-2.32.ebuild 2128 BLAKE2B 622799b87c4007a2a1920a2880692e25a26e6316a4b88d4ad97b0e69d376969a7507e65c0bbcac69ea01d397d5a022c16fd7f241cc0973d7512d88c3f045473d SHA512 397c13d66e11b5aac1a0748961c2e5c9bfcae185fc56e3472f63b31fd0f7d8855947cd31e4b8dd2261e82617d1e63509c35f4c9b72f224a0d9790b2d93c352c3
 MISC metadata.xml 332 BLAKE2B 2177c836192a85a6d943221da405f7f11f355011767789d81009d5e4d822a203302a946fa1a0ffbc66be6a37a7069aa94a796125fa1dedbdf023762b47f8f614 SHA512 a9887500fd60b72156ac2589b1fefab8dd70b0c03477dd795f147fdc91bbe6fd027b8cf58c3e86cdb6e831368d34b4881cdf0e833af5aee9e7d1a01e90408ae1
diff --git a/sys-libs/libcap/libcap-2.30.ebuild b/sys-libs/libcap/libcap-2.32.ebuild
index 019cf1be2c68..019cf1be2c68 100644
--- a/sys-libs/libcap/libcap-2.30.ebuild
+++ b/sys-libs/libcap/libcap-2.32.ebuild
diff --git a/sys-libs/libosinfo/Manifest b/sys-libs/libosinfo/Manifest
index 8f47df1ba79b..4d42ebb4a693 100644
--- a/sys-libs/libosinfo/Manifest
+++ b/sys-libs/libosinfo/Manifest
@@ -1,3 +1,5 @@
 DIST libosinfo-1.4.0.tar.gz 1075852 BLAKE2B 93129a29ea3a1a3aa69fdceabcf6f41393c8e1dd3f92872d97dcc23a3316b0e4d16ede104da9a3ea0c49d352ba88e05ba5a38806c8c039fe92217e4b6e3140ab SHA512 531b7acf811add53252e52917f8b13b409dbe7a4bc5837dcbe34e729b0f294e760d5a57c5c1c56f1f65217b7fc6e285a56a6fa49d36f02cf696b7cc181db1fe5
+DIST libosinfo-1.6.0.tar.gz 1024787 BLAKE2B 4d0783b41f8c9ed7472c798acede0cd1f3808858ab954e838e8d7543dc50a9819d1f26b0cb02a97c8ed8ebee47db1b915aab5daadc0be2742e8f5c1ba8451a75 SHA512 53359095e40ef12e0cc142ddc92119b4a753bb47a728f13a8ff500a19108a44eb1f6ebe4ed67b04347a707dd0c0d55bcfe6815b57d187237dddd7376ebe9cf5e
 EBUILD libosinfo-1.4.0.ebuild 1889 BLAKE2B e270a3fc8436b9766caa8c7d5dcc0812860422e66571964c23115c3e165ec5ca922fd728ea693bc09d10693eda6f99845b1d03f893dc3ef89aaccd28c2065702 SHA512 f2d7c045173732f79333e0c04341d50155afccc4ad4f33a7bc53e83977a0074a9aaaa770fc2decbbc10aed860b91a7dd232c88fbe6879157b63f22d1e0506545
+EBUILD libosinfo-1.6.0.ebuild 1458 BLAKE2B 2a3c766c681b721658ff53fd9129b1a82b86d9154944ba65bd8b2ed79c1c7074364f5b908ac80101d5237bc97b2ed9370dd795a5448b809b0d10032e3dba79e0 SHA512 ffd6fa7c08dd67eb4b46885aa8c72fe2223cf78cc8ee5184e16645a3881d92fff5d86cd6e5bf719a0c51391fcf46451134ae41c2a7951990cb0ebc0faca6c34f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-libs/libosinfo/libosinfo-1.6.0.ebuild b/sys-libs/libosinfo/libosinfo-1.6.0.ebuild
new file mode 100644
index 000000000000..1990a9c8b5ac
--- /dev/null
+++ b/sys-libs/libosinfo/libosinfo-1.6.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 udev vala
+
+DESCRIPTION="GObject library for managing information about real and virtual OSes"
+HOMEPAGE="https://libosinfo.org/"
+SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+
+IUSE="+introspection +vala test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="vala? ( introspection )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# Unsure about osinfo-db-tools rdep, but at least fedora does it too
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=dev-libs/libxml2-2.6.0
+	>=dev-libs/libxslt-1.0.0
+	net-libs/libsoup:2.4
+	sys-apps/hwids[pci,usb]
+	sys-apps/osinfo-db-tools
+	sys-apps/osinfo-db
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+"
+# perl dep is for pod2man, and configure.ac checks for it too now
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-libs/gobject-introspection-common
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.10
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	gnome2_src_prepare
+	use vala && vala_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--with-usb-ids-path=/usr/share/misc/usb.ids \
+		--with-pci-ids-path=/usr/share/misc/pci.ids \
+		--disable-static \
+		$(use_enable test tests) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		--disable-coverage
+}
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 8fb654cc05f6..b9700ee281e8 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,4 +1,4 @@
 AUX libvpd-2.2.6-localstatedir.patch 688 BLAKE2B e1674fd78b6b863310a4f6a0c2f0f031a7e5009cf3e392fa373ef4b6a8de950632839cd5111876f1337527471c61bce34dea9c4f33259fad5607d65dd72c0493 SHA512 8ce3f73d5ef84922dfb7574cbf01adc9fd0d2eb34b9e9f56a57aa888944ef66cd4b35286b559dd4d0769a024693622896900adbfec391d316e20b533781dbe49
 DIST libvpd-2.2.6.tar.gz 374262 BLAKE2B b7741948aa62ad6221d28a674f765d085e1446c0bb45d7aa7a5f08599471023b2bb794ad5645c3b70af5806cd48cc87f117f9b4021e0f8c872ca48b748cc1e60 SHA512 17046eeb6ccc5372d465848eff7135cf6e9f876a2d82862e1d01a9f674b691958942e119f846bc3220c1e8f7eb549c5c7867d5d5e896072c733f400d202abc1d
-EBUILD libvpd-2.2.6.ebuild 895 BLAKE2B 8c8f887a46a5215f6e6234bc20a8b4587d3ea18b9940c02ea7015d3b370b886784cc0263340571fbd51096c81487b1e77cc5291f854cc1c90142001793e48020 SHA512 6ed0a9d8754eff77745c35ac9dc46f3531bed9d109bfc5b6c06a592af9fc5a7f4b09c01ff10f5e3c2b6701e5aca7786f8b5e8680608b40663c9c6bd91322334d
+EBUILD libvpd-2.2.6.ebuild 896 BLAKE2B b5b1f44f7baeb76b113abb72bb93ab264264cfcf401ae2feda707f6cbb4443ad9827cdb44fd4100fdbd0bd2511f63033c80b1cc6555dd744820aec6b7c4d2ddd SHA512 68d26a3b3c1c7a9db3f39a8201cf07a4809e5be5424a177aabbddd58dd796e4c759466242099135e94fe8d62e89413524a0f10c55813e76e70c3b76327e79328
 MISC metadata.xml 343 BLAKE2B 88ff852b7b901d0f81c494ab49f283835edb7e312965526050fde66fcf0b259c197e0b1b312e09910a77257e4e1b8d8f3fd6c465b95a9fbe7288b8d64a4a6659 SHA512 42f1b8b76a107cfa61ae9db8b900aed22a3bc8e8d3573dbb3c507ebde688ef2c50f7f79847eb345e738365fbb99ba22d99aee56e302c6eed064379ddc1e3a710
diff --git a/sys-libs/libvpd/libvpd-2.2.6.ebuild b/sys-libs/libvpd/libvpd-2.2.6.ebuild
index b10fb292b5fe..2a691e27d0c6 100644
--- a/sys-libs/libvpd/libvpd-2.2.6.ebuild
+++ b/sys-libs/libvpd/libvpd-2.2.6.ebuild
@@ -31,7 +31,7 @@ src_configure() {
 		--sysconfdir="$( dirname $(get_udevdir) )"
 }
 
-src_install(){
+src_install() {
 	default
 	keepdir /var/lib/lsvpd
 	find "${D}" -name '*.la' -delete || die
diff --git a/sys-libs/musl-nscd/Manifest b/sys-libs/musl-nscd/Manifest
index 6587aa16dab6..8f6df8f8cc99 100644
--- a/sys-libs/musl-nscd/Manifest
+++ b/sys-libs/musl-nscd/Manifest
@@ -2,6 +2,6 @@ AUX nscd.initd 1415 BLAKE2B 4f9ef4c36addc71bb42ba1d8e1fa8657efd4b8d52ac69f8c1baa
 AUX nscd.service 337 BLAKE2B 6b163465dd8db024652921892dc913da8dfc0984eec7ffce621229e48fa99dcedc3b5944844529190122c81f4884b6a6fe7836d37d2d812f34059c530856dec1 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea
 AUX nscd.tmpfilesd 111 BLAKE2B 4abb7220564e248fc7eeeced41077f186f42594facbfac9a4c0ff36209baac529c219ad6ead8d8aa53ab2b092002f1006a4479459b9e9a7c5a0294cb7d822100 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340
 DIST musl-nscd-1.0.2.tar.gz 44912 BLAKE2B 8a496c941232ba617b8468351cbbb780b1decc2c162210f939abb3baa430a5f5a79e21fcd3aadac2cbe62820452fc18001edc7ebc13cae7a6ab768353c45235f SHA512 45cd73f1e0eee7b32c3dcdfa96c0a11379f6208389b87fee97016af0ecb19e9e7d2a2f10e0df6e5ed8a6ad4bbbef70c01cd31ac3631fb1bcce6e69bf48843a3d
-EBUILD musl-nscd-1.0.2.ebuild 925 BLAKE2B 4aac4a2b0403ea230752843bea7f91d7d31ee14f13e294aff2ea92171d6706cf2acffa07de6308d07541c8931e624824b0810c49a39d075ce067a2511625c70c SHA512 15831aefdeba51adb75c3b8e5db2a8b7bcdbabb55311723d47776dab16d0a26458fc74db9e79d81accc8eb6f4bc3affbb6189cee01e9d86df6a98c3e6d8b184c
-EBUILD musl-nscd-9999.ebuild 925 BLAKE2B 4aac4a2b0403ea230752843bea7f91d7d31ee14f13e294aff2ea92171d6706cf2acffa07de6308d07541c8931e624824b0810c49a39d075ce067a2511625c70c SHA512 15831aefdeba51adb75c3b8e5db2a8b7bcdbabb55311723d47776dab16d0a26458fc74db9e79d81accc8eb6f4bc3affbb6189cee01e9d86df6a98c3e6d8b184c
+EBUILD musl-nscd-1.0.2.ebuild 971 BLAKE2B 064b3824beafd9c6cde6f22f70df7ea3e62bfdafe07bdc98d905634be8a19117b8bc5fcddac9dcfcce6fc32a0597bc9b298f5747113b5133223845a4be69d11b SHA512 df61e620808dc21b9ace84f5225adc1477fde1431dc0706ddb0fb3f742e2bcdff12c1abda5cef8714be2adf24ec6a69e092f921ac7aa7e49c9dbc378ee263348
+EBUILD musl-nscd-9999.ebuild 971 BLAKE2B 064b3824beafd9c6cde6f22f70df7ea3e62bfdafe07bdc98d905634be8a19117b8bc5fcddac9dcfcce6fc32a0597bc9b298f5747113b5133223845a4be69d11b SHA512 df61e620808dc21b9ace84f5225adc1477fde1431dc0706ddb0fb3f742e2bcdff12c1abda5cef8714be2adf24ec6a69e092f921ac7aa7e49c9dbc378ee263348
 MISC metadata.xml 408 BLAKE2B 579dfe2bda31eb1fc83e098f2b3675ef14b9c62b62ed5cfc01989b22f8925a2fbb029bafcb29d12574faf39abd5611adf699e98266cb01e25324baf3adeb4e62 SHA512 e96f5818d7882c06ec6788eb7ee5caa504773d130cdc20d3f314c1787e655879490c8559b0366561ff5d209cfa9f31a10fc3f9985c522a78947870c2c8b5122f
diff --git a/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild b/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
index b47444961d2f..6d29e439755c 100644
--- a/sys-libs/musl-nscd/musl-nscd-1.0.2.ebuild
+++ b/sys-libs/musl-nscd/musl-nscd-1.0.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=7
@@ -21,6 +21,10 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="minimal"
 
+DEPEND="
+	!sys-libs/glibc
+	!sys-libs/uclibc"
+
 src_prepare() {
 	eapply_user
 
diff --git a/sys-libs/musl-nscd/musl-nscd-9999.ebuild b/sys-libs/musl-nscd/musl-nscd-9999.ebuild
index b47444961d2f..6d29e439755c 100644
--- a/sys-libs/musl-nscd/musl-nscd-9999.ebuild
+++ b/sys-libs/musl-nscd/musl-nscd-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
@@ -21,6 +21,10 @@ LICENSE="MIT"
 SLOT="0"
 IUSE="minimal"
 
+DEPEND="
+	!sys-libs/glibc
+	!sys-libs/uclibc"
+
 src_prepare() {
 	eapply_user
 
diff --git a/sys-libs/musl/Manifest b/sys-libs/musl/Manifest
index 684d2156be6d..5d13e7853f7d 100644
--- a/sys-libs/musl/Manifest
+++ b/sys-libs/musl/Manifest
@@ -4,7 +4,9 @@ DIST getent.c 9438 BLAKE2B dc20353583c10a001bd8fe8474f32b70254dc56da186d1cdbaf40
 DIST iconv.c 2577 BLAKE2B 070ca87b30c90ab98c27d5faf7a2fcb64ff7c67ca212ee6072165b2146979c551f714954dbd465462a171837c59b6ea027e0206458a2df0f977e45f01be3ce48 SHA512 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf
 DIST musl-1.1.23.tar.gz 1013779 BLAKE2B 0251604697f6e243d173c6a72d0a24ddbbce298f8e3a53d9d3a18d7f5ebf19f4e85584a494639c2470530b61c3189150bfaed3376e31acf4e1b2daa1c30860dc SHA512 a2278de9903852b08352d3e734a39d4616caa602496997ba843e8fea0e1c481761776745faf04536a149d1c4af416b68df681b6fbc9ae2de8794e18c2e853b09
 DIST musl-1.1.24.tar.gz 1024988 BLAKE2B 5fa26746eed0f2334b740adf94a8400568d56d9b2276bf1fbac828f9b707b4e215d3c16af9ea048b9d771f1d0a58ada3bc6e1bf0ba8f5fa693f5042fc6af30df SHA512 8987f1e194ea616f34f4f21fe9def28fb7f81d7060e38619206c6349f79db3bbb76bae8b711f5f9b8ed038799c9aea1a4cbec69e0bc4131e246203e133149e77
+DIST musl-1.2.0.tar.gz 1035265 BLAKE2B 0a47e0f438cca0f3ce31ae024c19358160214842115b560efc48e66228055c9147d9550957a79425322d510ba773f197d0944bb844bf6addbbf698088a3358a9 SHA512 58bd88189a6002356728cea1c6f6605a893fe54f7687595879add4eab283c8692c3b031eb9457ad00d1edd082cfe62fcc0eb5eb1d3bf4f1d749c0efa2a95fec1
 EBUILD musl-1.1.23.ebuild 3185 BLAKE2B 1026074140839609490b2317505d73158b1cef832c85dcb0e4f6c50083bffeddf9c67b72b7e36b8bf3e7f0f2c647200b43bfe72e7306f17e0532af80638543ea SHA512 df14c860cd56e9cd24f43c125174f2aed00ac0660c3f74a808a8b8d6c5b0f49ed7ab6e8d8c7c5725bc296a1c3c680708b3e5f72f8605e12ac9caca7147f9d73c
 EBUILD musl-1.1.24.ebuild 3191 BLAKE2B a58e17b751cbf37abd114f4b19621723da613f4396ad51cb9db10f01132a6d3813137db77d3dc6bd62e4632b4f213e6cab1dd25a40e11b410136546336077aa3 SHA512 9a26e02bd394a3b8339632fb58ad8e9387325b376d4de14efdcf6e6b0d0223af77a9421afe8a8679cf3ec7e185cd10705f16324378699f13e64085c2e19a0ba6
+EBUILD musl-1.2.0.ebuild 3197 BLAKE2B 90b835e7eb0b3a972859d1a944dbb2d772a6bffcb5180b4ebddcd874cf5a104d8f8923e50cded5a2f2ed666df9bb553ed4cadf78b8ccd11e797ec76e8c687f8e SHA512 1b5fbba888d3b7c4521fad7486ccf930b1baf52252554e4f0028fe69a4b814e208f697dceacc0e66c8c6236cc8a5fdd3a7c3f364468ebfb09d078d2ed10eb74c
 EBUILD musl-9999.ebuild 3190 BLAKE2B bf8b78f641cea6c7159fc66cbd7baaf54439aac9323c57092a3d688166fd4c5a209ed12e5ebfbd9ce50feffe794778bd1b3a90d7239d966bd25e21110fd153df SHA512 89fc2bc34ae68f7ac8d824271cc2c6a9e24794d2eed23dc536bb711b82c9b8ab1fdd738453f35eef1eb1bc3b58ac9086b06a1f2f4183812d43f9fe15b22ac2cb
 MISC metadata.xml 453 BLAKE2B d7b2840a6b0bb2ede2124f22bde34a9f77ac258792a9fbf9d9e3f552a85d6ee539a98c8704729efb75dec627db62b33759fc0cfdfd01614abbc4960a163c5019 SHA512 5d8bebce119ed34a6a6b8cb07b3ce056db5efc91db80709fc8031c955b16e29965f3741f75e9afbe9f428bbac1e39e7c30278cd63f04479e3a1493b006195e0a
diff --git a/sys-libs/musl/musl-1.2.0.ebuild b/sys-libs/musl/musl-1.2.0.ebuild
new file mode 100644
index 000000000000..e33c6c809136
--- /dev/null
+++ b/sys-libs/musl/musl-1.2.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.musl-libc.org/musl"
+	inherit git-r3
+	SRC_URI="
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS=""
+else
+	SRC_URI="http://www.musl-libc.org/releases/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/musl-misc/getconf.c
+	https://dev.gentoo.org/~blueness/musl-misc/getent.c
+	https://dev.gentoo.org/~blueness/musl-misc/iconv.c"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+fi
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+DESCRIPTION="Light, fast and simple C library focused on standards-conformance and safety"
+HOMEPAGE="http://www.musl-libc.org/"
+LICENSE="MIT LGPL-2 GPL-2"
+SLOT="0"
+IUSE="headers-only"
+
+QA_SONAME="/usr/lib/libc.so"
+QA_DT_NEEDED="/usr/lib/libc.so"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+
+just_headers() {
+	use headers-only && is_crosscompile
+}
+
+pkg_setup() {
+	if [ ${CTARGET} == ${CHOST} ] ; then
+		case ${CHOST} in
+		*-musl*) ;;
+		*) die "Use sys-devel/crossdev to build a musl toolchain" ;;
+		esac
+	fi
+
+	# fix for #667126, copied from glibc ebuild
+	# make sure host make.conf doesn't pollute us
+	if is_crosscompile || tc-is-cross-compiler ; then
+		CHOST=${CTARGET} strip-unsupported-flags
+	fi
+}
+
+src_configure() {
+	tc-getCC ${CTARGET}
+	just_headers && export CC=true
+
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	./configure \
+		--target=${CTARGET} \
+		--prefix=${sysroot}/usr \
+		--syslibdir=${sysroot}/lib \
+		--disable-gcc-wrapper || die
+}
+
+src_compile() {
+	emake obj/include/bits/alltypes.h
+	just_headers && return 0
+
+	emake
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getconf.c -o "${T}"/getconf || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/getent.c -o "${T}"/getent || die
+		$(tc-getCC) ${CFLAGS} "${DISTDIR}"/iconv.c -o "${T}"/iconv || die
+	fi
+}
+
+src_install() {
+	local target="install"
+	just_headers && target="install-headers"
+	emake DESTDIR="${D}" ${target}
+	just_headers && return 0
+
+	# musl provides ldd via a sym link to its ld.so
+	local sysroot
+	is_crosscompile && sysroot=/usr/${CTARGET}
+	local ldso=$(basename "${D}"${sysroot}/lib/ld-musl-*)
+	dosym ${sysroot}/lib/${ldso} ${sysroot}/usr/bin/ldd
+
+	if [[ ${CATEGORY} != cross-* ]] ; then
+		local arch=$("${D}"usr/lib/libc.so 2>&1 | sed -n '1s/^musl libc (\(.*\))$/\1/p')
+		[[ -e "${D}"/lib/ld-musl-${arch}.so.1 ]] || die
+		cp "${FILESDIR}"/ldconfig.in "${T}" || die
+		sed -e "s|@@ARCH@@|${arch}|" "${T}"/ldconfig.in > "${T}"/ldconfig || die
+		into /
+		dosbin "${T}"/ldconfig
+		into /usr
+		dobin "${T}"/getconf
+		dobin "${T}"/getent
+		dobin "${T}"/iconv
+		echo 'LDPATH="include ld.so.conf.d/*.conf"' > "${T}"/00musl || die
+		doenvd "${T}"/00musl
+	fi
+}
+
+pkg_postinst() {
+	is_crosscompile && return 0
+
+	[ "${ROOT}" != "/" ] && return 0
+
+	ldconfig || die
+}