gentoo resync : 29.03.2018

25 files changed, 99 insertions, 386 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9c8fcc5f3714..764b5e77911d 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 3a12c5fa87ec..4fecb8e51735 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -10,6 +10,6 @@ EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3
 EBUILD ccache-3.2.5.ebuild 2087 BLAKE2B d821a440198a055654f6961d9624d63a1c8cf854f7392232807120b52a74ba3665770cb53924e816e689def5ea9d85c8112678a71807b87a67252cfeb748208b SHA512 82ba23cf1be894ad9232069fadeee4fc8f64607e673eb7bd1edbe560e9ae5ec3feed5d009ee3061a605f4460dbf75a6af375f9e42af8b932b4270f6f8a2323f4
 EBUILD ccache-3.2.7.ebuild 2087 BLAKE2B d821a440198a055654f6961d9624d63a1c8cf854f7392232807120b52a74ba3665770cb53924e816e689def5ea9d85c8112678a71807b87a67252cfeb748208b SHA512 82ba23cf1be894ad9232069fadeee4fc8f64607e673eb7bd1edbe560e9ae5ec3feed5d009ee3061a605f4460dbf75a6af375f9e42af8b932b4270f6f8a2323f4
 EBUILD ccache-3.3.3.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
-EBUILD ccache-3.3.4-r1.ebuild 1904 BLAKE2B 7923a6aaf3dfe0d7beb7f81404a2897db7a9546f10de0a528e47f52baa97addf12105a6ac2fb7be9d1e83b9665d4839fb8abd6df17559b937e7cc1496f17e914 SHA512 88837e6f270a0c4da5a2f6b9ec03ef70b626b7bab17c401e9871311d8376c904bd660983808953b777d9a346fa14a0d0963101992c795e2fd5432bbac60de624
+EBUILD ccache-3.3.4-r1.ebuild 1910 BLAKE2B 6f609e6f1838e19b9bad09f922873e67c935f789f1b354cf35e2177f5b43d30e7cff0037107bbb88f11b2f00004fed76b246ff3d5c621540187afe1b54b1fee0 SHA512 52ae54bf2aca2c2a48083fe6cc533454eb7c610d8b5dfc1a5d9f178dfcc1cc4c1a3412992cfc140bc17a92a3d524495086d38869c4c897bbeb36477a21168d26
 EBUILD ccache-3.3.4.ebuild 2083 BLAKE2B c9ab28add0fd4b71ce98d2e5d6ad8fe6383c9d097438925f37cb7a61e6668e6ef9f517fa73ab7e69fed483948408bf9f782281ecc439eb14641f30193ac86798 SHA512 3e48057216c5618b26cdf5361fea268caae0814d7ee7cc5abfd54be4adfb3cfca7da171acda1f17ab2794478ba4c9b2721403023cc04fd468239e7a3a737378f
 MISC metadata.xml 524 BLAKE2B 1c34a58dde9b1d3b231260ec8bb2a29d7a40450ee8b6318f21ada5b06a28084eeb9487ad6ec89bc2c66a6b4b55b14fd25b95082c57e8f8c7dab87f6c9d230443 SHA512 e26bbf57cf488e7d750f9f1e14b2f22b60df8c3b2a0eef6973fb0e8e6a2ef358cdf1aca10b5716c260c31adfe0c0a630d218253e998fb70ef6eea272853465da
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 203c9085943f..36516b1d419e 100644
--- a/dev-util/ccache/ccache-3.3.4-r1.ebuild
+++ b/dev-util/ccache/ccache-3.3.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 3f254d93c572..0861ad92204b 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -2,5 +2,5 @@ AUX cmocka-1.0.1-fix-librt-configure-issue.patch 1641 BLAKE2B 71214b9f0aec0bfbc3
 DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5 SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 EBUILD cmocka-1.0.1.ebuild 1150 BLAKE2B 3d184570ee233cd04095eba9d700798a15101fd01482acec0aa381185b34ffcf7e3c9023a9c9209fa673c8151bc3f7c48920032fa1304503f7681659195a17b6 SHA512 fe02af0cc7c5fef6b3655f07a7c23e7dedf9d973226391b0df31c7c3b62cd91b6f02ea0244faf76c0d3df0807704ad1ce39a2464becdd782b0130ed4b4c80a29
