gentoo resync : 20.02.2019

25 files changed, 37 insertions, 242 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ac494467c6ae..0c180f642b93 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 88f744101c1b..d1e67b629437 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -10,7 +10,7 @@ DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c
 DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
-EBUILD ccache-3.3.4-r1.ebuild 1920 BLAKE2B 09c2f5e6c0617b7ed308d9fd9686969e119446c91e513aa2c2872ec3378151dc087c20ba209c68d4c1ee6f8097190480934b1448d535a7e547ba22fcd22785ad SHA512 80e9a9a65a4a2e516d593f2459764cce3b190ce5cdad6c84b1914d7de758f6a20336f65713e1bcb70e930f802acf5016fb59d6d26d90321add9bd874796d9b2e
+EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
 EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
 EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
 EBUILD ccache-3.6.ebuild 2099 BLAKE2B c8f75918483df8772aa657dc837748053eebbafa8231d6ecf05cab5cd73dd2aeceb6e4394ab0ffe212a35c92d5482fb2f623551ceccb5d5cfd80654786ba6574 SHA512 3ce2913602971e9b6b2d91b8bfb24a839da3800b75e563d457e113db967bc037bdaf4649f6d6bd88d49657aa8533b2d81b944de6c8aa8181472d201e60fd726a
diff --git a/dev-util/ccache/ccache-3.3.4-r1.ebuild b/dev-util/ccache/ccache-3.3.4-r1.ebuild
index 8e20c8f37c56..f031f691f2a1 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 arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 971fd3a1182e..729497e7a44a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,7 +9,7 @@ AUX cmake-3.11.4-libuv-1.21.patch 1333 BLAKE2B 685edbc90e59ddf3f5d430d50edba0407
 AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c
 AUX cmake-3.14.0_rc1-FindBLAS.patch 1247 BLAKE2B ca3b9e1515569b1dcf4692480233aa149c4846f0767c872a25ab0f9fe411ab09348b441f17319abf1c06fd3275e3db7d8bb8f25eba83bab7fb800fff115d06a0 SHA512 425dffe59dc7ec6383579d2ad5bb7a7607e4446804ceb6c698c34ad4615fffd552051dbe6ab21450fa769cb7b25a0184ce9204841e2ab98a738b786c93bb90ae
 AUX cmake-3.14.0_rc1-FindLAPACK.patch 1798 BLAKE2B f372fd920abaf85ab3106385d45e193c2c0fba1ca9fb5c14cf53bdee9a29602b7db0078676c90f65f3f3eccddfbb1f6b9964d26f90aef38cbc0c197a4b243ac5 SHA512 dcc970561f54d862f2124512bfc28ab25e66b1fa5e6a7a6138faae7f1e3a4136320ad4d4942153ac9505035b74f3e8442dddb62af6fb1486fcfec08fcf3e3743
