gentoo resync : 03.12.2017

48 files changed, 332 insertions, 103 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d164298eaed7..e0d710a8ab6e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/appdata-tools/Manifest b/dev-util/appdata-tools/Manifest
index c46cefdb8f99..e511d36b39bb 100644
--- a/dev-util/appdata-tools/Manifest
+++ b/dev-util/appdata-tools/Manifest
@@ -1,4 +1,4 @@
 DIST appdata-tools-0.1.7.tar.gz 124580 SHA256 a80333ee6107f6eb38466d2c47d0ae29527416a8fa4789c55c103fe41f79f8af SHA512 d0e32a2028f54482bd9715627bbc2050cfecfaea4be37fc3eeef273cdf989aa270a55112cbc81406dadedea87ae3521d26acf0011834d0055a473083147dcdc7 WHIRLPOOL a4ab56578ab3a82bed1c29c1fc49f58f6f2ef8932b2d1e68abe3cbf629f520113e4a556247cab7f14dde0be76d873b2694e70d4a88e0af5db39126f86e07a8bb
-EBUILD appdata-tools-0.1.7.ebuild 867 BLAKE2B 1bb0ec04aacd73e03a021504e93b472551f07d9f57f800ec01e54b06969a6e96b389707e852655670033e5b52e68c5fbdab94f3e4b47c3b60c37ac64d33f6dc1 SHA512 4814e3d761e2fb3114f9b68f553dc824d635fa9e7421aee2e9bd2117e478f3a27831d39c3bb3fe56a45f123a8c1237d19b258296ec2d254cfa651afe2d2d96ed
-EBUILD appdata-tools-0.1.8-r1.ebuild 463 BLAKE2B a68e1321bb7aaca2d17555ac917e03066c1bcd3b90b33554cbe3683ac264c4b76ca6a287795d1931c4c0f0d9130c3e99249e72b3b3d0ad9ca09a2de70b20d90e SHA512 8e0bf13a63649878088404005e95601976e0f50bf14b94d06b4122be5ea0814135778dcea642f6ddd088a89be66fc7f4d094d00ea2b769aff70bd02864a77bc0
+EBUILD appdata-tools-0.1.7.ebuild 854 BLAKE2B 34c1125fde353afaff4df871166b01c3eda3969839feb73cd2bb0804e399d9443b328995b2f8e415bc86904a39a6a2f1bea49cafc1504d55a97a6b6d6c41204c SHA512 254f76a902e6c6b74b1154e11c07ab6b1050b63b0c39d210a4b0ef662f3402eb1e16427bd71acc05162628f1b8a1a2bf4ff843f53e651a81f01073b9487ff32a
+EBUILD appdata-tools-0.1.8-r1.ebuild 450 BLAKE2B 1c4843d123d008961b7da15a5204a5d673e925a434b6481c47ba745a8bfa7a136825f8daf6f21ae1960f9d49f02f949d9957cb3f92b0c143f54092aba510a4f2 SHA512 d7b024aa8e38aff70d9c9ca8f65daf62e69e81a25d8c9d958793db2657e5d57996c41bbbaf1158f1936df7b896f6032bad0f41e324b38a1c8490130c6ea407de
 MISC metadata.xml 451 BLAKE2B df7d5ccf4c6318efb44f840abaa9c42346b302739acee4f21e0ac85653ee44e3fde2050be164474c27c0cdd97b280f891a3ccff8ef738174dbbfe09a54d8d365 SHA512 35a3d284a2adfaa5eeafd5be63757734ef8602e1350a8c616c4e35fbef9a52dfa5fa5c9d08b9570ffe0e537e16054dceed6ba1d5f43277af40d4134a2606e2d9
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
index c05659eb0025..cdb3f6c3c48f 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 MY_P="${PN/-/_}_${PV//./_}"
 
-DESCRIPTION="CLI designed to validate AppData descriptions for standards compliance and to the style guide"
+DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
 HOMEPAGE="https://github.com/hughsie/appdata-tools/"
 SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
index 9cfc41218f87..308d6bfef72c 100644
--- a/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
+++ b/dev-util/appdata-tools/appdata-tools-0.1.8-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-DESCRIPTION="CLI designed to validate AppData descriptions for standards compliance and to the style guide"
+DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
 HOMEPAGE="https://github.com/hughsie/appdata-tools/"
 SRC_URI=""
 
diff --git a/dev-util/autoproject/Manifest b/dev-util/autoproject/Manifest
index 5699de05f839..e0f6302c133f 100644
--- a/dev-util/autoproject/Manifest
+++ b/dev-util/autoproject/Manifest
@@ -1,6 +1,6 @@
 DIST autoproject_0.20-3.diff.gz 4704 SHA256 f201fc7431d189c80297fba31867013e9efe6dec2c19399d52e9ceb4356ee562 SHA512 8058fb2430010ddc8613c9e310c262b28379eb3d38b7e9badca7e3adb3560e5965bbe6612a0211d38920094a4851502471f9e1670e694ea3ef7d29bbfde340e9 WHIRLPOOL ad827a1424856f6dc3ddf91f5209414c77a4bccab7b969429a9c9c44bf75146e4c7139268d76f274fa72639a72e7ee7ef4ba32ec7ece5260e29617b134b2fc7d
 DIST autoproject_0.20-5.diff.gz 5287 SHA256 b7ece8099d19453cb6eff78b2ce6b8fc4f1cfb72e8bdfe4cbd6d7eb7f277b59b SHA512 156f8feff53936c3113bda9d8a3f2e19679f249656ace69aacb1f0a13ae93066eef49de3e5a268c47ed3e440144de629f6b84a477ecfc6a3f793c41412cc9b5a WHIRLPOOL eaf1aff7d4e2f8a3b49d2ad7c41e1115c57c076aa5dc441562546d352387a30b996cbe8079ca3193c57ae6bad3a12bed4b13c6562a51e24b48ba08f0af22ecfc
 DIST autoproject_0.20.orig.tar.gz 151101 SHA256 850ff70e250fbd34c1193461b0fc8e1254803ee22a9d116cdbcc822b551766cc SHA512 eb6ba12af96e03f4da51b6b9fc0db618180d92b8a363f30182013a003bb13f5b66ee12b28531a234f6035b64bda29bb0f838466ccbeaddbce06a437a18c05288 WHIRLPOOL 83616aca1fe8ce08b509058585f740ace8121544910846a137940965f5ee8e904fd2f04ee158ea5e312a2a8a2cf9c7be1ee6a02430bb1f58cb1ccbf9abc6e335
-EBUILD autoproject-0.20.ebuild 774 BLAKE2B 573f8c4f93e714bf5e5940679eeb1c44a5b73a5d6241a3c9efd7c2fe68ad6847191cb216a0b10003b8b291304b04ae166ffa7a966d57fc5160aa257f74349266 SHA512 a5970b755f01eb68008d5c3ceb9215df1aea957fab2e85e8c371b5678f87b763be20f1fbb9f0c4dfe96fd67563caa257bedc94fdbda2448ead8d45152a60f6c6
-EBUILD autoproject-0.20_p5.ebuild 873 BLAKE2B 667d0d9b69a0f5935a0562b642ce138d595f57824ceae0ac41294b752d8a331c94b77c675f7cf6b509bbb3f6c573475bba5edd31674d46f1059deb987e3a9a65 SHA512 d906d9a835c5f7d4af9e3ba9becc57268e8907a7fe9f06cf34f17f8317ead95bf12eeb496d66de21bf36df69a48bb1f74f34c949a160c66c86fa4b56db0de616
+EBUILD autoproject-0.20.ebuild 766 BLAKE2B e59d86569ebcdfa06c4678ce9f1fbe8b6684f4e9c5f49fd6b3f18b1e9f422fad983f45351074de39805d0fa9ad3bbd0256b67dde3e256425a47132714b10d5bb SHA512 a65b200be66d5d1e5ffc8ad471404502fb08f15624e964251365543b91595eafd665c51cbe51b7d6202d1958e0d5189d2c991f21adbeeed1a6cd80c85c452482
+EBUILD autoproject-0.20_p5.ebuild 865 BLAKE2B 1c859d8577460e3b5e14ac4cd266f3a3bb132aad65f87268656f341c6e3d680417147191f138d6aaaa49c6f2f45fcdbbffea2c5f459292c319240b240aa0eab1 SHA512 ca5c0dc22ebdf258850559dce9c1b6c28a293bed08caa291efd4dbe0df1211607c5c7e959b02b5db3db85dcf214551b575283f928b9a4a389a9dc22573a9af9a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/autoproject/autoproject-0.20.ebuild b/dev-util/autoproject/autoproject-0.20.ebuild
index 05e5e1d55816..5343efa1d037 100644
--- a/dev-util/autoproject/autoproject-0.20.ebuild
+++ b/dev-util/autoproject/autoproject-0.20.ebuild
@@ -4,7 +4,7 @@
 inherit eutils
 
 DEB_VER=3
-DESCRIPTION="Used to start a programming project using autotools and a command line parser generator"
+DESCRIPTION="Start a programming project using autotools and a command line parser generator"
 HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
 SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${PV}.orig.tar.gz
 	mirror://debian/pool/main/a/autoproject/${PN}_${PV}-${DEB_VER}.diff.gz"