-EBUILD cmocka-1.1.1.ebuild 1101 BLAKE2B e8f0b0869c53057cbaec210a9083506c3157b029d61ffe80ed25dc62763a7aa7f99e352a2541ed31ae7d3a207042854937713ab21cab095d3bc07f412a539533 SHA512 be01e3f9ca71d498f57883ae3a88612487119083f4d079a4dce4cd6872f9a338598b149eba951cc77a7d8a10708b0ede98cd811750876599a6967bf394071b00
+EBUILD cmocka-1.1.1.ebuild 1107 BLAKE2B dd77fd0a443f3ba916b945c3c5b5373f8c69595333df0e425309a78915987679d4867115947687a60f57e8944a8eb12a8bb5fe57dd8db0846025a6ddf3c87291 SHA512 df5ad4f6532bd8302a7ba005c6b4c6bd4ad8703423b086d4d741179a927baeeeff86efa11ab3903514c3f8e9d992c53639bd0753f62cd50fa99eb21ca816a511
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.1.ebuild
index 71e77ac5d4bf..a8ba1e6b6d77 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc static-libs test"
 
 DEPEND="
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index e6d1f82f0d50..2711330d9463 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,8 +1,6 @@
 AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
-DIST creduce-2.4.0.tar.gz 677706 BLAKE2B 49bdd8fbf8d354e237100f9a5a0f2154c7b6c55f44bbdfd3cd4a63727cd3b1220434f2ceee32fa37af72b05240c3ad61a5cb7050ec91ec38b2969ad74031a408 SHA512 75a603a8e2a967edfd12f9423f08b716a292f75e72ce770b083f4f9458510c3aaa16a91102c75f0ca098d08bb898fde998cae81e17c680dab330164fcffb5b33
 DIST creduce-2.6.0.tar.gz 763886 BLAKE2B 6da31e8c1cf33c667d792df86c019a1ccbbba24a25eedd0dc8ae2d7b676c39aaa1c44187e6fb436b27bfadf0b0ec67c3043822d438a4dede9d0275786bafcfde SHA512 e2a08127d2aea29b6934792eff4ff0d9f10952ca520671c60ef4b24a48522b19c48336d4b9d0b8e8c633dd8832b2a56d3d0daa311478e474e974c60a0ae381f1
 DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
-EBUILD creduce-2.4.0.ebuild 605 BLAKE2B 225498cfb81f8ba12950c633e46cada16fa2db17f14b94950ce8303e0f753a30f98865688f73cb89e258ed2282c119409ef1420c1e5b7d0457f0808f5dfe7c4a SHA512 9213fd59de68f2ab9353c3d080e4f041906b210adf73ecd0f0fdfaac1b22926b74f958cb70cac30ac1e66470d50b77c8ff75d5b741c3d0d4c5a4f58ecbd5e2e8
 EBUILD creduce-2.6.0.ebuild 685 BLAKE2B 4653902af6969da46109a8731b2d26246364e7b85f9360afdde9f912ff6bf9d9426ee48864b631bb9569ac4e7f35a8309ff0f83bd813249d2e70d25f3c55236c SHA512 57ed962054073e3220adfc02d5fccd6000359c189404cf3c01763312ae675876f52f6900a2d42431373c1ec56b78aa664f0fe9bd555f6e524196d22290985313
 EBUILD creduce-2.7.0-r1.ebuild 803 BLAKE2B 051af5639098a78c93c666c4d3df9f1cd720e9438d81b9b5e81242a2a45c34eb060a247bb99cad6ceb7b2d0a4b8712ca99dc7539b0bb57a4e32fa34d09c80812 SHA512 ffd1803f88caa11a1720e99cd3f8a7382d8574e6fb7ea2b5600d9ac8c70614763bb55f7d29df9d0f3ebd9eb233fb3a4fa2f2756accca4bed82aaf4c65db9928c
 EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
diff --git a/dev-util/creduce/creduce-2.4.0.ebuild b/dev-util/creduce/creduce-2.4.0.ebuild
deleted file mode 100644
index 2213cee8ce46..000000000000
--- a/dev-util/creduce/creduce-2.4.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="C-Reduce - a plugin-based C program reducer"
-HOMEPAGE="https://embed.cs.utah.edu/creduce/"
-SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=dev-lang/perl-5.10.0
-	app-text/delta
-	dev-perl/Benchmark-Timer
-	dev-perl/Exporter-Lite
-	dev-perl/File-Which
-	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent
-	=sys-devel/clang-3.7*"
-
-RDEPEND="${DEPEND}"
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 6ba29e450d6e..bd957e5adb34 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -3,6 +3,6 @@ DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
 EBUILD lcov-1.11.ebuild 574 BLAKE2B 4349f37845e48e6cd30e543557ee59b00ff18a030d3049adb7a1d47924202c9233db6c8b6831ba123cc1e3ca7093b298ae688cbfa15dab59097d4ea858d3dbd0 SHA512 a5559fb75533fa53ec54edc0262fac5582b68ca42b66b4dcb7b708e69032eb63c7fffb94af629113d50ff2598166853ed19c489ebfbddafada4fe88e0ea4f3bb