-AUX cmake-3.14.0_rc1-prefix-dirs.patch 4767 BLAKE2B ddc95ae9beb8dacc14bfdb54be2369564b81f054f406bc5207252ef98a8bd8b3c62f7c1191f8f08e4a348c9ab66152b90681032251d1a049136f79798c55b5f0 SHA512 5ed9d2d4e32075e5c52766a55209a3f6c5df089abfe6d2c07fedfdac2dc65e3552679b62d43988b2dc4b7ca0503d984b1f8a87539360a81a4d3b7806206bf5b0
+AUX cmake-3.14.0_rc2-prefix-dirs.patch 4609 BLAKE2B f90da7c47e2539047ab9c27c4e62f53634541690db171bf4f92e4e8b122d1ee1d856babf4b6e3650f892fb430a0a7f7cbdedf3d01fbdacd7c9d4a2f60d21a181 SHA512 bc47ac442f09f8717db3123bdc176bc9c4c53c54dca2d34f86032576c7f43ceaf8431c64629110003cce9531b31241060399a2455c93e58367193e7e376c0907
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.8.0_rc2-FindBoost-python.patch 6575 BLAKE2B 4a169862e81b053ea8077ed61001434ba2619230ab4a4d75a11e2ea2c18ad704792d6d37a3cfa78cb54a6bf6cd71bc9b0d6a7a1bba004a92212746001874f385 SHA512 bb156cc2b47f9928f2e6bae909e90866f4442e42d7357744aa2b00903a02a27cf8af4a788a74858bc51874c442c40788717c86e77690b91def80abaa38b90163
@@ -21,12 +21,12 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc1.tar.gz 8844963 BLAKE2B 1bb600c4fda4da411d3897f55696025d0ff14f80154eeb968c67a1e8dbb308f55d38a4a5a9c420038a1aef1fc181778801f954178d3b625faedd3fc51a18b5c7 SHA512 a7f1881100e1c4ca4944fca1f87ed2caac450983fda4b930954f0d25bf39091e28080e49862060d87ec86e61251c712056d8accddaeedb71715cb9fb01aa4559
+DIST cmake-3.14.0-rc2.tar.gz 8846165 BLAKE2B 8b36ec26167e4bd83f0bf9b58a4ca2f0f9ee9994eeb3593279a03faae03c2fe6097fb0a7b6e8a83902afd5833c3f7bbd7602e78f052fb5c5d75f5b7a4db8aafe SHA512 941d6c562e620dcabd7d821a0eb96c05674d877c196a68cc9cb870a21de7c486f7ce848722892d9764c3826b7276f7fbe7afc36e3b8f784fccff2a8feda9de30
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
 EBUILD cmake-3.13.4.ebuild 6207 BLAKE2B a2a7aaac70aa184f7da025954664f2a6a688a6f90bedbce965187953c3b8fedf984dcc7bf467171170857f1d1e6d350fb3a5dff2a53c90904ba262bb0c38ec6f SHA512 748e7e64d4a3dd96afe5ffe2981a79e5d4f380559fc9ef48a232360989a5cb01bde48aa014888a176042474c9d53c0eab9bd35adb03c04e28bfc990736de86b8
-EBUILD cmake-3.14.0_rc1.ebuild 6268 BLAKE2B e578c06dd59640f8b97b6968beb26e026b3f3aea46b17370b02ab5e016afea4df55e07ba84ba818d3b1d4dfd516529cb391e8f294948567b9be9f9ff33b0a08f SHA512 85d052a18ef8e0fe2ff7fdcab242ec03838b929d5d11e8cf379b302e111a6652216e16f8aa31a7a276ffa9e9577ba467259f94af952ff59015c19d8c698d1396
+EBUILD cmake-3.14.0_rc2.ebuild 6268 BLAKE2B bd2c0fdbb4b73c132e52a0d049653d98293be703c72e940bfbb8836393a2b8854451b15e14f8aa4450953b80e808a287346a42801135652fe23130f5f341d6f1 SHA512 7284d9bc63545ffafafd77390e2467ad92f53a9c63984e287f5210057dd936320228ca80c7adb7106cb402a265cb7429af3fc79b1d3ac61375d103d58d0b895b
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.14.0_rc1.ebuild b/dev-util/cmake/cmake-3.14.0_rc2.ebuild
index a35142fe0720..75999dc18497 100644
--- a/dev-util/cmake/cmake-3.14.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc2.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc2-prefix-dirs.patch
 	# Next patch requires new work from prefix people
 	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
index a4890ffbb2fa..8b539bf5babb 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
@@ -1,6 +1,6 @@
-From c5d74cb5b1cf87ee933f7547f62dbbb96134964d Mon Sep 17 00:00:00 2001
+From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 22:40:33 +0100
+Date: Mon, 18 Feb 2019 10:13:45 +0100
 Subject: [PATCH] Set some proper paths to make cmake find our tools.
 
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
@@ -16,13 +16,14 @@ Updated by Michael Palimaka (cmake-3.0.0)
 Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
+Updated by Lars Wendler (cmake-3.14.0_rc2)
 ---
- Modules/Platform/Darwin.cmake    | 12 ++++++----
- Modules/Platform/UnixPaths.cmake | 38 ++++++++++++++++++++++++--------
- 2 files changed, 37 insertions(+), 13 deletions(-)
+ Modules/Platform/Darwin.cmake    | 12 +++++++----
+ Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
+ 2 files changed, 35 insertions(+), 12 deletions(-)
 
 diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index a73ffbae75..d00eac4ca4 100644