diff --git a/dev-util/autoproject/autoproject-0.20_p5.ebuild b/dev-util/autoproject/autoproject-0.20_p5.ebuild
index f76f1b6b6548..d37a9867e8e3 100644
--- a/dev-util/autoproject/autoproject-0.20_p5.ebuild
+++ b/dev-util/autoproject/autoproject-0.20_p5.ebuild
@@ -5,7 +5,7 @@ inherit eutils
 
 MY_PV=${PV%_p*}
 DEB_VER=${PV#*_p}
-DESCRIPTION="Used to start a programming project using autotools and a command line parser generator"
+DESCRIPTION="Start a programming project using autotools and a command line parser generator"
 HOMEPAGE="http://packages.debian.org/unstable/devel/autoproject"
 SRC_URI="mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/a/autoproject/${PN}_${MY_PV}-${DEB_VER}.diff.gz"
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 70a6d2d2d615..c954954a705b 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -7,6 +7,6 @@ DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db2
 EBUILD catalyst-2.0.18-r1.ebuild 3129 BLAKE2B aab19478081661644cad7ea0614ebabab27086a52f5bdedd85746a09d9495291deea1e8ff77d71d86402587eaab230cd4360113b0a97d9406423b73fbbf22476 SHA512 c70736f23448ff07af62a587c0a3c4c8dabf24e35dfe3c8227c5d89ca9063adbb4bd2a1a7c9749d2b21435f7bc40651c30a00e95a23ef957558fead030b7d31c
 EBUILD catalyst-2.0.18-r4.ebuild 3297 BLAKE2B 77ddebef5817f7eecef4bfb4c4b90c2b2145b09f512f79cbd1b5e30109b41d9b5c5127c6bfe892eb3dfb351e9200007ab65405b31fca8fe39c10d6156d98761d SHA512 e397fb7205d4bf4823b5d328fb9059aa37ed8ad97deb2fa0fd7a7b1cafe694daa2f9f5705ff1a83905101b9679755b875a79063039a63743f6ef2e96dce4efea
 EBUILD catalyst-2.0.9999.ebuild 2930 BLAKE2B dbb778edeca28bda47b827c9cb2ea2c5e395df127e547a3a4e36aa64eb890700b9c6db0d160d7626a9e65fb79d7c53186a3407228a9f2140d2db0e2b7dad262b SHA512 0ce4efc9ff2ce0b394df62b9acf62393d7b277c61067439c3bd095ec0b362c140abdfb54329818e3a3d7eb2f97e1ea9954698eecaca8d093e8b4e5ee5835192f
-EBUILD catalyst-3.0.0.ebuild 1690 BLAKE2B fba4e43f89bac9c00ee781ff3448db711922deb4e2b84417c331cf8777fbf8c5e5706fa1273aa14ba84336626fb74097b7ddb9eb4eaa210d716fc7708e50f575 SHA512 f03b06da6acf658de5a7c6b5bc5aef1d3b175b225cdd056a303d02f7c996f06e805fdea03a0f20342636f322073ca6f3078a35194860e17b906d73cb5b05aa98
+EBUILD catalyst-3.0.0.ebuild 1690 BLAKE2B ce193f12460e5a1daf97cc8f7546b235b055901bdfd440ec877b0194a9a2485bbee3661136fefa312dc2312193d1f50edcb6b74939b5fd2942d09a150a4cd7d1 SHA512 32eb8ccc50a90532ecdb511a95cd590b04bdee09fd71b1decb058f7b8f278ed673e9bb5fd954cca15686a5d2a1266cd10e9495fdeeeefc4d5cc66b1287f07e79
 EBUILD catalyst-9999.ebuild 1719 BLAKE2B 87891f3b0e74f61e8c9a7750f78bcc4b84e3dfbe83c1750caa5dedce695262133208a66cebce62f957e7ba31526b4b7ff4c305d95540417d6479902e65b5f8cd SHA512 2935800e7524a59decfcd1b940415bfe309f0e6754bdc17bdb66dfe361d9b9b7fa80df6a079648a9386057d5449437bb0079b9e89d9000033579b854f20df746
 MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8
diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.0.ebuild
index 25437e6d4b09..d92c866043e2 100644
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.0.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
 "
 RDEPEND="
-	>=dev-python/pydecomp-0.1[${PYTHON_USEDEP}]
+	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
 	app-arch/lbzip2
 	app-crypt/shash
 	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 42c71cc2798f..a75fe0e105c4 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,7 +1,7 @@
 DIST clion-143.1186.tar.gz 220702330 SHA256 a2d6960afbfae77f59481c5ad30bc7c5afe9451bdf9d12cd9435f605b57b522b SHA512 d4ea1bad5f3da3bab569380114011798c29e633009867c8020363c9af72326ebaa3232dff9c931a67dd0a0195bf4903647e250963c7aeebe9ad83340c988cbad WHIRLPOOL 2a0855b6a32a5e23a1c7266d7a3dc00ad3ba905c5a8fa6d1e9959d6d4f67c73d35c94bfbe0837fde0d1736bd48dcb9212a219cfa81732cb169abdb1fb5dc4dd7
 DIST clion-2016.2.1.tar.gz 287103613 SHA256 444f760740811d0bb135cdd7d1d3a559b4d3247cdabf4eb9f77a21eea8c74805 SHA512 a4734c1b5d544cb7f6bd4752f5853d3c44e123e8ad8584b76098ef51a00261350d49bdd628d08c171f7c04b77862e8f28b5d8f16813c282542f83a16100c7415 WHIRLPOOL 83737f1677fff6870fd4dd717d54126f6680ec7c4966bc4b89f300e1fd327a431a13ceb6b04a52287c89813a7bb0e86ebaddf5c98f0330d595314c465d4a9534
-DIST clion-2017.2.3.tar.gz 317631164 SHA256 dd1979947371803a1e11f5bdaf04e3ef2d013b90b56e84495c6e67e67cb31e0a SHA512 e3318b54468b2b3fc7ee22eada95248fc3bc66ae6365b838ef40f4d14da8c122f5677f7b0f1ea1f7a11825fc0245f692e20c03ac9cd9b5b949be44d330ca8fbe WHIRLPOOL a90771490359e4c530e45534179e1efe57bc5df41958aa244c60295f9346327592894ef3538c96e7eb88023cf6cef726449d260146050ff8fc41d8bb6880fc91
+DIST clion-2017.3.tar.gz 331019046 BLAKE2B 0b9fb1a83de6f0df365997f1582536ea7bba050aa9c922c1023a989ec47e2978f7ea451a447dfad56edc65d417cbbdbd6398e6ea7065c84012a4bcf5b9e1e9e8 SHA512 4535534c708b7b6ae8c1cd17b47ae23bc3da02f80b01bed1143ccc7a62773aca2d4464472f1f2a62dc410cb5711616f0097bbf7fc44a929dfa2e7c22f1081b2a
 EBUILD clion-1.2.4.143.1186.ebuild 1777 BLAKE2B 5343a168bac0f2e2b84c6eff58711debab6a6e0ee1f6f8f3eab9d60694a4090d33200a496c54c4de0c31a44dd66fb7ceede10f6018b8c4f11ca2c1f6cf4117f2 SHA512 60327f78d5189ca3bbfd892d3d5c760d563ca4026acd1fc38bcd0d21dfee2bea8a22b2bebf91c2529a8bd100e05b218d2409e2a19b1b50c411ba2f4d18d7ad72
 EBUILD clion-2016.2.1.ebuild 1775 BLAKE2B 301d7f82b5d8275d205553b51076eb6d06906e51e50f0b6a0cf21c9dec2be61954b63a87e007ffcd8c44fb5072bfb2afecef21c17c9feaa083cc88dfb65a3dda SHA512 8370b3ca5696952e2d25da79e0b9715ab901d5eedeb93753d343582108f33a76535fb7187c2f3d291b04578a201c0b912e667132a48bf3bdf32f4f586151d37e
-EBUILD clion-2017.2.3.ebuild 1675 BLAKE2B ac24f07756eb0b10daa34a0d862fefd3194c23c77803559021fae66c002b6c216ae079c64984ed0093d23ee0ed0b89b08d8eaae108a19af8bf41fda58522023f SHA512 c56107235167f3699e0d3abe64a60436c42e1be832b0acb322ddb195acd7289541f357e7b466ccc4fbb1971480ba2b79f8f96b5c6444f2df014a8eb04c07481b
+EBUILD clion-2017.3.ebuild 1675 BLAKE2B ac24f07756eb0b10daa34a0d862fefd3194c23c77803559021fae66c002b6c216ae079c64984ed0093d23ee0ed0b89b08d8eaae108a19af8bf41fda58522023f SHA512 c56107235167f3699e0d3abe64a60436c42e1be832b0acb322ddb195acd7289541f357e7b466ccc4fbb1971480ba2b79f8f96b5c6444f2df014a8eb04c07481b
 MISC metadata.xml 537 BLAKE2B 871191dc4379532fea653f910fdb75ce8423a32c777e94b826d0d6ddff8e4ec49d5d9097ec8a3d44872fe2c1d57654ec62275d763a37c919ed421d7718aead27 SHA512 ba6f9b9f19e6475a7b83a2765af09e1b97c57e25a1a9f2b249993f51a2817a4b38bbf961e316b4e99af7cc686f9cfb2b1b88366f07e60e44a49f3cff950904ef
diff --git a/dev-util/clion/clion-2017.2.3.ebuild b/dev-util/clion/clion-2017.3.ebuild
index 26668312b534..26668312b534 100644
--- a/dev-util/clion/clion-2017.2.3.ebuild
+++ b/dev-util/clion/clion-2017.3.ebuild
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 1c3f17a4ea47..4c90bac01019 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,5 +1,7 @@
 DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
 DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
+DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
 EBUILD cucumber-tag_expressions-1.0.1.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
 EBUILD cucumber-tag_expressions-1.1.0.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 424 BLAKE2B 2941ca6a268eb54e6c24efd7a7b3687e996f3b2a7cb6568cea146c4ab9402bf7943b09e4fbb5466bed050487eb4e58d761132b5e782bcd3bf802742ae103afdf SHA512 5f7886762eff19eff7474d053b3a704dbb88b6bdce329064db2fe93f48001d9d6a826b3574a057599b0c694857ca585f6b07f1f41460e1c292d610a832ea23c0
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
new file mode 100644
index 000000000000..37e6c5e8fac9
--- /dev/null
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Cucumber tag expressions for ruby"
+HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ia64 ~ppc"
+SLOT="1"
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index fdfef66d7883..fd2324c0708f 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,6 +1,6 @@
 DIST dwdiff-2.1.0.tar.bz2 79224 SHA256 45308f2f07c08c75c6ebd1eae3e3dcf7f836e5af1467cefc1b4829777c07743a SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021 WHIRLPOOL 74ceba5cc7c20e0ab6ee09b62f7e8b07a1b8321bbe60ca7c3791c35176ba7137ddf17b1c471ff5ac0586ad0455e67968c71bf00f2de7cb137720b88a85c8f181
 DIST dwdiff-2.1.1.tar.bz2 79628 SHA256 9745860faad6cb58744c7c45d16c0c7e222896c80d0cd7208dd36126d1a98c8b SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7 WHIRLPOOL 96bb2a7f7a8afe857a21af4cec388c5663fa90bd87a82e99fc614106171a562b7183f44170a9eb5c8839519a71dcfff2e679e25890c0d58dc22c650e957f046d
-EBUILD dwdiff-2.1.0-r1.ebuild 842 BLAKE2B dbc48b3b3a95c2348f4792362e8cf8e7e732a4a83ccedc0cc8e6c46f0a1394b82a6e705e972605d2919a1873ee5f10f67482b226f73cd22f0f6ee4129cf24314 SHA512 49a21c1299d329a55b66d4b10075c20dd786b60f6284421b09e9e2d50a1e8e39fd1401af6ace261a173421d2ca611c7c7907593acb8ac5f066f75a99ffd311c1
-EBUILD dwdiff-2.1.0.ebuild 855 BLAKE2B a32a4e961957415ade2166c0d0314e5cde41b410f6bf8a2eee60d4c6e5109674058435559a08c271ef5b67438810657ebfabe583db6a9df60d6e0a7e37a436b3 SHA512 c3b772919b75bf4f183f0503ae796c031f10c2dd03d90a742ade95bc7d70baaaa153390a4230467fb2ad556d4dee9fe25e485cff3f50b5b4e26879f0e55c4ee2
-EBUILD dwdiff-2.1.1.ebuild 842 BLAKE2B cd1efee631edd7113e7bbab3e779f58c0891e0ca1f030e4221c4fbff979e6963bec6b52dd06b393de9aeb13e852b63e5792615f902cbb98bea1b3a7f5f1eea0d SHA512 c47436a7a4240eddc900ac51c4bc15a31de7df5a299b5516fddfb17aadae6996e77a04c7d720359380a9dd10527166fb7330626d0aa39af510752fc9736b78c0
+EBUILD dwdiff-2.1.0-r1.ebuild 830 BLAKE2B fcfd491914f5e8c7586e540dc516cf808567581aae0ff2faaf6973b603bc2b9623083c6b06437ee4dc055cdbd2f27dc883be3f879aa5326c91f344d35b82fdc7 SHA512 6c77029c67d10eed55166c01ca5901b99d5e3c49582e24e4de26735db4eaf993a02a761ea04b8481bdb2d1a2265032a79076896a3763ce9b58421cd91647dcbe
+EBUILD dwdiff-2.1.0.ebuild 828 BLAKE2B 229755fba9410afb1d6980504185fbfebb0947acfaae77e5a5e8736a26423001dd47e4dda331e990e12b9c34e5a640c85e4dedcaf6dea43441febb43e80f2f23 SHA512 61bf26f338405963d71edc12ae2c853546bc558a1df425f2f97f6748fac2580ed81464de51f7583152a6767064475d411c2e1799836962dac62ccc39861cd4d1
+EBUILD dwdiff-2.1.1.ebuild 830 BLAKE2B 2f0fe82c945ceb64311e42778f76f99ae617951dbd3a5bd1a28827bea0735ec2bcd3232e07668eed365971d407c410995f5dd24106a0d30a291d54113611fd65 SHA512 b44dcc809a5bfd87d7c0a42895f9da30da6776ace15eea7382741e1694b47568d3a8c8a053abfd0475536c470e1b2bed6f90c5d280bbc21fe7f6c9523c1f461f
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
index cd45b24397af..51b8e6bcee90 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="diff-like program that operates at the word level instead of the line level"
+DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
 SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
 
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
index bc7474f29dea..5fd42d0959e4 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 inherit eutils toolchain-funcs
 
-DESCRIPTION="A front-end for the diff program that operates at the word level instead of the line level"
+DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
 SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
 
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
index 252cdd66239f..c8e8a440ba08 100644
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 inherit eutils toolchain-funcs
 
-DESCRIPTION="diff-like program that operates at the word level instead of the line level"
+DESCRIPTION="diff-like program operating at word level instead of line level"
 HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
 SRC_URI="http://os.ghalkes.nl/dist/${P}.tar.bz2"
 
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index ebc071a678a1..8db27626ffa0 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -3,5 +3,5 @@ AUX ftjam-2.5.3-false-flags.patch 1682 BLAKE2B 5b57ea37f2d99439e8ff550a6a8100922
 AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d3accc9244b8aa70dedca621a3ca69cb89218ba7920f2a47a4af6548b5343960fcde8701fc11c15c0ebe0bcd1f8ea452 SHA512 e02948ccccb963ddfeb777c217efafaf19239cacff80514c167166ec666a6301b90e1a86a2b97ab58fee006f509106cc0e3dacbbde822efd0db2b9f5f4645be8
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 SHA256 a9f8a274049893a4d1f1ad82f7b04f3ebc2554635dd606185e20ba97cb4d64ec SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd WHIRLPOOL 4a688ea0c6a883f12e9b22bd6166ec972a43fe29473a8db46c2d278e333507215b20977e01da40782fb2f266b250541c11617ad066128ac4bc7c965e56ba9d59
-EBUILD ftjam-2.5.3_rc2-r1.ebuild 1131 BLAKE2B 04abbeaca92fe58eda84aa89df6f4f6fd9b22cfaee1f64e2d7f85b2a8b7151fb431baa21772078e40c589bb540e304f62207e61c03c5ec102611b6305c8d0b1d SHA512 9d469b5e76ed2742cd5605093c81e97c6c08454a0f8d0a54ec5c4d0d5edd1dc2188ae93b0f81c537eb2196810c68d68fd6b9b79547403c0e9c2325b3d1b102db
+EBUILD ftjam-2.5.3_rc2-r1.ebuild 1116 BLAKE2B 0f5469c8d02f32a733c8c3db225c55dac1dd62efb0123956b08f77d08452bf3f6f271256a60e803f23d4bd06ec0c7a86cd6459272bbc7e2c108f250a0ba4884b SHA512 9d519c8359142593d607b2b3a1430bd4435dd360bd13518ee005086e23c90cc07b5676f9abec2a5b082284894afdd6fd3713ebb244679db367ec7506d82a3c63
 MISC metadata.xml 319 BLAKE2B d14d1041416dc750996100b721a4adaad4b9c28648b983c583f60d1868f3ce5bd64e8ea27b14f309456ba0b7a9fafba49d01866bdc6eeeb1f75da3b7b7bb0155 SHA512 c645d76d4eb37391099c7882f68a268bbe45e844dab9015b8d5f557c9acce08df1b5eded075288e3fcf5e6390fb177fa4a9df3adba3327ca2e2b97d1ef183e0d
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
index a8cf96c8ab2d..9321798e4897 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r1.ebuild
@@ -5,7 +5,7 @@ inherit eutils toolchain-funcs versionator
 
 MY_PV=$(delete_version_separator _)
 
-DESCRIPTION="Jam is a powerful alternative to make.  FTJam is a 100% compatible enhanced Jam implementation"
+DESCRIPTION="FTJam is a 100% compatible, enhanced implementation of the make alternative Jam"
 HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
 SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index bdf8f4aa97e5..959eb2db89e3 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,5 +1,7 @@
 DIST geany-plugins-1.30.tar.gz 4469990 SHA256 a49202d1c6b2a82446a79c57854596de1e231481163f680c7654f2cb165bc249 SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807 WHIRLPOOL ada9c5cd3f78948384c9add373d8b60aa09c0de931304aae4b41f54aaa35dab3450e946e2b39d84c069521113a55720350170edc03253960854a0b842e31903e
 DIST geany-plugins-1.31.tar.gz 4547472 SHA256 933a4f7f041d676f925d021a5adb8c6876879beae53ac06e4a1c70abcb9e25d6 SHA512 73d48b276c93211c6ebc726b24726e7669184d8951d5d29662cb8144c04a239ef8fb621f91b7798720bbdf319a09e35efcaee1535125697838552bd0b1e47bc7 WHIRLPOOL 2a1f4f2a1c88f9bb132b90324ad603a2dce7786eb6c903ebfed9defa140d2756e1ba18e5dffc8b8bd6096ff18b2def1a25f9b163e3f91ec27920aea98489006f
+DIST geany-plugins-1.32.tar.gz 4655759 SHA256 f7f180f874f9c22a4f23346ad8ca433f3694dd2f9d2e2296ce6960b3c401ee76 SHA512 0284aa28820361f419a4ca000a8781bc044e112732ea6be7e511841c18d075eceef4abcabc1153ba9ff8229e529d3e44f6aacdc668927323f2d78bb2f8897a06 WHIRLPOOL f439f16e01332e906d0e0d97c2fcab393dfd4b561023e5329d1f20fb5498433ebb319f7504958a155d62b9f91c68dc627bd726be0037a49faa6a54376ea46abd
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
 EBUILD geany-plugins-1.31.ebuild 3519 BLAKE2B c919ee924c681b067e7340f3b276a6531f44a23167533d04dcd231659663b8da9982e5e4dfef9fd123101acbbdf4d3906d1623b960a60fddc1c341f33170d017 SHA512 1c806fe9dfd3d54552836c35a98ac78e36cbf6eeff671def0e0a42d60e3007f8c6741150f09ecb1540a6637944c4763d827753475e09768556249132bba6a7c6
-MISC metadata.xml 1527 BLAKE2B 428404b0ce969d78a24b4214516a7e4d604c95b93befba4a6e15ae906e6921848a1db8887fb5a77c63c6a693346c378ebddce9ebcd3c63240a9f822b5ca121d3 SHA512 6ce444bea08b140535e396d50fd28660a7b068ee113ba44c886c68dbb23c6129184fcf620f052258908840efd7529224f776ee3cca15710780ce8d3cb7ac2ebb
+EBUILD geany-plugins-1.32.ebuild 3182 BLAKE2B 5003867dc35ec00ff63552dbfc57680c0014a8af897da13ab286ed57fba913968c54fb27a2f9758744db1f3d01ebba4118d84dc325b3dc43668d4b00c85d7da1 SHA512 2779d14f320a8dfbbdec5ab9862a5fc6eb2230d09774c018ccb6bbc248b0291ebde97de7b03bff998dd41f1b2d83717531948865c7c2936a500a5a2f18c1957f
+MISC metadata.xml 1593 BLAKE2B a3cdef722d40a7c3eeec7075667a9b5d496b2e73ec7b67f8d47bf992959f08b099e0f124999903fb4151e8eba686830f93a8cbedd4fee2870d6fa96171726c55 SHA512 5fc32297ae864f48fbb764c9c4ba8380232255bb3279ecd5276a006468c71ea363343c222ccab729168f5ef010e8710fb4d3168356156adee7eec9c67544607b
diff --git a/dev-util/geany-plugins/geany-plugins-1.32.ebuild b/dev-util/geany-plugins/geany-plugins-1.32.ebuild
new file mode 100644
index 000000000000..305048062da6
--- /dev/null
+++ b/dev-util/geany-plugins/geany-plugins-1.32.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 vala
+
+DESCRIPTION="A collection of different plugins for Geany"
+HOMEPAGE="https://plugins.geany.org"
+SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup"
+REQUIRED_USE="
+	gtk3? ( !debugger !multiterm !python !scope )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+COMMON_DEPEND="
+	>=dev-util/geany-1.32[gtk3=]
+	dev-libs/glib:2
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	ctags? ( dev-util/ctags )
+	debugger? ( x11-libs/vte:0 )
+	enchant? ( app-text/enchant )
+	git? ( dev-libs/libgit2:= )
+	gpg? ( app-crypt/gpgme:1= )
+	gtkspell? (
+		gtk3? ( app-text/gtkspell:3= )
+		!gtk3? ( app-text/gtkspell:2 )
+		)
+	lua? ( dev-lang/lua:0= )
+	multiterm? (
+		$(vala_depend)
+		>=x11-libs/vte-0.28:0
+		)
+	pretty-printer? ( dev-libs/libxml2:2 )
+	python? (
+		dev-python/pygtk[${PYTHON_USEDEP}]
+		${PYTHON_DEPS}
+		)
+	scope? ( x11-libs/vte:0 )
+	soup? ( net-libs/libsoup:2.4 )
+"
+RDEPEND="${COMMON_DEPEND}
+	scope? ( sys-devel/gdb )
+"
+DEPEND="${COMMON_DEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	use multiterm && vala_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-cppcheck
+		--disable-extra-c-warnings
+		$(use_enable nls)
+		--enable-utilslib
+		# Plugins
+		--enable-addons
+		--enable-autoclose
+		--enable-automark
+		--enable-codenav
+		--enable-commander
+		--enable-defineformat
+		--enable-geanyextrasel
+		--enable-geanyinsertnum
+		--enable-geanylatex
+		--enable-geanymacro
+		--enable-geanyminiscript
+		--enable-geanynumberedbookmarks
+		--enable-geanyprj
+		--enable-geanyvc $(use_enable gtkspell)
+		--enable-lineoperations
+		--enable-lipsum
+		--enable-keyrecord
+		--enable-overview
+		--enable-pairtaghighlighter
+		--enable-pohelper
+		--enable-projectorganizer
+		--enable-sendmail
+		--enable-shiftcolumn
+		--enable-tableconvert
+		--enable-treebrowser
+		--enable-workbench
+		--enable-xmlsnippets
+		$(use_enable debugger)
+		$(use_enable ctags geanyctags)
+		$(use_enable !gtk3 geanydoc)
+		$(use_enable lua geanylua)
+		$(use_enable gpg geanypg)
+		$(use_enable python geanypy)
+		$(use_enable soup geniuspaste)
+		$(use_enable git gitchangebar)
+		$(use_enable multiterm)
+		$(use_enable pretty-printer)
+		$(use_enable scope)
+		$(use_enable enchant spellcheck)
+		# Having updatechecker… when you’re using a package manager?
+		$(use_enable soup updatechecker)
+		# GeanyGenDoc requires ctpl which isn’t yet in portage
+		--disable-geanygendoc
+		# Require obsolete and vulnerable webkit-gtk versions
+		--disable-devhelp
+		--disable-markdown --disable-peg-markdown
+		--disable-webhelper
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	prune_libtool_files --modules
+
+	# make installs all translations if LINGUAS is empty
+	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
+		rm -r "${D}/usr/share/locale/" || die
+	fi
+}
diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index d9b36784e15b..e97496ef202a 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -23,6 +23,7 @@
 		<flag name="keyrecord">Enable the keyrecord plugin</flag>
 		<flag name="multiterm">Enable the multiterm plugin</flag>
 		<flag name="overview">Enable overview plugin</flag>