-EBUILD lcov-1.13-r1.ebuild 677 BLAKE2B 0bba93d0cee4985ac2cf0d5e586a9130350defc7c034ace4bcccda827780554a579a549f988de703022a9ee7fd6ff4de6736bfa6bbe2a7917b7e6205a089aa55 SHA512 967af976bdda4514840cfc706f66ec82030993ecb6a30ae7f2e66111050d7a624fd756bc47e4bddfaffebb5ec73b1b580fb6d933f373c665a2f8ecf73afa8dd1
+EBUILD lcov-1.13-r1.ebuild 683 BLAKE2B 1f30b7d233031078f27b25789c2e6cbd9ec72339ed45e90d9082cf014fc4c8f002148db98fe8078b09201f597f2d11e18bb1cc9220a9d75a43e09e85128ad54e SHA512 6d4ab75878d5e603fa615abd4160c92eb8b686a48ad7f6a64bc85d7009adf5188dd83b564eb187c73e542e6af03c5f5bff58f143acf7ac0c383abcfe27c856a4
 EBUILD lcov-1.9-r1.ebuild 590 BLAKE2B 99319590894c1c67f8e4e4bc4f0a1c28e8093f6df2e5a21c30860233dfcd50113980603298b36216c0b14103815cb055c7a1e6e2525060f8bc17ecad7616cd99 SHA512 856522fb69c0e251be261b07a82b5fbdf935f41aee6d4cd7f2b5709cb0c0877c1686b578d45cc4857169fbd0735ddc0fbb8475b6fa8156325522d4be101b72e3
 MISC metadata.xml 440 BLAKE2B ba4141809aea82e4fdb57c1c216dcef2c12f1edc3c4ee2405552a74a24d8c53cc22febc8994fe824c41a17f88c7f22dcd383b6a9f59c9f51b81fd83b0f30f4f3 SHA512 8c0066aad63765a2fc18d80de9028aba7e303619fea5efa41a8db1138b3b87434c84b4cadbb0f2961aef42c9262d3265bcee1786f38184d2daa2f369f99377ce
diff --git a/dev-util/lcov/lcov-1.13-r1.ebuild b/dev-util/lcov/lcov-1.13-r1.ebuild
index 687e3ec26ce3..ee07971279d3 100644
--- a/dev-util/lcov/lcov-1.13-r1.ebuild
+++ b/dev-util/lcov/lcov-1.13-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 26dad8db5103..390f40f2d214 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,14 +1,9 @@
-AUX 4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch 4415 BLAKE2B bad1c63cbd39941311ffd2a297e18cab62787a6596309a17e85638574cafc952a0f193a8d0d1ae6c71e4bbf22d44f8e59cd387524e489e393e843cf6032bb162 SHA512 9aa4a9618696d97b523e758725619a6cb6d4ca74058147185383b32ddc7db348bada379ad8c567a66a4bebd982c4e039aaae14ba44336408340378735c0b069c
-AUX 4.0.1/0002-Fix-bug-28898.patch 3526 BLAKE2B d13f4e866c00763061347bc24908306e4f7fb6d0701d10d272475556d4213dd19a13abefaa660199a9c1369264a84fa2da23c09095f4e3b6e30b356b99b90dea SHA512 8a9167ba1b17bb6d373fd41755ce4436b199fb48a47e303bff4020a79f90c547ae3ca86525345c55536bdc03b9c3853baaebdf914df04ae92901a073ae5658aa
-DIST lldb-4.0.1.src.tar.xz 19088212 BLAKE2B 0fcc76de5777c0724a207330bc5e027065fa55628506fe8cbd4f4e7ab397fc3802ae9580a8e41e14c1b3448453c1f735725100fb69c3048a44bd9e5748ab3cfa SHA512 1d94d7dfcc0614b16d0ef83436bbe814b39e34ba18394361bb9f13ad408ae9b29affa9a5d58c50c8dcd83765a39ae4d59ffabb7d8cd1358fd2fbd198b2de2ab6
 DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
 DIST lldb-6.0.0.src.tar.xz 19317956 BLAKE2B e9ebdd61c5116d3e6be3542674b1e3eebba19b4a2107da153565fd95ed24a97248fb80ce5220b4dce2b6e3ac5b61fcdb594e34d6af25e7737575c3f31cd45fbe SHA512 9679d1dda0c71681b1f8c5a22e775c0262de26dc5b091e1db189968b97ed3aed45991381d529b3fd4b3ab28112453f519045485708f97f765d3e3131b2a918b7
-DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
-EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
-EBUILD lldb-5.0.1.ebuild 3015 BLAKE2B 24c75d15e2898cd209df43f137b3e4fcad6ebbaaa0e66c9611d5a6cdd8666d5935c834ef3fd1fa02303c33a73e33f189b8bee25158dd5149222048f987f7f3bc SHA512 1773bab52a4794dc412ac3ac76eea3fdf1dcd2515009ba77b560c5972c44d0275a300206457cea89f4de08fc0103afd9a988404873d1d75b765e0460481c5436
-EBUILD lldb-6.0.0.ebuild 3113 BLAKE2B b5890afb5e652596b59ff558e5860869312f56e86f32c90f7f116300acea3717fe5522ec2d17c99ee90d74a5023cf98f5d3aa903b1ac2dbfe3a0060d85785ea6 SHA512 f50a83530a3fc71796b1ba92a72ea9ac2c50851fdbbd3f10b4736612079c91de7e1d689c4cd12650a73e3d07763952c87e9cdfd98d566f2e690d4de6830d5785
-EBUILD lldb-6.0.9999.ebuild 3063 BLAKE2B f0f2d6ba27ca4a94fcc5b63fbce6fe4cbba7e1ce98a56328af202c2bed290060986a9ad67934a3c24bf7085d6f058c10a594ea01c43b8ee6a1f1f66877381491 SHA512 15d0d4ba65c4a8c5eaf75087156eb4120c3552f5431e2de1c6da4767fb22e341aa0e4cf8ffeb309245cf2e088992828c9e3dff75fedf3e5b983563c3a811e135
-EBUILD lldb-9999.ebuild 3014 BLAKE2B cc865e54b690f663feced5456902d5037ac9549892116b6cb04e1fbda0f230769eb9c458ac080c37ff1bac248a9eda830b17baba50a211a6944a4c6d50820435 SHA512 60ea6864990a66c40fc9c537decca2d723684eb88aae248b7643a1c523b70b5207b34cc1c1e70cebf9680707b50b953d5e4b2f43438a0d356282679c98778c3d
+EBUILD lldb-5.0.1.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
+EBUILD lldb-6.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
+EBUILD lldb-6.0.9999.ebuild 2963 BLAKE2B 54d7cbb6d273667023d8beb7e5aeb55b2c332729e49c05ec6a2b79170b06e4287f16542878abbd6b27b13a6981629d264c269f27e3107eb9198e7f9ba7db4935 SHA512 5fb250ab99d6bdac31790f7035148f3da7115bb93d65359da3b757a75c90cb2f840b37ccd72a8374434081d2c677fe523862d19ada6a693eff7b6dac5f404f2f
+EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch b/dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch
deleted file mode 100644
index 1b183d860a2d..000000000000
--- a/dev-util/lldb/files/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 6a9aab954c32a2d3d13a0fe5fc984e9787e9f794 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Sun, 19 Feb 2017 22:11:38 +0000
-Subject: [PATCH] [test] Fix finding LLDB tools when building stand-alone
-
-Use both LLDB- and LLVM-specific tool/library directories when LLDB is
-being built stand-alone. This ensures that the freshly-built tools
-(and libraries) are used correctly.
-
-Without this patch, the test suite uses LLVM_TOOLS_DIR and LLVM_LIBS_DIR
-to locate lldb, and set PATH and LD_LIBRARY_PATH. When doing
-a stand-alone build, these variables represent the installed LLVM.
-As a result, tests either fail due to missing lldb executable
-or use an earlier installed LLDB version rather than the one being
-built.
-
-To solve this, additional LLDB_TOOLS_DIR and LLDB_LIBS_DIR variables
-are added and populated using LLVM_*_OUTPUT_INTDIR. Those variables
-contain directories used to output built executables and libraries.
-In stand-alone builds, they represent the build-tree directories
-used by LLDB. In integrated builds, they have the same values as
-LLVM_*_DIR and therefore using them does not harm.
-
-The new variables are prepended to PATH and LD_LIBRARY_PATH to ensure
-that freshly built binaries are preferred over potentially earlier
-installed ones. Furthermore, paths used to locate various tools are
-updated to match appropriate locations.
-
-Differential Revision: https://reviews.llvm.org/D29985
-
-git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@295621 91177308-0d34-0410-b5e6-96231b3b80d8
----
- lit/lit.cfg         | 18 ++++++++++++------
- lit/lit.site.cfg.in |  2 ++
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/lit/lit.cfg b/lit/lit.cfg
-index dd89b45fa..a3d5f9ca7 100644
---- a/lit/lit.cfg
-+++ b/lit/lit.cfg
-@@ -39,18 +39,24 @@ config.llvm_obj_root = getattr(config, 'llvm_obj_root', None)
- 
- # Tweak the PATH to include the tools dir and the scripts dir.
- if lldb_obj_root is not None:
-+    lldb_tools_dir = getattr(config, 'lldb_tools_dir', None)
-+    if not lldb_tools_dir:
-+        lit_config.fatal('No LLDB tools dir set!')
-     llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
-     if not llvm_tools_dir:
-         lit_config.fatal('No LLVM tools dir set!')
--    path = os.path.pathsep.join((llvm_tools_dir, config.environment['PATH']))
-+    path = os.path.pathsep.join((lldb_tools_dir, llvm_tools_dir, config.environment['PATH']))
-     path = os.path.pathsep.join((os.path.join(getattr(config, 'llvm_src_root', None),'test','Scripts'),path))
- 
-     config.environment['PATH'] = path
- 
-+    lldb_libs_dir = getattr(config, 'lldb_libs_dir', None)
-+    if not lldb_libs_dir:
-+        lit_config.fatal('No LLDB libs dir set!')
-     llvm_libs_dir = getattr(config, 'llvm_libs_dir', None)
-     if not llvm_libs_dir:
-         lit_config.fatal('No LLVM libs dir set!')
--    path = os.path.pathsep.join((llvm_libs_dir,
-+    path = os.path.pathsep.join((lldb_libs_dir, llvm_libs_dir,
-                                  config.environment.get('LD_LIBRARY_PATH','')))
-     config.environment['LD_LIBRARY_PATH'] = path
- 
-@@ -115,14 +121,14 @@ if config.test_exec_root is None:
- # Register substitutions
- config.substitutions.append(('%python', config.python_executable))
- 
--debugserver = lit.util.which('debugserver', llvm_tools_dir)
--lldb = lit.util.which('lldb', llvm_tools_dir)
-+debugserver = lit.util.which('debugserver', lldb_tools_dir)
-+lldb = lit.util.which('lldb', lldb_tools_dir)
- 
- if not os.path.exists(config.cc):
--    config.cc = lit.util.which(config.cc, llvm_tools_dir)
-+    config.cc = lit.util.which(config.cc, config.environment['PATH'])
- 
- if not os.path.exists(config.cxx):
--    config.cxx = lit.util.which(config.cxx, llvm_tools_dir)
-+    config.cxx = lit.util.which(config.cxx, config.environment['PATH'])
- 
- if platform.system() in ['Darwin']:
-     try:
-diff --git a/lit/lit.site.cfg.in b/lit/lit.site.cfg.in
-index 904521c9d..03aa3df9a 100644
---- a/lit/lit.site.cfg.in
-+++ b/lit/lit.site.cfg.in
-@@ -6,6 +6,8 @@ config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"
- config.llvm_libs_dir = "@LLVM_LIBS_DIR@"
- config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
- config.lldb_obj_root = "@LLDB_BINARY_DIR@"
-+config.lldb_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
-+config.lldb_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
- config.target_triple = "@TARGET_TRIPLE@"
- config.python_executable = "@PYTHON_EXECUTABLE@"
- config.cc = "@CMAKE_C_COMPILER@"
--- 
-2.12.0
-
diff --git a/dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch b/dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch
deleted file mode 100644
index 563d2f6813a2..000000000000
--- a/dev-util/lldb/files/4.0.1/0002-Fix-bug-28898.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 9ad9480c3a380a04b3dbe869c0675d6bba37247b Mon Sep 17 00:00:00 2001
-From: Kamil Rytarowski <n54@gmx.com>
-Date: Thu, 25 May 2017 20:12:30 +0000
-Subject: [PATCH] Fix bug #28898 lldb: libedit produces garbled, unusable input
- on Linux
-
-Apply patch from Christos Zoulas, upstream libedit developer.
-It has been tested on NetBSD/amd64.
-
-New code supports combination of wide libedit and disabled
-LLDB_EDITLINE_USE_WCHAR, which was the popular case on Linux
-systems.
-
-
-git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@303907 91177308-0d34-0410-b5e6-96231b3b80d8
----
- include/lldb/Host/Editline.h    | 12 +++++++++---
- source/Host/common/Editline.cpp |  8 ++++----
- 2 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/include/lldb/Host/Editline.h b/include/lldb/Host/Editline.h
-index 2b1a8e047..0b75e9c92 100644
---- a/include/lldb/Host/Editline.h
-+++ b/include/lldb/Host/Editline.h
-@@ -82,8 +82,14 @@ using EditLineStringStreamType = std::stringstream;
- using EditLineCharType = char;
- #endif
- 
-+#ifdef EL_CLIENTDATA	/* editline with wide support + wide char read function */
-+using EditLineGetCharType = wchar_t;
-+#else
-+using EditLineGetCharType = char;
-+#endif
-+
- typedef int (*EditlineGetCharCallbackType)(::EditLine *editline,
--                                           EditLineCharType *c);
-+                                           EditLineGetCharType *c);
- typedef unsigned char (*EditlineCommandCallbackType)(::EditLine *editline,
-                                                      int ch);
- typedef const char *(*EditlinePromptCallbackType)(::EditLine *editline);
-@@ -270,7 +276,7 @@ private:
- 
-   /// Character reading implementation for EditLine that supports our multi-line
-   /// editing trickery.
--  int GetCharacter(EditLineCharType *c);
-+  int GetCharacter(EditLineGetCharType *c);
- 
-   /// Prompt implementation for EditLine.
-   const char *Prompt();
-@@ -323,7 +329,7 @@ private:
-   /// single or multi-line editing.
-   void ConfigureEditor(bool multiline);
- 
--  bool CompleteCharacter(char ch, EditLineCharType &out);
-+  bool CompleteCharacter(char ch, EditLineGetCharType &out);
- 
- private:
- #if LLDB_EDITLINE_USE_WCHAR
-diff --git a/source/Host/common/Editline.cpp b/source/Host/common/Editline.cpp
-index 7d4b398a1..7b580dde6 100644
---- a/source/Host/common/Editline.cpp
-+++ b/source/Host/common/Editline.cpp
-@@ -474,7 +474,7 @@ unsigned char Editline::RecallHistory(bool earlier) {
-   return CC_NEWLINE;
- }
- 
--int Editline::GetCharacter(EditLineCharType *c) {
-+int Editline::GetCharacter(EditLineGetCharType *c) {
-   const LineInfoW *info = el_wline(m_editline);
- 
-   // Paint a faint version of the desired prompt over the version libedit draws
-@@ -969,7 +969,7 @@ void Editline::ConfigureEditor(bool multiline) {
-          }));
- 
-   el_wset(m_editline, EL_GETCFN, (EditlineGetCharCallbackType)([](
--                                     EditLine *editline, EditLineCharType *c) {
-+                                     EditLine *editline, EditLineGetCharType *c) {
-             return Editline::InstanceFor(editline)->GetCharacter(c);
-           }));
- 
-@@ -1360,12 +1360,12 @@ void Editline::PrintAsync(Stream *stream, const char *s, size_t len) {
-   }
- }
- 
--bool Editline::CompleteCharacter(char ch, EditLineCharType &out) {
-+bool Editline::CompleteCharacter(char ch, EditLineGetCharType &out) {
- #if !LLDB_EDITLINE_USE_WCHAR
-   if (ch == (char)EOF)
-     return false;
- 
--  out = ch;
-+  out = (unsigned char)ch;
-   return true;
- #else
-   std::codecvt_utf8<wchar_t> cvt;
--- 
-2.13.1
-
diff --git a/dev-util/lldb/lldb-4.0.1.ebuild b/dev-util/lldb/lldb-4.0.1.ebuild
deleted file mode 100644
index 64a83e7105da..000000000000
--- a/dev-util/lldb/lldb-4.0.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils llvm python-single-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
-	test? ( https://releases.llvm.org/${PV/_//}/llvm-${PV/_/}.src.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
-DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${P/_/}.src
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	default
-
-	if use test; then
-		mv llvm-* llvm || die
-	fi
-}
-
-src_prepare() {
-	# fix tests in stand-alone build
-	eapply "${FILESDIR}"/4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch
-	# fix compatibility with new libedit
-	eapply "${FILESDIR}"/4.0.1/0002-Fix-bug-28898.patch
-
-	eapply_user
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove bundled six module
-		rm "${D}$(python_get_sitedir)/six.py" || die
-
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-5.0.1.ebuild b/dev-util/lldb/lldb-5.0.1.ebuild
index 899fe2be5ae6..e3be91f0a816 100644
--- a/dev-util/lldb/lldb-5.0.1.ebuild
+++ b/dev-util/lldb/lldb-5.0.1.ebuild
@@ -31,10 +31,8 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
 DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
+	python? ( >=dev-lang/swig-3.0.11 )
 	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-6.0.0.ebuild b/dev-util/lldb/lldb-6.0.0.ebuild
index d3ebcd4abd0e..466d0ecf42e1 100644
--- a/dev-util/lldb/lldb-6.0.0.ebuild
+++ b/dev-util/lldb/lldb-6.0.0.ebuild
@@ -33,10 +33,8 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
 DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
+	python? ( >=dev-lang/swig-3.0.11 )
 	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-6.0.9999.ebuild b/dev-util/lldb/lldb-6.0.9999.ebuild
index b71a6bf3bc31..3713e043cb9f 100644
--- a/dev-util/lldb/lldb-6.0.9999.ebuild
+++ b/dev-util/lldb/lldb-6.0.9999.ebuild
@@ -32,10 +32,8 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
 DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
+	python? ( >=dev-lang/swig-3.0.11 )
 	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9999.ebuild
index 077232dbf5fc..983a4d03efe7 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9999.ebuild
@@ -31,10 +31,8 @@ RDEPEND="
 	~sys-devel/clang-${PV}[xml]
 	~sys-devel/llvm-${PV}
 	!<sys-devel/llvm-4.0"
-# swig-3.0.9+ generates invalid wrappers, #598708
-# upstream: https://github.com/swig/swig/issues/769
 DEPEND="${RDEPEND}
-	python? ( <dev-lang/swig-3.0.9 )
+	python? ( >=dev-lang/swig-3.0.11 )
 	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
 	${PYTHON_DEPS}"
 
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 48d8f6d137d2..27df4d8b1d94 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,8 +1,10 @@
 DIST pkgconf-1.3.10.tar.xz 272704 BLAKE2B 7d39a17ba100818eecb64acc46d7000a5d7ecb2493d7d9b75a7f2451ac3499bb5de68a38cca2188b19937410b3a82bc8a910a8b7cec211315980c0d9c49f8c81 SHA512 22ccc6b41b4571992f00e0b2e6f9922fd7f1bf9ef1b790ff978d8bff8ca0697321f7a7ecf1a193ccb4efda2c5d6430c1ad24487a50d3ab27f9f16e6be9fb9e83
 DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
 DIST pkgconf-1.3.90.tar.xz 285036 BLAKE2B e56e3ea3a6552ff190f239bf4d8d7e3d63c0ecc6a771d0a7c33aeacf6da61190abfed1ac2268d28d64efc298bc4b2b3f032eeaf8b2be628bef1d12de4b1aec36 SHA512 8efca947546969fea63e97f23eb1b5af49a1f2378eec66ff4f403fa218bcb3d5fed62a32fd6be70d9ebf39c8024bb9714cd0c2a52e6960c98021cabefc274530
+DIST pkgconf-1.4.2.tar.xz 285548 BLAKE2B ad48bac309e90f2c2958ee19ebbf95ec90c55ebd98a44486f47cc403b8c193131377433a23f16adb64bf97832ff5a0c20e0a3d01da5c6adb2b70483dcf23b9cf SHA512 d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236
 EBUILD pkgconf-1.3.10.ebuild 1297 BLAKE2B 033585762fe3fb08869fb9264f3ca37717da75061098cef3ab073fee9a63b8856d81a2142874081e9e419c1f07ed285ee16a5620663701fb5bfaa54dc9884068 SHA512 0e3b7a27767b6f2570947dd1cd433cafa0df4936d9925bd4b04b61602c58341073b9c9479a6241d3acbc4a3e701c048e965fae6240b8ad254efab520edaf96ff
 EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 0ab8f8e988a9d412585b6c53cbd06a6be0c71ab09a50fdceffaa2b90615c00de9864af9b8742f047d7b8a0b901844362582d90114728c8802d5a1563e1cb62f9 SHA512 60b22b469624108ba9f3aef81de7d493e7a4fa931f4579e4d909b41fde068c2ecb60283daff61133ac9d3682e326351a05551f265a651f2bfc7ce8e3a3cfd511
 EBUILD pkgconf-1.3.90.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-EBUILD pkgconf-9999.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-MISC metadata.xml 422 BLAKE2B 4bee8465a075878dc0f2c8534524f70bc3e5c94a1f2fa74c6304b90d1037355a0c3bed6eee6985f3299271666fd83999ac041c5c8a31e8a2c4b7277783f67688 SHA512 b67d102a6370d513225251717959bc61b916ec0adf9bd6c628614b2237845a26ad669e3652dac178e222b45ed98ba4fed6da23c40466df65ddae8d1d33f50b63
+EBUILD pkgconf-1.4.2.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
+EBUILD pkgconf-9999.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
+MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index 6707db3556f0..f6730b8bcc6e 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -5,6 +5,9 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<slots>
+		<subslots>SONAME version of libpkgconf</subslots>
+	</slots>
 	<use>
 		<flag name="pkg-config">Install as a replacement for dev-util/pkgconfig</flag>
 	</use>
diff --git a/dev-util/pkgconf/pkgconf-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
new file mode 100644
index 000000000000..e2b768e8e572
--- /dev/null
+++ b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit autotools git-r3
+else
+	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+inherit multilib-minimal
+
+DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
+HOMEPAGE="https://github.com/pkgconf/pkgconf"
+
+LICENSE="BSD-1"
+SLOT="0/3"
+IUSE="+pkg-config test"
+
+# tests require 'kyua'
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/atf
+		dev-util/kyua
+	)
+"
+RDEPEND="
+	pkg-config? (
+		!dev-util/pkgconfig
+		!dev-util/pkg-config-lite
+		!dev-util/pkgconfig-openbsd[pkg-config]
+	)
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pkgconf
+)
+
+src_prepare() {
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
+	if use pkg-config; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/pkg-config
+		)
+	fi
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf
+}
+
+multilib_src_install() {
+	default
+
+	if use pkg-config; then
+		dosym pkgconf /usr/bin/pkg-config
+	else
+		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 86434bc5ebfd..e2b768e8e572 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ DESCRIPTION="pkg-config compatible replacement with no dependencies other than A
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
 LICENSE="BSD-1"
-SLOT="0"
+SLOT="0/3"
 IUSE="+pkg-config test"
 
 # tests require 'kyua'
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 34c33247b674..db399e75a68e 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -8,6 +8,6 @@ DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e78
 DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4
 DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1724 BLAKE2B 82552dfc6a263ca75cc6adcd644eb2e3eec5e07b951ef5b466eda170a307665640369f003b430dbdff23a6f2931f219cdf719eb30c4f58c085732edd82494dcc SHA512 7033815f9b181c4898e083173c98310917541d5782c58a0d847d4676bb728555ed96eabe763b9f434d2265fa100da7077990c3b3606da32c3c4a94179c275567
+EBUILD scons-2.5.1.ebuild 1723 BLAKE2B c3faf1ad15b200dbc3f00666d41090c45e4a92160815dc4db557031da5c4ca8efffc50f1faa27e8453823ef8a1a5450976e55f2d9f4e2a4e6dce9b722deeca07 SHA512 6eb4a3aa9a4d15fb1b3049572ccca4786d0aa2683f065b265fd1a44b24f47989a5b6bd6ba11101e6169ec31fb08217ee62bb3e2a1400b69a781fdf291990e039
 EBUILD scons-3.0.0.ebuild 1745 BLAKE2B d70c095a6dc1b176b838d2f2b837f8c2ae10f91effaa66695161d2c5b318b5f7e9787cd692b8e3f382c9a1f9e44aa53e5ba1f058075be94fa9bfb513eb11d031 SHA512 f9431d9fde567661f8e3e3d101cda45be797ee2f24276c7d3b91a47bee6bf15222bfc61b213e56ac27ad18ad0038188b583f167aa85c626cc92e21fe0c593970
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 0daa60d78bd1..dd63b16f8ba8 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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 ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index b393df7014ae..f9f267b34440 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,4 +1,4 @@
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-2.ebuild 662 BLAKE2B d16a81f70d94b724668464b5711f2f6e68c700d2b185609474cbfe93d505fef1ba6c687abbcfb8f252d22c4228fb6db4dc5469f804c99790e871919d970be1e3 SHA512 fe15ff36ecbd69470832147bdbf737d05bd603a953ccc2e22b2e7f2b5ca671bb267e545e0fc17be7af1f49dca414bea2266b0eb6de100a7713fa3bbfeedd9f4f
+EBUILD shadowman-2.ebuild 668 BLAKE2B b348f2ed8cdd149c89bcfce0c1f35f0562e9c9f45b8e3b98748f2268153681f23ec1480211c2e4fe38a1cf5eff7fe1624c56c30ad6c53ecbe4e658e1f1cc50a8 SHA512 9c41aee8719895352d8fda2f3960ba7a017ead1c3c764aa83a7e929f811f4063315d20e47c4a96042066b8eadb3b6e1ff486128351beb623b3dabebf09b97a96
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-2.ebuild b/dev-util/shadowman/shadowman-2.ebuild
index 4767de0a739b..171a2f58db5f 100644
--- a/dev-util/shadowman/shadowman-2.ebuild
+++ b/dev-util/shadowman/shadowman-2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"