+index 5590433a3b..b04383e51d 100644
 --- a/Modules/Platform/Darwin.cmake
 +++ b/Modules/Platform/Darwin.cmake
 @@ -116,9 +116,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
@@ -65,7 +66,7 @@ index a73ffbae75..d00eac4ca4 100644
    "/Applications"
    "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
 diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 4ae451472b..aa34bd9a31 100644
+index 46c24bbf9b..54210f6599 100644
 --- a/Modules/Platform/UnixPaths.cmake
 +++ b/Modules/Platform/UnixPaths.cmake
 @@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
@@ -78,7 +79,7 @@ index 4ae451472b..aa34bd9a31 100644
  
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
-@@ -50,33 +51,52 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+@@ -50,28 +51,46 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
  
  # List common include file locations not under the common prefixes.
  list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
@@ -116,13 +117,6 @@ index 4ae451472b..aa34bd9a31 100644
 +  @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
    )
  
- # Platform-wide directories to avoid adding via -I<dir>.
- list(APPEND CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-+  @GENTOO_HOST@/usr/include
-   )
- 
  # Default per-language values.  These may be later replaced after
  # parsing the implicit directory information from compiler output.
  set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
@@ -140,5 +134,5 @@ index 4ae451472b..aa34bd9a31 100644
  set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
    ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
 -- 
-2.20.1
+2.21.0.rc1
 
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index bbaae59e9c01..fccc8ebd482d 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -1,3 +1,3 @@
 DIST cmdtest_0.30.orig.tar.xz 38508 BLAKE2B 7a27ed4930decdfbc49e922af9724ddba2daabc5af51faa6cafea1ca10dbf5137aa74ad9780156ff13f16e4c22fe5dba43401e22c6c2a7cabbd39d4139f4f515 SHA512 cbdebe175f09a99218d8ce0f2d1e49019f70b7f3ba112e2650e5a58e36a6f1d1b641c9aed5212e12023e956f999ef9cdba27aea7af9211f35a41874147a402af