+		<flag name="pretty-printer">Enable pretty-printer plugin</flag>
 		<flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
 		<flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
 	</use>
diff --git a/dev-util/global/Manifest b/dev-util/global/Manifest
index ca2f2d701e99..40c8f6631fd8 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -2,6 +2,6 @@ AUX 50gtags-gentoo.el 183 BLAKE2B 242ceb0370227a6c0f1ee23477aa3798e0e8580e59849a
 AUX global-6.2.9-tinfo.patch 2047 BLAKE2B b88b65679f9b6ed0b96ca236c1918c3238baf99bdff8c7a45f85f982923d82341f23fc961cc4d61ee9269900b48e2d726ab57482e9635b035cf621e27da0f72e SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698
 DIST global-6.3.1.tar.gz 1369634 SHA256 fb10668ef1a2f63d0730564a36ecae7716aed89c09cc5896cd8c579be4ebae6c SHA512 83becd6cda06f8da17ea0c701bb135523ff48cec73b233d24566387d11a35c0b42f410b62753838e2b364a5a485cac033b4aef1159cc6f4cdeca4a7b6c5bb4d6 WHIRLPOOL 1321e131b267f842b68561f04155c06dc11b0adfe177e83113b1884eb629d8e27844de6421c1613efd2ad7472d51140deb5360a6ad78fd25f50844426314de5c
 DIST global-6.5.7.tar.gz 2940567 SHA256 d9c08fa524f9499b54241cb2d72f8a7df01453b6d5e012a63784ded08e3acd32 SHA512 0d33f718839e5e00bdd6d042b415a69c5e1f232d843610870505f8f20635b445810149b1b84ea8b77881f5f64814783ebe3cdcab2f84b8a085223b64293a9045 WHIRLPOOL 0c32bc466652a87661c21bcaee2f2a1b5eee7b3bff5e8f763bd3b1c159daea10c1e3c0f092109d9b92112258f52e88a7bed7eb58923a592013d400b7d6727f4d
-EBUILD global-6.3.1.ebuild 1650 BLAKE2B da488adb4ad682cffcf6a1502dcba26e36011df46bc3cdb2aab427a692b2d266e05c5b4dd3c5cb4c8226d5b64b42e5e9b91c51e7ef7a5e73011fc96be5be7ea7 SHA512 01664cf063e632aeb4e3008693992674023c46f54f635617841606636cb7d20ae83cda34f67db9b572cf1fbe34bdebbbc99ceff65d52b0041ed144f6ecca741d
+EBUILD global-6.3.1.ebuild 1617 BLAKE2B dffa8f04a1d8598330b7cecb9a61810dba059fc12cdd3c8960c62c9511b37695eaaa399e0e2a8a5cee3d5a8670620038c591f0dab016543540fca670e069a08d SHA512 2a926a45bd9cd724a56bc77f080e5b5aa00642196b177f2d3330c038601c25f5e3a610ac690a1770d2894e3b899f33f1ae91ff4ded914cfc8386417ec134701c
 EBUILD global-6.5.7.ebuild 1633 BLAKE2B 40e16753307ae07fd9585340f1e8baefbb77833dbaf2a6ed7b598aff143fd7adb1c77d98f883a0ce5d2ef576ee29e2aa65f7fffbc27d38fcadaac09620a9be2b SHA512 99b22b10d0c983872e4db53d158b73ac468b4a5fc289f4da4859c0d1ffced1e0d7b7fccc4d00e3fd7c5dc75be317c4d83c2c2fbb07ee56f9f9427f096cfdbfcc
 MISC metadata.xml 572 BLAKE2B 11f7c3654d177b58e93ee0f405f6ae6a743727ad0518063beee356858980361eec53d55622bc106306b9aaf2879547b294df9aa0928137fe1cf0ef5003320d3e SHA512 a2ee0b8c3dc85fb2b23b1741dc312928a1a96ec31400e946d526db4a31f825fb49261595e0b59410456e035415a0ad9442b81178f44b66ba53165ef3b5fcf24a
diff --git a/dev-util/global/global-6.3.1.ebuild b/dev-util/global/global-6.3.1.ebuild
index dcefb9fac0a0..eb062c9e9b89 100644
--- a/dev-util/global/global-6.3.1.ebuild
+++ b/dev-util/global/global-6.3.1.ebuild
@@ -5,7 +5,7 @@ EAPI="5"
 
 inherit autotools elisp-common eutils
 
-DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in various sources"
+DESCRIPTION="tag system to find an object location in various sources"
 HOMEPAGE="https://www.gnu.org/software/global/global.html"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 0573a8bb1ff4..77ba46115f23 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 BLAKE2B be3fb3785776052eed0f102e9665628aec1bec93953de1cdb795af8db458cedd07fa717abee4dc9e6d8c4c8f45209371ac130fa29e8a77622290524b771b5c89 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795
 DIST gtk-update-icon-cache-3.22.2.tar.xz 366364 BLAKE2B ee34d66620b087568e233ce285d742b6923102af93111b8e999da5527e801ab00fac8b0aaf559583ec9d91cdb0892db3211e73592632179f67d262d604c8447c SHA512 a9e7f6c865c0648186954bb75f8032666ef8920513f24ecf5a05388f3b739b4418d4513c7eb81fce91ba4eb7efd6d37ade91950bb40c52f50a5b57c0632be959
-EBUILD gtk-update-icon-cache-3.22.19.ebuild 970 BLAKE2B fc2ec1786d500e61635189eb34e217c261fe2fb66e31ce30efe571d1fc8d4c7995922084f144ab60bfa66e3ee265da99aa0e2fe7bf2d68e980f80be936b0deb7 SHA512 18dbe24a2ba252eb28807a2815702a5430436400cb4d5cd0f12ddcfdc0993c3169aa81015bc5bec6e28827bc98625212d9c32617827a0ef9d90b707b4ef9a49f
+EBUILD gtk-update-icon-cache-3.22.19.ebuild 969 BLAKE2B 05f4802047a6df09adac3cf136eff63b6f1ac84279a2cf3c6c3456b86e385fb81deae124aaa175b419951650900670e4c42c83a71507eb1d20de865b25666d4a SHA512 92f4d1c57cac2157c5586a483416e24c96e875be580880c2e5135d6b56d4e5e5965d67b285b250db9051fc796b3038333889bc0593229f902edb78eef91d3c57
 EBUILD gtk-update-icon-cache-3.22.2.ebuild 966 BLAKE2B f403203df0c0774818f3e00c23122fb1fe466aaffc59a083d56cb2b614afb6157fdc6c4067406409c597a5fde7e506e92419bfa171ece0108490468f3a9a32c2 SHA512 f08a2be5aeb4f835c9ba482b0af79717d5d0c505d4782fdfe461b82237e67a52958e68b10936cc70f6cec18982b0386f64c37e91610c611bec9424baf81feab1
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
index a943b7004385..ee483f416c9b 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/igprof/Manifest b/dev-util/igprof/Manifest
index 88ff180e6b64..b3ca0e65a0ec 100644
--- a/dev-util/igprof/Manifest
+++ b/dev-util/igprof/Manifest
@@ -1,3 +1,3 @@
 DIST igprof-5.9.11.tar.gz 174304 SHA256 af65c7f8ba12730d1e362155c46856b2241c15e0113a2211bb4e75b47b851065 SHA512 1c6a16e286243a997b9ce798f2403597e1d8178a7b4652e38e9afbcd48c84d868dc83ddee7eb76243096f21b9cd9c0337641bba840008c24429e60454cff1444 WHIRLPOOL 88a67dae1b9344c790814dab853303e9d7ded8e23054e1ca74c90c39d8cd8365de47587a152bc64f93aa2ee62e69d5a969fcf4049268d806e3a298bd30461289