-EBUILD cmdtest-0.30.ebuild 740 BLAKE2B 7389472d1479c094627eb8b89e81f077dae31219a4a30ff1855245f2d46ebaadfb5651c51e61ee965323af9a9011a3c0e006ee5c647abde709873fe34991e83b SHA512 8d8b8c897dcb2fa38b67006016f4af46b0264f18758eec9be88b02f2d0f988d05878fbeda63639441e7c639f6f57411f35eb2e3204c7cc8628762b0ead322b2a
+EBUILD cmdtest-0.30.ebuild 742 BLAKE2B 3bef02a65fbcbdf67c82d159b8831bf3bc4c8bf551486d17a2338c3e2e7cac0ed18720d4f5004b5f78084d00851668b80323f891fd5264d29f13de7b1a7eaf9a SHA512 b0575454949dc9de6322384e493abd539569c67891bc3b4b5fae3a19f8d3cfd45de4c0947a6dbb3525bdddc40c44720490ba6afe064be7c5c4695aedb024fb41
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/cmdtest-0.30.ebuild b/dev-util/cmdtest/cmdtest-0.30.ebuild
index aaef1d8ec955..696c8fe9d193 100644
--- a/dev-util/cmdtest/cmdtest-0.30.ebuild
+++ b/dev-util/cmdtest/cmdtest-0.30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://code.liw.fi/debian/pool/main/c/${PN}/${PN}_${PV}.orig.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd"
 
 RDEPEND="
 	dev-python/cliapp[${PYTHON_USEDEP}]
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index cf672da91bd8..c2c5e950c066 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,5 +1,3 @@
-DIST CUnit-2.1-2-src.tar.bz2 349037 BLAKE2B 51122ae79f15ebaf3b4a4f46acc8f1e08e918097d1308409b02e722e6eb7e0147d14461dd834dfbdb95ad8bc230076c05b3700348781e2a9b31bf29898c61435 SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p2-r1.ebuild 1369 BLAKE2B 657474b205f655405f4402a16da33a06f383f7593b73f281925d4dba1984aa46df97b51f145d540bcf96792af209f1d7a29fe477d0c425737eab437c6f9a7000 SHA512 103e1cce7157000d66370e883623039068e3734aa96a2c8df59c30415e5610a19865df88d8406aadfe09de60632512b465f03de3f02c2887c91da0eed0a27685
-EBUILD cunit-2.1_p3.ebuild 1373 BLAKE2B 2b5d8bff0d09277c45f9daaed60341f515262aafd179120ceafb32769346e54e5ecc2d37fbd08ee42659cd00d1994147b6f29f0d1f50408811af1aa30e8131fa SHA512 eea3a3c4a26bebcfd4885ab1ba0fa0a67ac8def0a683633e41edc586fe56ab2948b518822c729ebff672682c3e5ac2cde962b48a89383997c42363c3daa059db
+EBUILD cunit-2.1_p3.ebuild 1370 BLAKE2B feb34c93dbf8b1f0cd5e637d26e0f8fc44d2971c271b81fbd9d00c75a37d6186fafef4ee5e761475089b75b5095db1347612ff1b98909caf6a8769e7a63c5142 SHA512 c62d912a773c45f7de4c2ff1f87b0b39fd219b26efa053f6ce50020c274e55fb0b913c75c02a57cde08b9b3b2d4d1bd99e970fb2dd3e4e6057799c3acf8683d2
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
deleted file mode 100644
index 409c1906eceb..000000000000
--- a/dev-util/cunit/cunit-2.1_p2-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic multilib-minimal toolchain-funcs
-
-MY_PN='CUnit'
-MY_PV="${PV/_p*}-2"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="CUnit - C Unit Test Framework"
-SRC_URI="mirror://sourceforge/cunit/${MY_P}-src.tar.bz2"
-HOMEPAGE="http://cunit.sourceforge.net"
-
-SLOT="0"
-LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ncurses static-libs"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README ChangeLog )
-
-src_prepare() {
-	sed -e "/^docdir/d" -i doc/Makefile.am || die
-	sed -e '/^dochdrdir/{s:$(prefix)/doc/@PACKAGE@:$(docdir):}' \
-		-i doc/headers/Makefile.am || die
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die
-	eautoreconf
-
-	append-cppflags -D_BSD_SOURCE
-
-	# unable to find headers otherwise
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	local LIBS=${LIBS}
-	append-libs $($(tc-getPKG_CONFIG) --libs ncurses)
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable static-libs static) \
-		--disable-debug \
-		$(use_enable ncurses curses)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-util/cunit/cunit-2.1_p3.ebuild b/dev-util/cunit/cunit-2.1_p3.ebuild
index f78c445eb8db..cf56490bd7c0 100644
--- a/dev-util/cunit/cunit-2.1_p3.ebuild
+++ b/dev-util/cunit/cunit-2.1_p3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://cunit.sourceforge.net"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index fd8f125088ba..675799bf575c 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -1,6 +1,6 @@
 DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33732d34f01c56475b70cff4e6f479908b0fbfaf418625be8ca2fcb45ac9805f725e1e6eb7eb66a899d754446445e29 SHA512 de921fa866da7d83efad92797bebcac3544ba1ffd5b3a015865b9bd554e8bc2e43539a9e4648517aff37f7d2497fdc4e1f6dc63df5cb0663012662626b1964f7
 DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
 EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