-EBUILD igprof-5.9.11.ebuild 689 BLAKE2B a4fc0d8c94dcf9aed3bdb79ed2e11879bfb55e2b4e8551d9a3d365171c2e9b3674d6d0e3489c9e621de340a5ddcd7a10fa657dc90dc76fa1358e8bfb0581e1d6 SHA512 d7e1b8a465b6ed7c407338d3e1a33e7c7f1b011c00bad309099b7a47473af2854405c1c8e6ff8e0a943e270820f74721036db6d00f81069efbe95271e49a20f1
+EBUILD igprof-5.9.11.ebuild 673 BLAKE2B cd6207f9ce0398f48a0b7dff9ac5b2ecaaff3e44255046b39e4e4dd824b12baca03a303a4ee5b8ba517015a00fc089493f9d003436f5cc8bad9ac78b578b9912 SHA512 a087bb121802b03d459a07106c571371929c0deea8c58a12bb48dc7d05d217a7f54ad2d803bf30f7d7edd9bbbd3d684ae93b295bedd145af7c920913a86ef8ab
 MISC metadata.xml 295 BLAKE2B 04f8d4b0effb517c88011d1be87858d4c877fdd73299438dcd3f870bb44334a1bc29ba7cbed5ab2aa11f7ffac5b1d4a964efea3578131d9ff3ec9c93ae36ebe6 SHA512 da6b377b85e03955329c76f8f05d5933e63fdb826848635b7f6f2df07bfd66dad1592f3b4786556551ebf69fccc7e09475216389a1fda68a00da80a0e8966ae5
diff --git a/dev-util/igprof/igprof-5.9.11.ebuild b/dev-util/igprof/igprof-5.9.11.ebuild
index 5199159f060d..14f8ced68fcd 100644
--- a/dev-util/igprof/igprof-5.9.11.ebuild
+++ b/dev-util/igprof/igprof-5.9.11.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit cmake-utils
 
-DESCRIPTION="Ignominous Profiler for analysing application memory and performance characteristics"
+DESCRIPTION="Ignominous Profiler for analysing application memory and performance"
 HOMEPAGE="http://igprof.org"
 SRC_URI="https://github.com/ktf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-util/jconfig/Manifest b/dev-util/jconfig/Manifest
index 0518dde21981..b56b2d28c0bd 100644
--- a/dev-util/jconfig/Manifest
+++ b/dev-util/jconfig/Manifest
@@ -1,7 +1,7 @@
 DIST jconfig-src-v2.8.5.tar.gz 1171848 SHA256 3c3e1bd918a5ddff03bc7177b79962742b56101ce30355b2f10051ed3911019f SHA512 c6c1af63069ccaf7cfd2fe625318fec4ed3f82671754956f8d861c3254a748bbc8a7b8e63e36cf8abc436d4ced732d8ea04f770551428b04d3078293dc77d6ff WHIRLPOOL 17f00ea090b25783e11c1a670fbf13a74e98ef5b8f36322db2cf0f2e80dcb0c4dc0e1dff64f4aea652a0713f8e1b44537061d54126f27b5000e8474c80150200
 DIST jconfig-src-v2.8.tar.gz 1155906 SHA256 cba610b110de21936ecabd4db00ce18035c4ee14fcde9e9a3fa6c2d722477dae SHA512 ed84e3be2334caa9a7edf0308c6a2cc07c1462235ce27c39ec180c535f163447373f82a0c9f6ad144ec16cc013658e0f23e98e2f2089c7a680d1728a812d49c5 WHIRLPOOL b930879751980285b21dde61cfa23d31e5490c267d2aad50c1fd314fccc800f90537c08e20508f757b60d0802cb79d1d50815a0dec01e2754a84eeaf5a2eedc2
 DIST jconfig-src-v2.9.tar.gz 1202738 SHA256 4e4ee16b2bfec7d73ede45f0c42960cb4a907396d29123c2e0060c5ff83cc616 SHA512 fb3c171f8204bd41d7b0183707b6f524dbf27d8c82335cce5f9b4070b77ea1c86345692e533f1a6d64e0334e0bfc88f4cc47828aea6b4b56058197122c675b2c WHIRLPOOL 962a07b0206b899b583da4586193500740d092f26ee0a741b65dee412aef66fe07f21efea1a8c55e809534bbc22236e2d8b959ba5c7c5e2918b662e3ff71bc5f
-EBUILD jconfig-2.8-r3.ebuild 881 BLAKE2B bdd320c6ca4266b1ea034e7469450a9b4edffab45bb360bc33f688971cbedfb166a50241664803958a34ce8ca23f211be34b9a9aaa09d62a9a45217d84dc4052 SHA512 6c583c2c0f4566b55338b2177e0a933d4f82c03b46a907666775b0add67a9c750a70e95a21afcb8a10017886122c3cf5ffe523b5a4da724391e1aac35e075649
-EBUILD jconfig-2.8.5.ebuild 881 BLAKE2B bdd320c6ca4266b1ea034e7469450a9b4edffab45bb360bc33f688971cbedfb166a50241664803958a34ce8ca23f211be34b9a9aaa09d62a9a45217d84dc4052 SHA512 6c583c2c0f4566b55338b2177e0a933d4f82c03b46a907666775b0add67a9c750a70e95a21afcb8a10017886122c3cf5ffe523b5a4da724391e1aac35e075649
-EBUILD jconfig-2.9.ebuild 871 BLAKE2B 8b253635ac3be5c73789ab378bb406ef0510e8c662c108df4c91215e1442a561ce89e8b6ce236f8f1119a017716898b3b35010f7686dd5f38fe748a0bfec79f6 SHA512 9ca77083caf521dcfe72b0a592a6cf392b0d6bff9d2eca1ae3f148ff4beadc80610dcd5c4ae10d78554755c69eaf136dfa44934354091783e81bee25f72235dc
+EBUILD jconfig-2.8-r3.ebuild 852 BLAKE2B 0b89bd36efac18a7d11620a43bdbebde4b0657b32a1c6fb405ec766bf36385d83eb3b7314dde1028230ba8adb14d06e31cc92e264e28d095f032f98e85fd9258 SHA512 7a5bb7adafee2eeb75ab03f5d7919562d8992220690679e6eb46b1b1ac282efe2d6f931d0304729028c7c2803d23e10f83168d00b813098beaabbb815832d9ff
+EBUILD jconfig-2.8.5.ebuild 852 BLAKE2B 0b89bd36efac18a7d11620a43bdbebde4b0657b32a1c6fb405ec766bf36385d83eb3b7314dde1028230ba8adb14d06e31cc92e264e28d095f032f98e85fd9258 SHA512 7a5bb7adafee2eeb75ab03f5d7919562d8992220690679e6eb46b1b1ac282efe2d6f931d0304729028c7c2803d23e10f83168d00b813098beaabbb815832d9ff
+EBUILD jconfig-2.9.ebuild 842 BLAKE2B 904129fc6bcbd7bb550131c61ed91fbe5626616f7f8c8a879cde4c8c0d0b5e8cc61fe185f9ba73ab0367955aacaffecb324bb1177c6ab7f2ea75536981a340a7 SHA512 589751320dde2e2ee74acac1545a7afd3430f8808de2edf5a641dd25e78390630c66978e290cc61355aa9ad08514ce75254ded91be1933b38d9978a7c58c1067
 MISC metadata.xml 313 BLAKE2B 35d3e65273f55e25c70550785fc394e3e5df5de19e450db23d40253c2384cf67e23ce9431b34d51d34c604b0d60c8926289ce409d80ed81352e6f10abe496e99 SHA512 a763cadd5e639466f136912e6a1abad023e53576ccbfc5b6b82b9ce5e7f7b173000d51d0991332dd52bff2fc0ee77963ce2e77b58c3f9ecf9701344ee4c5f2ae
diff --git a/dev-util/jconfig/jconfig-2.8-r3.ebuild b/dev-util/jconfig/jconfig-2.8-r3.ebuild
index a39ec9d566c0..b8bbced5a266 100644
--- a/dev-util/jconfig/jconfig-2.8-r3.ebuild
+++ b/dev-util/jconfig/jconfig-2.8-r3.ebuild
@@ -5,7 +5,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+DESCRIPTION="Utility that provides a simple API for the management of properties"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
diff --git a/dev-util/jconfig/jconfig-2.8.5.ebuild b/dev-util/jconfig/jconfig-2.8.5.ebuild
index a39ec9d566c0..b8bbced5a266 100644
--- a/dev-util/jconfig/jconfig-2.8.5.ebuild
+++ b/dev-util/jconfig/jconfig-2.8.5.ebuild
@@ -5,7 +5,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+DESCRIPTION="Utility that provides a simple API for the management of properties"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
diff --git a/dev-util/jconfig/jconfig-2.9.ebuild b/dev-util/jconfig/jconfig-2.9.ebuild
index 22792d15895d..ba1c8d27d47a 100644
--- a/dev-util/jconfig/jconfig-2.9.ebuild
+++ b/dev-util/jconfig/jconfig-2.9.ebuild
@@ -7,7 +7,7 @@ JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
-DESCRIPTION="jConfig is an extremely helpful utility, providing a simple API for the management of properties"
+DESCRIPTION="Utility that provides a simple API for the management of properties"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-src-v${PV}.tar.gz"
 HOMEPAGE="http://www.jconfig.org/"
 LICENSE="BSD"
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 03572de7e5d4..d6b6c3dabadd 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -2,10 +2,13 @@ AUX 4.0.1/0001-test-Fix-finding-LLDB-tools-when-building-stand-alon.patch 4415 B
 AUX 4.0.1/0002-Fix-bug-28898.patch 3526 BLAKE2B d13f4e866c00763061347bc24908306e4f7fb6d0701d10d272475556d4213dd19a13abefaa660199a9c1369264a84fa2da23c09095f4e3b6e30b356b99b90dea SHA512 8a9167ba1b17bb6d373fd41755ce4436b199fb48a47e303bff4020a79f90c547ae3ca86525345c55536bdc03b9c3853baaebdf914df04ae92901a073ae5658aa
 DIST lldb-4.0.1.src.tar.xz 19088212 SHA256 8432d2dfd86044a0fc21713e0b5c1d98e1d8aad863cf67562879f47f841ac47b SHA512 1d94d7dfcc0614b16d0ef83436bbe814b39e34ba18394361bb9f13ad408ae9b29affa9a5d58c50c8dcd83765a39ae4d59ffabb7d8cd1358fd2fbd198b2de2ab6 WHIRLPOOL d7897416b89c683702bec9bd244caa911e24e5801270b64b119caf0e617f4bdc714d10bcea3963f229273d040ffdebcb8c5737a71ca17fc92e2bbbf93af002bb
 DIST lldb-5.0.0.src.tar.xz 19203772 SHA256 c0a0ca32105e9881d86b7ca886220147e686edc97fdb9f3657c6659dc6568b7d SHA512 bc70953c7f6b3f0bc797461fb53d9c60c5ab36c0b9aae815a3c37fc597a61c7220695ee3b60a9682486d2e4713c5f78ea85e853e13c587e356510a1c99a62ba9 WHIRLPOOL 25b88b8b0678afe5aaf9e108dd154b874defc63ff41c48a495c91b98a22844e614142e2240515d9996d794ed5322aec26c977ed156cc2d5081ffe5a0c0999cd3