-EBUILD edb-debugger-1.0.0-r1.ebuild 1091 BLAKE2B abc8c06cd5065641477c68905691ef7b27433ab4b9413ebf1b74827d5208ae0151d599af68f3ab499f517ad513bf25bf6377f7286ac94b81f4b937a62018679f SHA512 f28807d04a91ef0c377c9b5ac9a8ba20a4360bb278933bab22602a6ffe3f654c7c88492a009ce83b8a0593cc7f298baf2650a37c504b2d93289576707fb73d5a
-EBUILD edb-debugger-9999.ebuild 803 BLAKE2B 11b5077573164b44b551a8b13ef0fb1df95f15454b16dac7c40a70b5d19e89f56c84818ad37fe45ac95398db5420fec6639004ef464f5cb195e64e093c01668a SHA512 69940c4623a86fa8b4b345b2d067a354c29a155a969a2a0bed002da0669faa009f0d407b294cc7361ebedd4df304373811308070074a5ceb7c2e3d041c154e98
+EBUILD edb-debugger-1.0.0-r2.ebuild 1090 BLAKE2B 5ff08750c0014efabd46d0531035f4c7761f5c2f3c111f317a938b942720e5b8f8c78eac555803ffd4af5db32991a48f1497c1029b6e847298651bb7c9fb1864 SHA512 cad7a47d3511372561eb62186b18272c4750f05f84fcffc01dff3f35ff3886f15d026add49dc785a1b03dcdf5594574610f3bbc967999ef5720e17d16a7cd55c
+EBUILD edb-debugger-9999.ebuild 802 BLAKE2B 0a5ba606ffab9f519c4d1c4095ee06c6768bc5e31b0272ccee75e9af2a4fc437e9c986d304d282d274f0175c879fa86167015597e19bc12f3a68323dda3c0357 SHA512 c26bd7c2a05b2efb588801b16ff021bfad1f4d4eba468c65e3ac0bab162fd05ea9f1f43e6908ed8b690c8e6fae7bc1f92aa7c16a4ae7d90c30f86123c52ea938
 MISC metadata.xml 601 BLAKE2B d91cda94777a8c5d1332e28b7cb643c59271d2442b3aef592b4ba097bd953693107e32803f23a5f2666a6cacf142ca87c0881cfc00a99f70b5a043755a14935b SHA512 76dd4c92c4a5463273ae8c8f9568e1ca330f709900a16247a7e8dc1035e3530c358c2573953d75845b442f63e965b3584ca7fa9f2fb75b55aa4985e13d3cbede
diff --git a/dev-util/edb-debugger/edb-debugger-1.0.0-r1.ebuild b/dev-util/edb-debugger/edb-debugger-1.0.0-r2.ebuild
index d94498796626..bfa600112a47 100644
--- a/dev-util/edb-debugger/edb-debugger-1.0.0-r1.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-1.0.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="graphviz"
 
 RDEPEND="
-	dev-libs/capstone
+	dev-libs/capstone:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index dc0094a1afe8..ed907cfca5d3 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ KEYWORDS=""
 IUSE="graphviz"
 
 RDEPEND="
-	dev-libs/capstone
+	dev-libs/capstone:=
 	dev-qt/qtconcurrent:5
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6898c1a143a1..0d363e1c2f03 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,17 +3,12 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.150.1.war 75938045 BLAKE2B 363e359ef627947b2dfa30d164099c2864f2641c1ad3fa83532f9252a030bd973e4af3238fa09ba92f8ad65ab4463a21d86752b159d07049d5ccd88f8895bbdc SHA512 1158713b60923f7c1a3b90e403562a388ec3578f1a7ca267f91137a58571c26721075f63eda97b92bcf3ca360ce68d5129c9bd205b2ee138e13247d73da4e7a3
 DIST jenkins-bin-2.150.2.war 75969613 BLAKE2B a86cffd210ee40ee01a1f4ee03c59b2c6c04a8d03f8f0bc5688118e00fe59bad2c8c1fe4b37de590929f1d36e9b00a0549e391609646b13f32d34769314369a9 SHA512 38e960b895dee3917146f49888ec23cfdc115354327de3ae63a4003641dd80d1d2565e8256dd47fa966c1b5515f1f90eac466ec007cf6d820958ce43147eb4a6