-DIST llvm-4.0.1.src.tar.xz 21065652 SHA256 da783db1f82d516791179fe103c71706046561f7972b18f0049242dee6712b51 SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d WHIRLPOOL 1626ff270f7ce4801d02a0797b227fda9314ff5c0c01d653111599e9a4d2854c4d9edc3c698a7abee8d79d6bce8b18dc619fbced3c07ca610d44a248d65830cc
-DIST llvm-5.0.0.src.tar.xz 23411980 SHA256 e35dcbae6084adcf4abb32514127c5eabd7d63b733852ccdb31e06f1373136da SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a WHIRLPOOL 6a99edbdc3e6726dc8ff9126b110fd7560faac46601407722e6dd80b5d894ff242521dc8fda7f4d879de83dac51c65645a37224f7e8def0d8d2f1e564b0531bb
+DIST lldb-5.0.1rc2.src.tar.xz 19182108 BLAKE2B 711b2eed319f8f9b170317c1d6b9f755e8ed8019bb14b551e20dd50f3a09d8cba7c9aca155ed173e9720e42d8058efa725f216eb037ca0a6754f4453a645f87e SHA512 428edfb0e882f41410fa789a3a96a10ae28e614e486e43160872adb92e61a0950d97e6347f9e78d931b74e7fadc826608a27edbd773dc0bfae338e0e07ebce85
+DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
+DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
+DIST llvm-5.0.1rc2.src.tar.xz 23508164 BLAKE2B 3594d1658310a99787b4ff6f85aa8dd12a0405464bcb095ba4f205ce5b4ed3240a8ae1bef726ff98aba61ae5c8f8c10eeb8e415320d210af60f9e74bff7a8d5c SHA512 0a156e3949d22304b5e173dc9a3628161dff2798ad67924341c11494544350ef3a35a3ebb6ec8e7223b2407ce47cf12dafa6de8c006c5799a620e35a86c30b1b
 EBUILD lldb-4.0.1.ebuild 3061 BLAKE2B 8d46c18a5518403e73e40e38ecfafb6dffe59ac554c04dcfd92020a932c3a4a32cfc5dd19de649b1fd0d9c4cac4c2d70ede3bb0472adf3814259fc39389533dc SHA512 d88dc965435cddf490e5fb7ba36ecb43cdc3c4ecf5865d531f3141f40226bba0cc63ff604d62e8e1d436da2c48c4f5a435e0561f265b0e2961423770e9edc43a
 EBUILD lldb-5.0.0.ebuild 2811 BLAKE2B f8a5c12fe179486993f4ed0da5f4b6abb4e282c4c5702277af7853cb71b4cacd1fa998346d07373fdc0e5f051155c373e2c5cfc30131afbf08660a782ac7b81d SHA512 e4b38ef25db0a8b764bc7b1540190024557ddafcae6613d3c55fb98b67ca72a922b5224b8f65144050cc3055418bbde6769ae30bd90cb5d30083c018e1fee8f4
+EBUILD lldb-5.0.1_rc2.ebuild 3053 BLAKE2B 1b5d38d7679aba5f0c4c12a007302967c77c53560165263f4fb893ba61869ca5bbc06c3e0560c71a3ddcc9aac8d939c383979fc7e20746c4a961ce4d31c2c718 SHA512 5755506b28fc5e48b57010789b1d562ec4f199cb77327c758f038a4adfdabb715f92428388ae233a8ed5b8a34130b87a3266224fac49579a655d4bef44259def
 EBUILD lldb-5.0.9999.ebuild 3017 BLAKE2B e4c15b52bf428a5b494ad0573d7d2d59fcd73bf04a369676a4402999a48c78a770afcee927c4418e30b5b040f65032aa751ee4418e19e7b552721419a45f5de8 SHA512 192f6dd7bc2addafe3614e5845d3b0e559c5804bd481e15c2e21018529d635fd5f242240d4ebcb8856e90acc17980db12f90bc652bf0ee1f36b9d62f43205aca
 EBUILD lldb-9999.ebuild 3034 BLAKE2B 56d803d7e909d209ddb0520067348425c6aefe037257fb586a3886d2a7919dac75b543d485be9b3f0c377063948dc4eac993f50997b80a6769303cd251073e68 SHA512 fa4a7ffca5a13ec289bcf87793448d172073e832e1d2847d1b87bb7d71ce01cc87b0cedae76f37c0ef878967d89816f6eccc4273b8e8c3fcf91d01e462604a93
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-5.0.1_rc2.ebuild b/dev-util/lldb/lldb-5.0.1_rc2.ebuild
new file mode 100644
index 000000000000..5ddf9b76049c
--- /dev/null
+++ b/dev-util/lldb/lldb-5.0.1_rc2.ebuild
@@ -0,0 +1,119 @@
+# 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
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="http://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( http://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+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}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+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/makepp/Manifest b/dev-util/makepp/Manifest
index e31f55e86408..a77f729bccf7 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -4,14 +4,12 @@ AUX makepp-2.0-destdir.patch 254 BLAKE2B ecaa18802ac0e0585b58d48a48503b94724c20a
 AUX makepp-2.0.98.5-perl526.patch 964 BLAKE2B 597194606fce15f997e6f9b5981c123e9b0921542925a257205398dfdce62c6e173bd526dc5c37dc087443a3c8b8bcc20a3d7b3eb26bbb76e7e8f6be5b5b59d7 SHA512 aec311f042c34018c31d8f3e7c4fdc5594eb14519c78b20c9498e1680728e1eba397aca3be68a720f1da49925e619be30b288acf1d83515aa5388a2f8ad72274
 DIST makepp-1.18.tar.gz 236990 SHA256 0a1ee878452d44ecdf52dae928418ed2c426b5bbb95bc223b787329f9f5cc2be SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9 WHIRLPOOL 278fd69d575e7c9fcbed168d43da031740b5c9fc8c1bf5f97b16e4ab8b3d0b5d65d0a8a3764a72b212137b1958a9fe69a67c7ef649a713aff669cc50597e7ac1
 DIST makepp-1.40.1a.tar.gz 278170 SHA256 eb9991e9c726836e9b214377976dc15f66f4f6045f9713cd36c8c6b73c1f8e83 SHA512 554987f1ff51fd4d984d54a8bf1c36182418f57820899567aba8d961753ab4daa4f4fee9591557dac199c0a2e4ba33f5b2a789e237ae9684e5168201d0a152ef WHIRLPOOL 1ac773abd2f384c020c54264e700c32c84021b07f43e13c7e7474579bb99aee018321f5476441942ef891a8b1840e6195cb89260e837fbb49d0d5e651eddb0b0
-DIST makepp-1.50-110621.txz 496296 SHA256 70d6af24020bcdc1ad4607817163e18c952792a39f67674ee60562545c940330 SHA512 fca88aa5abad01f02edd59060cafd0f0e1ecd4335c2af556e04890d07f48bc07027e9fe533ad2c0d125b35b2da90a775d09b6401fce22e539df4843fc7704966 WHIRLPOOL b55572e05b3152552fb9fbd2b5c80cde82d3006024e8763d1b7eba3873f5108a606bfa3dc420b36bafe8b1bd72f7424e226130fd6df9019637738c6a0a625fd9
 DIST makepp-2.0.98.4.txz 528092 SHA256 e37f6d4374c64f0ebe2146af044514ab531ad0dea5701b31ca059a337e935f68 SHA512 c04e67f62155ce398c1fccba350354b163367ef5a6db961277433a7c733a71512a48cf3427d02a7b6874ab33047f6b7082105ed78b8397dc430c9d6a34ad9d38 WHIRLPOOL f75be059e04aa139f2ebe47acb8f64815b6f0e95c3ade0a24d00bfb437962292eb2e264f774a4f4d3eee65aa836f7a129d97eeaf99a4439b0d1ddde42cb2171e
 DIST makepp-2.0.98.5.txz 529556 SHA256 ae62717cf37da1788b46fa7c90511e399a6e545798d8c12531d33b2be0ac62bb SHA512 f4ad5ab3800148fc4527558374be765e0b7ac731220192c1105e9c688c5961b8d5dd42ed2177db2aadc879b2c66e4bde14428eaf3055a6ba52163d908c576b5a WHIRLPOOL debdd1d25d1ab4822b38cda3a72bad1975fb759c6526332cea65b6dedc4644554662667562024949bc3ed725f03990cb647aa487a1c083e98d9411e0e4aff719
 DIST makepp-2.0.99.1.txz 532784 SHA256 6217553ebbe208b6e450affd77e6c82c0c928ab30f617d489ebbfa9cfd3b6d86 SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213 WHIRLPOOL 71b2e1037e5ca05976c766669b221234b4d21b3e8b8e43de311d56cb1a908ceeed5c7a5d4d31ed59638c5973d446e8d19506eb3d2fb9ca4db16a745c4f61692c
 DIST makepp-2.0.txz 534708 SHA256 0c617b1c23b537070d43ace2501ac1b30503b126a729206a7853933485d2bc78 SHA512 b8327fe475cb323352c6b89f1dc5e4a3fbbc71ee8b53777340449f610e3276465680ba3bc3bba905bb00754ca52ca56b82b9b1184db7bf7b272a47822b86aa49 WHIRLPOOL 79c69783a64c3f42184f5d72b19374251e8e88eab2e08c73e8442908eafac4cc7f3a8a64a36bf45c68d1a5d9b5eeab08b799e26a85a14f4bbfe320fd34a77ee4
 EBUILD makepp-1.18.ebuild 907 BLAKE2B 4aeadd592dfc4037034fac9db273d131de3027385e6be4131ef5d9f04da0045c02edd2cd9bd520d90b46829c7ff8f2e91087f4457b8454a4cb4cec3d9df5843e SHA512 cf12ad152a900eaf3178879b18cc49c50d9f55edba7e873671355093af969678e30217f879357ae61d7a8625ded0f0c82214720e34873a034eefe65cd325de9f
 EBUILD makepp-1.40.1a.ebuild 864 BLAKE2B 482a4585170a368c99ddea8520362ac314a72fbab7a1d515e6986bf15cb05d77daf6e791649e77a5925ffe13417a8b3f3036e698561fda3a08f4d305e7ad264c SHA512 c9ddb8a99a226651bcf6fda665c6e92caa2fa0ca7264e4f9fb98bd1aa0d40cb54420d10c906dd220507a6a608b8736d63f8248cdf09433c963b8ae4d2e69b030