-DIST jenkins-bin-2.155.war 76037370 BLAKE2B 69ca351fe0322564899bc7866174c1d2334c1881cffe49bce06273143b4f5303d544d77d8c372ec5c5380c045bf60566c77b1b9f6be5f9e1e58744d90ff6807d SHA512 b7ce35de687094161d55d50522ccf8f80d8369e383ba97bd2de2082b5b03eea5385ae5d8aa46d80112c4f3df30584c9ba7ab2e58542c9c9c0ce7c2b2e17b481e
-DIST jenkins-bin-2.158.war 76009057 BLAKE2B 7ec77f5e6e11fdc354c6a0be0a821e2814b3b442bbecb6410c3be45b4edbbaa62f2992d77a397d109d14827fed243ede42530cc66083f0c9efd4b0365096ba21 SHA512 4ccc8b900cd95ee3b1355401399fdb462c9b38680945015e77ba338004e4c3bf83be9ccfac0539d1b5c8befb19bfc0ac99d4d41ca233c4dd42ab888b16e95a6c
+DIST jenkins-bin-2.150.3.war 75968662 BLAKE2B f57716fcd6ae6330f291810a947e13e1629c3d7f1fdcc7061862258895bb691c5d43379e5c59956b60557843492f5e096fe43aacae88ba4a1baf3cb67bb28782 SHA512 b2a5bf51b09b9df9bec13f09f911c76c1bb0c2edc91f0933caf6f71e4c296e5f53ad54711aa6632b5f3e3dcb1f335594517a0c086e23fad8892fb6a3e77dd978
 DIST jenkins-bin-2.160.war 76018620 BLAKE2B e215220e978ac0407c742e3e5989b50f9d18ed387991b2c7c1120d4f9018ea3a24dcfa3127d29291af5d7dbf0155c3a68744c429e53ef3e160d33a5a3296cdac SHA512 7e6f6d1381ab9b46cd62423a607a6c8c05438073cd21cd7827f66fb98300a54c9528e87d00ca2332ec43068aaaa54493bf0469fe81be20fe444c10fb25cc6c96
-DIST jenkins-bin-2.164.war 54632448 BLAKE2B 05380e3674491dc79947c18644fe6c757baf4ede688002488ccd6234264fa16dd7a3206ef9d8ebe4015fd8007d87b1f6262e29d0811e91cc1a01b1e8cc89092d SHA512 80389e2376bd92cb2d98c88983e6f5f29eda863d87c257c08ac07fc752b5e3e2ebd93d5311534f1134e2efd6ab6a24216909ea60ebd1a237e8e706eb5d84daa7
-EBUILD jenkins-bin-2.150.1-r1.ebuild 1105 BLAKE2B a8a1dab6b1a8cd148c35cd352d04b691dcc712e96d5e3f8946574ab456727960334c60afdee7b71716f3ed0eea1cc8c32c32ce6e3921b90fb068b7a670693087 SHA512 eb011fcde8f1d97dd600731f311245925aa90c6523bfb75db36e92bcf2bd6372ec3c91ed8184af641e3f5c8fde3d40c1fd794e88eb03e368c1391fd88b5fa0ee
-EBUILD jenkins-bin-2.150.1.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
+DIST jenkins-bin-2.164.war 77329094 BLAKE2B c8b470ab3f4606947520b8867fbf09611a00385f89ff95b64c9c603d2f3fadcad1a136f73b0fa0f0cbc8bb7df6f77c1449b8556342a366894c358f1117fd9a0f SHA512 92e1a4c236d0091fea9b70236c4cd14560b3d12ebe51e8698e1ad2d70820bd4acae6f0579be741b2eb7749ac95fe4454392f2e1879e54b0b14a265541d7acb66
 EBUILD jenkins-bin-2.150.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.155.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