-EBUILD makepp-1.50_pre110621.ebuild 1069 BLAKE2B 23d884047537a7229308f742c23789b67f0aeb0fba34514965da16e1fded0ea84ea6bd018bb5d8b1e4972fde33711a71585c47a14df809b65177cd5fa104e7a6 SHA512 14adafaf2bb7ab4e6caf36c60fe59f4b9ba8b90f0682928af709568e2931c6b8e6b886214dcab9f62dfd5b13e2e77a72c93647b13cedb177085d57619d9d75f6
 EBUILD makepp-2.0-r1.ebuild 1101 BLAKE2B 05111d35ecc47db06abbefa56e654982e9eaaf895dd61e93cd8d9ed750905a8b45165a6e361d1684dffd0b7af7d377c9f0c0cdc6cdfee1e98a259844ff71864a SHA512 fd8000e9b800a0dbae39824ba3286252ee63e25f76b5229e0e42e026ea731172b8c500a85370eda51e26d616a9d2f652241a1fae563494ad6dd46a33d0cdf416
 EBUILD makepp-2.0.98.4.ebuild 1049 BLAKE2B 7bfdd2926dd06b5bfbd24d3917f8248a67b60bb8f2350850569d966c84393a0b048e8d95334b9dc4797c1fafce1485c32c8667e26f0bc3c701974248987bb4fc SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c
 EBUILD makepp-2.0.98.5-r1.ebuild 1003 BLAKE2B a0c255f4009525028feaf0a606e762697bfce0d601a4ac8ab27fb7a1cf3d75a32d05717657ae560ef0b38483163d36a572f8f3ccdb5ec3dd65d5ea8a7cb59c44 SHA512 8541e1a75f5c8867bb9e5320090496d6f2b4b59fce8745aa689657c98f3bc782487ad3b48e2e6a29d0784c718c921cfff879ffe8fb64ec8cc4e96138d9d5214f
diff --git a/dev-util/makepp/makepp-1.50_pre110621.ebuild b/dev-util/makepp/makepp-1.50_pre110621.ebuild
deleted file mode 100644
index d19d34f743bb..000000000000
--- a/dev-util/makepp/makepp-1.50_pre110621.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit eutils
-
-MY_PV=${PV/_pre/-}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV%_pre*}/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-#	epatch "${FILESDIR}"/${P}-install.patch
-	# remove ones which cause sandbox violations
-#	rm makepp_tests/wildcard_repositories.test
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README
-}
diff --git a/dev-util/mpatch/Manifest b/dev-util/mpatch/Manifest
index 2b6f12df6eff..d9bbbf1c1aa4 100644
--- a/dev-util/mpatch/Manifest
+++ b/dev-util/mpatch/Manifest
@@ -1,3 +1,3 @@
 DIST mpatch-0.8.tar.bz2 115774 SHA256 b886843319a107f914f765617959989560fecf3f59b9e09ca0ad2d10643546d9 SHA512 1a05d23c923e29cc87dcc0994affd87b9b0b9257f2d410fb28ed2fe5337676274e9c8548df286a81479afa231a80805ac09f3e0e9b6c8942ebef443fbc4f96f1 WHIRLPOOL f135137ac6994a3f8b3945653f6b0fcb29d42dc638ee306781c70a81b211356d96e45abf9d8dac73c81704cfd72220d865df732278ec20807e241146612e5fc7
-EBUILD mpatch-0.8-r1.ebuild 591 BLAKE2B b12f3ae04997f06fd2f0f6a0a1dc55dd6070cec5ebbf2edc12d3decac8e5344960ecb7133bfed1f4658ffb08ca38f1c6b11696a16354f09d5183cf32cbbc4748 SHA512 08286350586c6dde7f991754378c11d10028dcb401215c973594da4df58347e99bd164223ead8cb46ff7597f967807fc14cbb727a03b5d8f1d8accdd40ce8930
+EBUILD mpatch-0.8-r1.ebuild 586 BLAKE2B 03fd30f13ea7cd737eb918aa902b0d0ba9fffd60bd1e4dcdadae8e661f664f39bd8a325aa592feae2f9c928e0de7de44f29dbf0c18dbe1a6faef64c596e0c85e SHA512 7961a92e8eb93e0b777a2a21a59aa9db321ed34de1aa1d561143fca1f4684d956e5c4f2669bcbcf61ad09de134b1e6169e42cfa2ba4514001bcf0f65736b637d
 MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850
diff --git a/dev-util/mpatch/mpatch-0.8-r1.ebuild b/dev-util/mpatch/mpatch-0.8-r1.ebuild
index 5b31fd4fba7d..6bc96da215b0 100644
--- a/dev-util/mpatch/mpatch-0.8-r1.ebuild
+++ b/dev-util/mpatch/mpatch-0.8-r1.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_SINGLE_IMPL=1
 
 inherit distutils-r1
 
-DESCRIPTION="Patch-like tool for applying diffs which can resolve common causes of patch rejects"
+DESCRIPTION="Patch-like tool which can resolve common causes of patch rejects when applying"
 HOMEPAGE="http://oss.oracle.com/~mason/mpatch/"
 SRC_URI="http://oss.oracle.com/~mason/mpatch/${P}.tar.bz2"
 
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index 759fecd52096..c1a92b0145e2 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,8 +1,8 @@
 DIST rosinstall_generator-0.1.11.tar.gz 10230 SHA256 cbb87d76a35d14d9dc5728c53e0027fe855830daacf6b4aa78b336fad03a297d SHA512 ec94feaf05f105cc19715824937c96a505bcff1236a445f8eb85cd68dfa70fd8e146d6e8c67a5f1d54b1579a8f432ecbf042acd7c0a78a104c27281433afb2f6 WHIRLPOOL e78320c5134f6645ab168695b4a5291fda8348a38f0b5f3a27618e0c6a9eac04381a843f1eb083db9e1f4edb149e8ac767e6ded6691894dec604504e582fce34
 DIST rosinstall_generator-0.1.12.tar.gz 10269 SHA256 aa767131b5f99177ea4372b65938560f5f6bd45d79cdddd09164fe1708650d17 SHA512 29c22920c5780deb9562ca26cff442161518d86f0b0355c2303b831f27c3c6b6cd0825321254a1dc97ccbe91806741b3b16bbd21309fa81b2aa4412b45b5c8e0 WHIRLPOOL bbaf1c849a7c304d96a7d58b155cd6d5f5ff667d6fe6c5cc8605e3e7c4184699b68a9b9bb016462410ecbe717d18e1c0d8b18a7336d49bf9b4570f1208498262
 DIST rosinstall_generator-0.1.13.tar.gz 11186 SHA256 90e7689750e1b07ec1aa647bb8f34ea6efe7777f8d349c9698428afb56733cd0 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c WHIRLPOOL 60cec0ea01de5a17b7a8dbdb45e4496f6e19cc2ab09da253e1ff6a6733a4f1fef473df8498c64a25e72d1ee78f79c54af819e03013dfd4ba1b11b6ba7733a93c
-EBUILD rosinstall_generator-0.1.11.ebuild 948 BLAKE2B 9d6accced6018c160474cb6aeb935dbfe6fbca09551807d081e52ae316eeb2b965300be4510c86aa80c0fc2038da33c2cd4af2061e08d825cb9c1dea7b04934c SHA512 729ebcd532742a73d8bc7883b3b42ad92f9dfe40e142319ecb745863d13b9ea19d11c93203295adf2d9c70840026a009f46ccb74d34a3e818a83f67d3f3a1e4b
-EBUILD rosinstall_generator-0.1.12.ebuild 948 BLAKE2B c7ea1ff0dc74cf44e06e0c0a9cd0baa4ae5cbebc370cc1ed9cf18c165740b4bdf347e41ac37565be1f9076e331e3bdd693bcb7755b2abb7ed402cd218352f4de SHA512 adf4d447336a44a6bafc83f46f57a0a3ce6b6f1b793447ccc92c636d89b6329f8700304958ca630f5989879a81a9f0ed7480a9166dba319ee671cf14096834bf
-EBUILD rosinstall_generator-0.1.13.ebuild 964 BLAKE2B b722008550cc8fea8bde3a75fbedf6221ba4d8ee9002517b65084b94368d4ce817923c3b6a8228581b7d03325594912a9858d3a2f1cb89b75b60aad0c9914b72 SHA512 b162d9e0320db3d3cfb7a812f4938be9e868231b9c1fd9d3e5d70c93ce2b3460964c706a8d9108308f7554c9d7f3e852552b501ba2d49db4f6330e432e051a8a
-EBUILD rosinstall_generator-9999.ebuild 964 BLAKE2B b722008550cc8fea8bde3a75fbedf6221ba4d8ee9002517b65084b94368d4ce817923c3b6a8228581b7d03325594912a9858d3a2f1cb89b75b60aad0c9914b72 SHA512 b162d9e0320db3d3cfb7a812f4938be9e868231b9c1fd9d3e5d70c93ce2b3460964c706a8d9108308f7554c9d7f3e852552b501ba2d49db4f6330e432e051a8a
+EBUILD rosinstall_generator-0.1.11.ebuild 928 BLAKE2B a333ed86f466bfe7b02cf30916de863fa820cbc28b051042421ad64af0f050ef48af1e3897ef0327382ed789088c0fc58f2650577c48f3a8b0b97789aeb6607f SHA512 8cfadea67e123ea53e1a039dfc813428b4239c58e9b7fc91befe2e2cc2191e19c5093d89165375b868f9f00b1d632c1960d0e706b8601460b47f39b02a9e66ad
+EBUILD rosinstall_generator-0.1.12.ebuild 928 BLAKE2B 8682b7f23689d9c346a861a5675041f0dcc506c8e776c6cf57c20b4ab451fd0c370519baff7031e790dc05c89eb4a145b59ffd5caba227bdfe8521f57f7c7e1a SHA512 98e9b6ac62816719b91f070cc3b731ba9db1a7b801901072ddc10bb84f3a080c3d395905527ee19c2a38a5c30acbfb60b2358487ee3fab008739677b2159173f
+EBUILD rosinstall_generator-0.1.13.ebuild 944 BLAKE2B 65e10af020b5e282ad7df1cf0bcf430a70a810b24aa163046917f2a27bd84c26b57928e3a60f3fcf295c1b2a423d11d3423e8b9a09cfce4d8cb15f8d2ebb2c09 SHA512 be7033bc84379134d8e0d04759be6df781a8565147f75eb6213c182b0e16812cfc1f31fb0f9be186f81d3eb51dc9d4313796a003ce740630c00fb0963f7e828e
+EBUILD rosinstall_generator-9999.ebuild 944 BLAKE2B 65e10af020b5e282ad7df1cf0bcf430a70a810b24aa163046917f2a27bd84c26b57928e3a60f3fcf295c1b2a423d11d3423e8b9a09cfce4d8cb15f8d2ebb2c09 SHA512 be7033bc84379134d8e0d04759be6df781a8565147f75eb6213c182b0e16812cfc1f31fb0f9be186f81d3eb51dc9d4313796a003ce740630c00fb0963f7e828e
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
index 36abfaddc7f9..3a7f46fa7048 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.11.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
index d0f79b54db5c..37c80b8e751a 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.12.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
index a793d67d94a8..484e133e8ea0 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index a793d67d94a8..484e133e8ea0 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -12,7 +12,7 @@ fi
 
 inherit ${SCM} distutils-r1
 
-DESCRIPTION="Generates rosinstall files containing information about repositories with ROS packages/stacks"
+DESCRIPTION="Generates rosinstall metadata about repositories with ROS packages/stacks"
 HOMEPAGE="http://wiki.ros.org/rosinstall_generator"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
diff --git a/dev-util/wiggle/Manifest b/dev-util/wiggle/Manifest
index ac3610743ca1..4833b8313ac3 100644
--- a/dev-util/wiggle/Manifest
+++ b/dev-util/wiggle/Manifest
@@ -1,6 +1,6 @@
 AUX wiggle-1.0-cflags.patch 576 BLAKE2B 25b065a28bb88f3163c063a90a9dc60ec9171e4ab43732faf0c493682b05ff37cbc1e99777bfb2fd03894c79bc30713067b3378c02556199fd847f0cf9d4d0bb SHA512 a6bbcbe8307212416ed66f17e5b5dfe2ef2c369f15351623ff1c47c8364da463aeb05241379de28b554a749ce8a66f6f3c0898c8607eabc44797fd2c36bf17d5
 DIST wiggle-0.9.tar.gz 809756 SHA256 fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5 SHA512 2e3a4977704231f3bd6aa96ffaba8bc733acde425773b86a9649312676b44360c5b85cb48bf944cd383d8e4d0a541d88755f23be7d7a8884213f68a6320c62d9 WHIRLPOOL 95a12f73458abdb999681de7af08c407d9f7c4762c71287eb6e80e38a322459c6e1767f2bec72199cf7d8cb33912981b9fd48fbe95957f854b43e4c148c04c14
 DIST wiggle-1.0.tar.gz 868216 SHA256 44c97b2d47a109c709cdd4181d9ba941fee50dbb64448018b91d4a2fffe69cf2 SHA512 e9bd6e794ba0cff70db96a648c53aa21b427967758375b843fccf409dd17faf59468c11bafb1e0a7af8bfa657551da8bc1903b9ccf8def1ed9acc84f50c7e0b3 WHIRLPOOL 26674ff2ac280ee2f6db916518c85799fda5d71bb0e056e414c82576a75a28db35460a0ca76a42854dd3a6b8e30a16b2b8f20649d4da604d2d3838297552e6f8
-EBUILD wiggle-0.9-r1.ebuild 1690 BLAKE2B b2d8b37938a7f36797949ec80bc20deff106bdfabf6ee11598afefe1b32bd539382e3a0938010947ff2d82fbe22a6a4fe821e6c27c3a908036055fd5947bc108 SHA512 e46d1f87710d9dba5fa70cf2a8778e36505ef2985ab9b9dd8f091474d9e25f45bd10055e0613bcd69124930e46f6d72fb36a1743db179b51849aee2cae805b4e
+EBUILD wiggle-0.9-r1.ebuild 1687 BLAKE2B de3bed817cc0e3afaf0bfbc960984270c8606e1811202f441cdd3551e27e7a8c56dcc7149bbd0e18520c006bd098871a5dcba3097e0e7c33bc98a3e012661f2f SHA512 bc1ca47e4546101e6634a45dd1177ae92d14022b088f9bec18fb52c88c33e15fb799fdb1f49b977f11450aa12f4be5d8e9363205bb8add125f2ff7bf6f200316
 EBUILD wiggle-1.0.ebuild 1465 BLAKE2B e98ca4365f3165ed13fdf4600fad10e26db3d3386664562fce42104122a92f78cf47fff88a0d2e14d7f1caef7b784a05f1f859255d7d02a424da0f83c8e50d47 SHA512 c0f51a7caf75b2534ead9e5c9da254434874ea4be217cf4f8517943cb195a9762132e5afe19dc5641d6a9e52ad1c48fd9659e0c95b58d560cda471467c63e30b
 MISC metadata.xml 256 BLAKE2B 7380eb4443aa7d04fc02d228edb72f675580a9f36244c083c4bbdcbc492a4c5169fb3121158d4a613f25f7c0464042bba7951fb92cf9f11c5208a2d9699e195e SHA512 574345bb2730bbc2d0190a03b16703d10441ccd589623c5e8bdddf84d7ce86226da7e079d7b2135e4c724d0813973c551143cdd0f525a58efdd37716dd83edfd
diff --git a/dev-util/wiggle/wiggle-0.9-r1.ebuild b/dev-util/wiggle/wiggle-0.9-r1.ebuild
index 65b4804e13c1..27cef589a4d0 100644
--- a/dev-util/wiggle/wiggle-0.9-r1.ebuild
+++ b/dev-util/wiggle/wiggle-0.9-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 inherit eutils fixheadtails flag-o-matic toolchain-funcs
 
-DESCRIPTION="program for applying patches that patch cannot apply because of conflicting changes"
+DESCRIPTION="tool for applying patches that patch cannot apply because of conflicting changes"
 HOMEPAGE="http://neil.brown.name/wiggle http://neil.brown.name/git?p=wiggle"
 SRC_URI="http://neil.brown.name/${PN}/${P}.tar.gz"
 
diff --git a/dev-util/xdelta/Manifest b/dev-util/xdelta/Manifest
index 101592339fe9..5d78656b60f8 100644
--- a/dev-util/xdelta/Manifest
+++ b/dev-util/xdelta/Manifest
@@ -5,6 +5,6 @@ DIST xdelta-1.1.4.tar.gz 423529 SHA256 345503b60432812840991ea1d79cb10db5f34bfab
 DIST xdelta3-3.0.11.tar.gz 683605 SHA256 0ccc9751ceaa4d90d6b06938a4deddb481816f5d9284bd07d2e728609cb300aa SHA512 41c48e28f92ad50a737cf0acac150fe17d1132e9a652c482d751c8c4e745c6922d576a183eeabae343a1a238ed8c53353e537977628c86eb599ab3d1c01e7c52 WHIRLPOOL 212950d31369e8fbbeb65ae2f6b489f15b259cbbf42242653eace6e3f59b8d592e31ba4994475ba3c79e8c0f7d62ef09b1437548f13c9e7f5b439274eee07e82
 DIST xdelta3-3.1.0.tar.gz 727607 SHA256 114543336ab6cee3764e3c03202701ef79d7e5e8e4863fe64811e4d9e61884dc SHA512 848c90a28018ec3c541ec43be59ea90328142c4705d3b59907fd89e8f6ac2758e288b1a1112fea601884c50ef7f6cf2c1634f539a76bea65a2741d3bb0e9b990 WHIRLPOOL 3183e51fb1d2b2bf5a3e8e4392cd36a7fa4c756b38a4701f9bf46cda47ede87607fc1fda11876f724c8aa4ba9adee800540ca55f014a6b44d547352792d2b02c
 EBUILD xdelta-1.1.4-r1.ebuild 888 BLAKE2B 12ee55bd518655dc769a9fd26891085a4c6fb6f800d97ccd23a1d78924c73076098a229c9f0ac272d82ef332a995a3e6803da9b589eff1224ddb9cedccffc55b SHA512 c40d4253bf9b226fd2a5f863170ecbc53a0bef5590aa5d5f3a88305958367bd97c042d0efdf0a9f95dc65d0351ebd271bfc5ea994d20bddaa896fdbc0f5d31c8
-EBUILD xdelta-3.0.11.ebuild 883 BLAKE2B c31d574f44a2da2651eac9ed5f92e9279b7f0bfe6cc23dbed05fd79fb7a26072d90a30a8f548522164f0c7da7ddff7d4b848f08d3406485c1cfc17fbc6202d8e SHA512 98acfb3f087ba266531c6fc6928f0cd652c8b1747a6235ab578a45f539bc59758a1242eb118e70f106647ce5178d6d25641f4c11e10651e84d34df78418de49e
-EBUILD xdelta-3.1.0.ebuild 1155 BLAKE2B 1733ae481e2b67707bba4dc7816aee90f5e47d29a8b22d71ee4a4fb4f06667d8f4b20ba65ce562db12e5cb9e3b4a144465ad47a8a31beef25aa058ec1e23e4b6 SHA512 94fed6fbd47e2a3449b321c9c44e1723ef40b4c258f7e8d044f8dc0c4876277aea642b7718e6960df8db69a1bf02a6e1c18a83710c25415ba656d7db704db37e
+EBUILD xdelta-3.0.11.ebuild 862 BLAKE2B a151c595a7422c0d90386ccce7094ce244f4c4c268550a4b2905a6e5cab9dddb6a5e1c1fac16e5d1b86155101393fc91eb46585177ff137863f8a0c9ab5a7d1d SHA512 6d408819074a0c469a5400bb9d6efac06db1da7b5730340aac61a29c3eb8d0c8b902e6c547090beaef54f4caa3fb41453bea1c985b8bc0a644bd9c0a00352a0e
+EBUILD xdelta-3.1.0.ebuild 1134 BLAKE2B 26ad2f326edca11f9da317de66aa45278fd6bd9db99567695b405af244ebc1940dece6ff0d5d766f83bea901df5f4151940f3bf57c4eb7eeed5bee7864f308c2 SHA512 5e38e5fd5548ac6aa9eb2aab8c81539f99e7e1fc4940019888354dd78c769ef6be8ac7e38b624b4c95acf1d45d532ab58ffb7d92f3e0b60f2d1b9d73cea1d0e6
 MISC metadata.xml 381 BLAKE2B 1e67843f342c5d64a78b0ec5f6b20cb6c091f020be78355e83cc5ab8d53312fa97e025d9f819e73fd0c4fe936d15bf87600835bcf2d9040ba67dc740d270d2cf SHA512 2c439c35f726e18396d3a0f2e923cf2f2d0eb7a9798907fd0f039dddcc9fdbac95d6e89d113fc8a937ceb260c90901e0657ecdea2f0bf423ca9456627b2912d3
diff --git a/dev-util/xdelta/xdelta-3.0.11.ebuild b/dev-util/xdelta/xdelta-3.0.11.ebuild
index 9aec8203f46c..2f2e7eb8bc51 100644
--- a/dev-util/xdelta/xdelta-3.0.11.ebuild
+++ b/dev-util/xdelta/xdelta-3.0.11.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 MY_P=xdelta3-${PV}
 
-DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
 HOMEPAGE="http://xdelta.org/"
 SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"
 
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index b9ae9918aa94..a3f444acd4c2 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -9,7 +9,7 @@ inherit autotools python-any-r1
 
 MY_P=xdelta3-${PV}
 
-DESCRIPTION="a binary diff and differential compression tools. VCDIFF (RFC 3284) delta compression"
+DESCRIPTION="Computes changes between binary or text files and creates deltas"
 HOMEPAGE="http://xdelta.org/"
 SRC_URI="https://github.com/jmacd/xdelta-gpl/releases/download/v${PV}/${MY_P}.tar.gz"