-EBUILD jenkins-bin-2.158.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.150.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.160.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 EBUILD jenkins-bin-2.164.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.150.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.1.ebuild
deleted file mode 100644
index ff91a974c718..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.150.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.3.ebuild
index c8cffcf979ac..323b88955105 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.150.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.155.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.155.ebuild
deleted file mode 100644
index dfe46af57ae6..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.155.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.158.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.158.ebuild
deleted file mode 100644
index 7d232cbccacd..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.158.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index 1145a098ce08..cac9b22fd51a 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 612 BLAKE2B af6f41a78963336fceead3c0a59bae0c9f3607a75089cde154374f08b0f50b980e5ec87eb657741e8326d7bb03cef4adb9afdf82a50be46d80cef55594fc22c6 SHA512 779ed505b554a0d5ebc8e0ba03c46e82205abf9292e0faeb8afa5ec279c6ffa7dd15ccc31d58680ff57054666eaebbe99dbabcc3349af15e8e7df0a12e762cb6
+EBUILD kyua-0.13-r2.ebuild 622 BLAKE2B 5ca382b2fea9f44a9ff851a9a1896614ea99e79c84272dba65b79c9e62de8d1c0a45f65776be4f647c8b214fd1dae7c96e1286e6812f56a600eef0336601300e SHA512 b76aed26f918a42f6cd1631950c9940b5f61db0c7a50cb21d6f8703b6678814935ac18c985d9863ed5e35524d6ed6ab592e955cffa32e40f765e49461d173c56
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index 8d49fae3ed19..5d331171f773 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 8d1e281a43b5..30bd6f851231 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
 EBUILD pkgconf-1.3.7.ebuild 1286 BLAKE2B 9dba572b557293d860660c6cd0137ba69ffd99c7e275a72d9d76438443087eccb973d22bb853702919272d3a82177828c04181ee88c05a3a762fcc6905ec2c17 SHA512 26b22644b575785cd1f8a5bd84a81d28872dff8aab1ac463a8872b448f21e8c203db141a8296bb069aa308d748c153eaccb480d3d84f4161d67d623624ef46d0
-EBUILD pkgconf-1.5.4.ebuild 1379 BLAKE2B dc95ba9a25c003666f063a02dcae1ed25f67daf28359886c8d7d8ec80de4060859a695ed5227eae90a4df67f7c00857140540765f35cf33de0bfa1f5d5317f78 SHA512 7698d3cb56ae6d06aef1cebf6814b53b2086b69c3a15de4b36ad1679967326a3b8713404d628fd630919ab6af7e4f75bdbd3cf2b84dfaa9c195894e826737d8b
+EBUILD pkgconf-1.5.4.ebuild 1386 BLAKE2B 7379edc97822d00a0a7d7459da6cf1c6e973f0bcc71087c8fcbc4c000c7b12f747eef9b2897f625210b6f43e4cd4e6ccdb8d87c99780e875d75827e9b2527d08 SHA512 f3d39a6d0dfb99d910cc0bfc7fa43457f99ae4c534cce0c83c7b991af21c4e6b87b3557502082e43f61136d45608632d2b1a2417262c3bfae2c9f7eba0b20a7b
 EBUILD pkgconf-9999.ebuild 1387 BLAKE2B 21aec1964adf22dd313788b30c2f73d59c3f7edfb7c5df550987931bf24a57f875d4d94b156f28fbb83a0891d440a73a0ec339e9e5ec9d3f12ea6b4c9ebe66d0 SHA512 5c01e07320da7402caacdf360a587302797c5adcfcdbea08c4c6d31b1787e5786af6e6e40de0aa5f210de4dbf2a4be882649a9e059f786933f5b154bfedb6491
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.5.4.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
index 6771416e8a3e..42b1c0301801 100644
--- a/dev-util/pkgconf/pkgconf-1.5.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index 3bc81f981c30..5f6cab21091e 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 678 BLAKE2B 84b73884c09eb57bd7fea44b859d3b41148896aed9cbd8488f6ed03e43d0047a25745cb927612fe958b89cb2b3efceb7111cc5d31665697eb8abffbe1305e056 SHA512 d6cd33efb405cc9ce5f59d59e2ec38edffd740b3854cea9c07ad40aa09b6a2783806e740ea45ad9cea09cf819b744c9cbf51c97782874a9407eb78759dbe7001
+EBUILD shadowman-2.ebuild 675 BLAKE2B 704d3672448633b5a302ddba3b5eee6f581e80d6750726fc2c652b18724c799b4b84118a3bbd1d6b1782ce4e1d5968226e5e6b2c5fbd00586309054dbd4c1050 SHA512 b552e038e017d5059ab5a631c7f3a697b6e1f821c63cc4a34f423af4f14f1de7ffe059383a248cc7602d0ced93459ec4171275a4f72d63c335c8e2cd1d64706c
 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 0710323dd124..50ba483c497b 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 arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 RDEPEND="app-admin/eselect"