40 files changed, 384 insertions, 364 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index fbc3e2105d8a..1ed1d8cef37b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 5d09ff4e3bfa..4ae03c746651 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -3,7 +3,7 @@ DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef
 DIST aruba-0.7.4.gem 91648 BLAKE2B 6a71fc740bcaee845271f82f7ab36a9205df796aebcd1502466e65690f978a090df7e13ebec5d172d4562adf5c5fbbb7b68606511f704abb8371989eb0fc4b96 SHA512 f36f50b629a039c894b5a5e7e21dd37db2dacd0947c7288e254666110baa81975e1f2c0372fc20b915cdc6906715bbc10e0b078d3321c9d7c875da4b097de118
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 49e63ad8ed9196041efbe06952b08b527cc2d1333c563ad6ac265e974f5394adc36d915a6d4f588586930e2ea37488565c3ad8d30539587ee4c9d15b31020bb2 SHA512 39cdc79403806766050da35e5904e872575378b54692547e2f53e000f8a482c9e1940d1719aae9da44d6e2854b03b06a4fec43809aeda38a73907099cc99751a
-EBUILD aruba-0.6.2-r1.ebuild 977 BLAKE2B 8c48666fc4e01fec2ec00ff255ad8c13e5f38a6758fee72d3299a87278c92f8cbb2947c2b1232ff3a47025fdb354130aa2975e50412ab365367483a4a4db8614 SHA512 acfcfb82293eaf35a1f0c349edce7ba1beb61c6cf1928813abd2700ee72a4ac9322330d35f2c0af30699193267f57b6f484d51e753974360e5d00c5f2ddb4f0f
+EBUILD aruba-0.6.2-r1.ebuild 982 BLAKE2B 7839b281c45698aff3ef137eea8036c56c535bf4f6585b387cd0db24f64a7ac7c951bc14fec294e8657db19e70055c1b9c04f6b36d487b83e1e7bdd39350b979 SHA512 b667c836becb888223fac9f30a5dd858501270995aa3e71cb77306c43051309b0114c6c56c152ceab70be1ca6c0b13c4dce99ff9f9189f0efceb61e49c8e371e
 EBUILD aruba-0.6.2.ebuild 992 BLAKE2B cc346c563facc83dfe092932401ac736c44b45a1cb35a58c256808a9487c667e05c4bd451c5c10e6eff1a254e0a9c110d0156e6509e4a62ad5e0d91bd2add6e2 SHA512 859b7b7a1da19ad4687c8362a4fbc0964063f1d5b2fae8b209604add856e974e3b8c6f17627d98a2307c79bf526876223cf2f90f984ea7983352922d0c3529a5
 EBUILD aruba-0.7.4.ebuild 1305 BLAKE2B 8b0a11f7586caf45f615b06fe75f546e04724f15588098ab32d177debb4cbf1a409bdfae016a865963fe2d920e6e8d5a32e7f2dd6a1c41507facd33d88833148 SHA512 a3922e5b3550e7b93582b5fea463f68a0064a9e4e2e56950d9f52720a019f663e0163c8acea68ea5fbe0c48ef615e1124cda8c566affce80e122fc7551f9f694
 EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B bb7465c5483d989737a710dd8f5d357ddbcbff4b4fcf034c9011374df56d7af85c7407308084136719d6402bb9446c1b8e69d425a18556d024cac0dc95e9666c SHA512 d91882d6e4629d2e8e686e5f6393065e19d8bba990baac4e40234350779037689e3bbee8dccfe189520f5697e1879e07f4fd2d4e5d0fd8dd976c962875a9cfcd
diff --git a/dev-util/aruba/aruba-0.6.2-r1.ebuild b/dev-util/aruba/aruba-0.6.2-r1.ebuild
index c3262a713d49..401f08f63a8c 100644
--- a/dev-util/aruba/aruba-0.6.2-r1.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 7356933040d8..6500c174bf2a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,5 +20,5 @@ DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e
 EBUILD cmake-3.10.0.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
 EBUILD cmake-3.10.1.ebuild 5926 BLAKE2B e07e829c1eaacae57d42ce18f9791b900e6bccbc41fdb5a9560b1ade989d39dd8e646b6fca5ce1e4428ed6f62a6b732e9c8eec7834f2cdc9097000fa7679199d SHA512 85d7e302aed0b5ea85828810f61b762b8d2b4a9e04c58e2feea389b5407210b625e4f01b9e36df336e1d2a4ba2068bceb54f7a2ad562dd7ee4ba4f30ab7802fc
 EBUILD cmake-3.8.2.ebuild 5714 BLAKE2B 3043b071ed597f37a7a07d9613e5010031d64be5849443dec86ba96892d7afd96c6c8b6a210964fa909da360e1ada9bdef47d82f61ac62ac7812455785af1bee SHA512 951eb5e34e58de94697a01c91f45b43f8d1045cef4eb3d9fa3fa9c8a0c36ce66f4f8656cc2e16b3d62d56cf59d4e59af17ab6972ddca87c9e14821b2703fde4c
-EBUILD cmake-3.9.6.ebuild 5970 BLAKE2B d584414aea4d341fe1094cb8db94a82ebc0a6a0e5dd9d465fc4c9c4710f1d70fb6a6408d3ac492570eb369d029db5631c684ad0950ddd3e272d6fbdbf6f525d7 SHA512 5713177f82121c27f8703b523bf6db833554ff10fbdc907e5e2767b6297eecb32d7a7859777ebd8d39a64fc28fd281ee50cd4977bb0b6a2cbb99b8e862abd3d3
+EBUILD cmake-3.9.6.ebuild 5968 BLAKE2B c5ac770df5d5d85600e6d3c953f96715ad82984cd6a2b35e0b065fa5173a3b4c00c36a0b4ee3e1324f5b17d030b9691e2ed8fac38bbd7b1e8f43404d5a80f8f3 SHA512 d81890c84e0c37a0b6b8fd28bcccb38815acf35590324a0066ee92f5707a1a034caf16c7d53bfb8080419b76340862b51639ae9b15ab1e5365cb9cf7625b516f
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.9.6.ebuild b/dev-util/cmake/cmake-3.9.6.ebuild
index b0e1849c4aac..89c535fca38a 100644
--- a/dev-util/cmake/cmake-3.9.6.ebuild
+++ b/dev-util/cmake/cmake-3.9.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs server system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index faffb9d5c703..02a353a02f1a 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
 DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
-EBUILD cucumber-core-1.5.0.ebuild 719 BLAKE2B cb58213480c89fd2462fdc003298601d6326978fd40d0baec0e35332d007502175ba467e6e1baca0a63e8a6c5130012553b2022fe967a009a95ef907748c5fb4 SHA512 3b0be5d347822a5f6dd951762bdc2930805a0b21cdc49029adf2a821e51617d43a66308338ee48bde38d14c3231d3931fd406be727e32460c36012c62984df45
+EBUILD cucumber-core-1.5.0.ebuild 724 BLAKE2B 41c92e5eabe95f7589d6c30e6b0fd2f748ddee17347d566b15bb05fb81e2cb6c463a9956bd03e0ac53794c13679e1df84ce1319ae9ada2f8c24a30e7c3f4bee7 SHA512 28435ec6302a732d8a615e9ae7d24038b223313737421863ee35019b2dd6859971586cdac40011651021d39616dea82922a3e02fe972586fac1f10ece77fb0c2
 EBUILD cucumber-core-3.0.0.ebuild 779 BLAKE2B 15fa9d7591182c420bcb4be5234531849646fcb86cb04385a647f2501ffa1ac17203e9ac63ad26076a6eaeb44b77eb5eaa3ca9f7d7a441a06a791c1cb6218df2 SHA512 8de0205309a0aeb31c206458ae7dc161622c313eb5e8993417e552bc0ef16934769a9769b434c16ee3cad0571707fbed0a9355d897fdf0f4e55694f6ce16fc3e
 EBUILD cucumber-core-3.1.0.ebuild 900 BLAKE2B e03b278e6a39d3c188123ef3c1a67d681581355b75ed6bceaba5de4c7c3687b985e3d3836f8ab85ceebb0613524e43297c36db98828e736ddc88bf5b3b276c8c SHA512 021ad5f6294383d136abaef2f25bb534474da77251d874da7b52a6abd44d5a6f4585ced131401d089fbe4b1ef811d206dd68d85d5a0f39639a2dadd9559f4ea5
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
index b638c24876b3..5f4e71fbd36c 100644
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 48e56176c43d..e76a1736170d 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,3 +1,3 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1.ebuild 508 BLAKE2B 1a15120b94a1b61494c21be20b56034e5d3c626611428855337b33ef087fa06c61a00f62fdbe008be6c4e27b95a537e859faa9e732261efde2c1b2657729f3d3 SHA512 a4a40ef95ca5ef1127aeb6cb4c051404b0dd379773c266d95ca97d2e42a85e6fc9edfd601b10f53a1348a6a36f4e317e778c3713195bb57a57b00491564639cd
+EBUILD cucumber-wire-0.0.1.ebuild 513 BLAKE2B 391632a3120776dd2d7493511b6f90dbbfc65c083afea41ea5edc02758863b8b553bd2648c6b47dd40000d433051e16b01976473ded3a420771b793b8216e39a SHA512 4cb05d0efcfab0f01058a76aedba7359ff2e301f6c797ae4768589cdd113065f6fd3ac307b7fe8cf31ccef78c9ade403127462f356468e844d0fad961f1df505
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
index c1af554e86c4..a173add95ac5 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 600ae0290d35..b38d1a5e4ff8 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,9 +1,7 @@
 DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87facb652d0cc17be3c7cfac5e38ee3558d06cbfe4167fb27f32a07eba92e9836100b236ed604c897c8af89349230 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
-DIST cucumber-3.0.1.gem 265216 BLAKE2B 5bf7e2e28f268dde043a5b24ec18cac7ff1e00443d0aa80acb9ade5419c94c3854bfb58c24a88d7db7d9a00aa6576c5a2ff46c1092cd89629d73c6ed6f3c83ba SHA512 eee664d13dca5ce062f46a5d544ff43fc99bdc2ccd7c6d77d82380d8eb3c97a88305ba5a6052bfc8cee7fc59aa9d019116ef966d394b8b3d37d10fca122a2e7b
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 EBUILD cucumber-1.3.20-r1.ebuild 2172 BLAKE2B c77fe5c6d6f6fee2edbf04758c1dacad34a7366d3b3c6db97b0c9c0ae08e1b05f12397db76f86cc2dac3c2f3ef5f46d779ef9d7e8051801b2cf425a75fbcba5e SHA512 b0fa2c24c9cb0ba916e9339f904a567562ab0d22337bfc0e92fcc0c28ab386780c689b5aeb5fa5bdb8fa8fb6054866d1f89573ebc0c20206dccc6dfebad8f28e
-EBUILD cucumber-2.4.0-r1.ebuild 2443 BLAKE2B 8a9743e011c5a6d4cc53f033284c0e764374fe10651dc11db899c575fc967564488d8e51f2dce8491e739942bc8f6ace4c37c1ead22654580c4494cada7ebc0d SHA512 61bd9f286c80a004d5cef046f4d510302563864712e3a70409ab8d998b31c5c0331795887b5020e58e645cf924706de31a51c6bdfe1d1186c4e5a4d124efb53d
-EBUILD cucumber-3.0.1.ebuild 2462 BLAKE2B 1da85d20495b7ed10cbacb2eb96c557aff56d95375c78458e98e5b549f5274f96050d0486c3639f37ada9f09b8d7a3934a767d54822bf53d97eb685fab21230d SHA512 781b54a7757bb5ebf95b91a81b97ff6236234f9f1bb7cf93cb36187c31dace53ef9409a4ce07556bb86fa1a83ef91f235053355e6543a9e51b4beb4dcc162d1f
-EBUILD cucumber-3.0.2.ebuild 2607 BLAKE2B 41708899dd89fdb08e9b5fa278e98453bef068bee4182d624de91bd8f83d99d93208c9631671102dd746e344dbc25f94ce9e75c7822586650c1565557d31099d SHA512 a81658edb50692c31ad7ea53b60db33108fc77cc31862d4b030d536d4fa5d4a885f7653e99f32fc9cb52b31cc46335057b45df4934c2406b58fa76d012624fa5
+EBUILD cucumber-2.4.0-r1.ebuild 2464 BLAKE2B dacfd4540ad642ff74ee7454b4d977250031cc8878ddac2ff6b359a9f7b78415b3771b71558554cc542c662c185ca010bd0cb819e31044b96995281b59f1d345 SHA512 5fed5eb20feaba66a5d000610a5f09b51bc7ec5654b68353b9da57395ed9aeca11c6385c43f0ad5923628de80e7a23aca19e2ec04cc4802f548aaf7a93f2a051
+EBUILD cucumber-3.0.2.ebuild 2624 BLAKE2B ce43a39f1b111e12fb0d0abf7505fd3821db8d33a6635a4a6c18fdf2df91f15caf32cc30b3bfc17388a6f35ea446d77187ddc46d5914ec18744d02639228dac9 SHA512 100846cdbed64964240dd750272a3316df3d16d5758cec396875e93fba8a747714d05a0e07bec599e7d3e4355232cf9eb571938f40b07627c48af668e73f122b
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index e2c35e97529b..b49386fcf48c 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ia64 ~ppc ~ppc64 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
@@ -63,8 +63,7 @@ all_ruby_prepare() {
 	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
 		-e '/git ls-files/d' cucumber.gemspec || die
 
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
 }
 
 each_ruby_prepare() {
diff --git a/dev-util/cucumber/cucumber-3.0.1.ebuild b/dev-util/cucumber/cucumber-3.0.1.ebuild
deleted file mode 100644
index 2e2eea3c6d2d..000000000000
--- a/dev-util/cucumber/cucumber-3.0.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.0
-	dev-util/cucumber-expressions:4.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.1.3
-	dev-ruby/gherkin:4
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2.ebuild
index 4b4428203cf5..70e3c8c04bc0 100644
--- a/dev-util/cucumber/cucumber-3.0.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2.ebuild
@@ -64,7 +64,7 @@ all_ruby_prepare() {
 	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
 		-e '/git ls-files/d' cucumber.gemspec || die
 
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
 
 	rm -f Gemfile.lock || die
 }
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index d368cc978e2e..85e71f44cd81 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,7 @@
 DIST eric6-17.09.tar.gz 18914614 BLAKE2B 9be00468b88a46dedb3075f28f7863e31ca8dad8cd783219bef50c644c8d6dfd3558654c8377cec2f7dd1818a3647ae19ca5028c9939c2e0095df83ce9aa5889 SHA512 73631ff1faef01b51a640af13dbb3adabebc63280f15b5e594e1fcbfb799a40a8e7ecb7395c52c6878b1fa232d7c00fb531a24be9f89a3592602aeb10520737d
 DIST eric6-17.11.tar.gz 18984264 BLAKE2B 974443ae81195c8bd56d7240f4143c5316c5192ca3bb528a97c777de2407677d9bb5fbc7099812db6c9f766e8d2a3dedc53a0a75841c6b4958cd4fd6f444f5e4 SHA512 e95941805d44f01de67d5f256f822a829bd224841a7f2b0bd245e7388b96a5eb94ab34004720c05a355fbeeb30ed4a521e07ea7069441fe6a90c13ff8cf853f8
-EBUILD eric-17.09.ebuild 1697 BLAKE2B 71e8977630c2933563aa130553bac080889b53f35048435e2d5c009847a2f4828336efc85a3c3e55ddf999c8c92113f3800dd2c3c416ed4646c17f7454447924 SHA512 1c3c7a39cbc8bb66b010f55faa526bb042c39364fe6b505cc696e927a78447f840bc615705849f2c6eef83393b88d911c86be7ceb170eab767dbe00bf9b7c42d
-EBUILD eric-17.11.ebuild 1681 BLAKE2B d5c9f711d912739319003ade15ab2834c47e7d2f9aa572376f4482a08d8d58613b8d2f59313709692f607bd553eae6ec5078ae1a4603dc01863bdf55028a13e5 SHA512 18f269ff22da039493cc6755cbea1ae6e31d1b49e37f82dfd73e75ed3cf2f04155e05acc9bdc6efe4fd50a7c27b364a84f82721329643a568a8f8625ce02050f
+DIST eric6-17.12.tar.gz 19035763 BLAKE2B e19195ef0b36ce216dc4f21ec221da4002a20ee3e3e300b80045d31d8793df299c2224f41f562fb59a0f8a65ead4f616df89a905905918dd1ae396d55d77fdc3 SHA512 7144c1fad76eb0f3ccdd2a29fb3fc369ad35d28dfbae1e6b75855b85218df34afa715f3a2df37bd6163e2f3a23a2a9a7f528cfe54f1bc21486ab81da6a69a697
+EBUILD eric-17.09.ebuild 1698 BLAKE2B a7ac48e345d809970e657b4767546d99a0eddbc6e724f60f719aded37e195c8e1d4c32805bcce9941125850f5c1c253c562ceccb03a4226413e2fb2af719bc88 SHA512 b63ecc2febb62d6275b9b8623d1290043a04f346ca8cb4ba901a2b945f1dc0c2f71863de3481831873187a4c79b725c0aa4f1b09c2e9e1ce3c11a6adb7121b21
+EBUILD eric-17.11.ebuild 1682 BLAKE2B 977577a41c48eb61a076ae654ba2dcae231a00f3f7a0bee6702206ddaae13385da806b9573c059b8f3933d8d3cc68dc051cb438d4a4cea11bee1fb760f1fef89 SHA512 e195e9ed5e8f177a1b8e465a761935e873248723300577b8ddd97e2a875ee0fe9e00781f5dcc011c463597e096ffffcc9595bceeba0aa15d87e3434c416541c9
+EBUILD eric-17.12.ebuild 1909 BLAKE2B fb202adc255b06439102de715e2c9b5ce287547080e411e5a4c0988d9f21fd84b9e7fe13294def845c5646d7933a432fcc03b5b799301eebe22d75ee9f00c955 SHA512 a9d86dc7b50075b4e4ffdcb0e9640b6e5d5415bc27e2f4296f333773803b0a3c8b901f60102269b644f58647e7bc51356f714acf921325751172949dc41e46d3
 MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-17.09.ebuild b/dev-util/eric/eric-17.09.ebuild
index 02c5b8f9d387..5dfde4d00d11 100644
--- a/dev-util/eric/eric-17.09.ebuild
+++ b/dev-util/eric/eric-17.09.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite,xml"
 inherit python-single-r1
 
 DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
+HOMEPAGE="https://eric-ide.python-projects.org/"
 LICENSE="GPL-3"
 SLOT="6"
 
diff --git a/dev-util/eric/eric-17.11.ebuild b/dev-util/eric/eric-17.11.ebuild
index 6d5d56d78f52..16a7d18251b5 100644
--- a/dev-util/eric/eric-17.11.ebuild
+++ b/dev-util/eric/eric-17.11.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="sqlite,xml"
 inherit python-single-r1
 
 DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
-HOMEPAGE="http://eric-ide.python-projects.org/"
+HOMEPAGE="https://eric-ide.python-projects.org/"
 LICENSE="GPL-3"
 SLOT="6"
 
diff --git a/dev-util/eric/eric-17.12.ebuild b/dev-util/eric/eric-17.12.ebuild
new file mode 100644
index 000000000000..1f4209d6daa1
--- /dev/null
+++ b/dev-util/eric/eric-17.12.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=${PN}6-${PV}
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_REQ_USE="sqlite,xml"
+inherit python-single-r1 xdg-utils
+
+DESCRIPTION="A full featured Python IDE using PyQt and QScintilla"
+HOMEPAGE="https://eric-ide.python-projects.org/"
+SRC_URI="mirror://sourceforge/eric-ide/${PN}6/stable/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="6"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="
+	${PYTHON_DEPS}
+	>=dev-python/sip-4.14.3[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},gui,network,printsupport,sql,svg,widgets]
+	>=dev-python/qscintilla-python-2.9.4-r1[${PYTHON_USEDEP},qt5]
+"
+RDEPEND="${DEPEND}
+	|| (
+		dev-python/PyQt5[${PYTHON_USEDEP},help,webkit]
+		dev-python/PyQt5[${PYTHON_USEDEP},help,webengine]
+	)
+	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.2.0[${PYTHON_USEDEP}]
+	!dev-util/eric:4
+	!dev-util/eric:5
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( changelog README.rst THANKS )
+
+src_prepare() {
+	default
+
+	# Delete internal copies of dev-python/chardet and dev-python/pygments
+	rm -fr eric/ThirdParty/{CharDet,Pygments} || die
+
+	# Delete internal copy of dev-python/coverage
+	rm -fr eric/DebugClients/Python{,3}/coverage || die
+	sed -i -e 's/from DebugClients\.Python3\?\.coverage/from coverage/' \
+		$(grep -lr 'from DebugClients\.Python3\?\.coverage' .) || die
+}
+
+src_install() {
+	"${PYTHON}" install.py \
+		-b "${EPREFIX}/usr/bin" \
+		-d "$(python_get_sitedir)" \
+		-i "${D}" \
+		-c \
+		-z \
+		|| die
+
+	python_optimize
+	einstalldocs
+}
+
+pkg_postinst(){
+	xdg_desktop_database_update
+
+	if ! has_version dev-python/enchant; then
+		elog "You might want to install dev-python/pyenchant"
+		elog "for spell checking."
+	fi
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/dev-util/idea-ultimate/Manifest b/dev-util/idea-ultimate/Manifest
index 4938b729c5d1..49e359df5f3d 100644
--- a/dev-util/idea-ultimate/Manifest
+++ b/dev-util/idea-ultimate/Manifest
@@ -1,3 +1,7 @@
-DIST ideaIU-172.3757.52.tar.gz 625753104 BLAKE2B 5b29df72b66451efc79586d3f61b0efe8c4ab87dfb23a133213f4046eedaf01bcf8f2ea7975d407649bf30ec9155225c75c1cca4165c0c68835a1b306d14cabf SHA512 dd730a34f141f345f0af8fb7ee32c1e7a98ec54dcb5df5a644b49e94b7a6d2eb8b6a134ad3d77010e408299b71137b8bd578d3563200762144a747747bf28c0f
-EBUILD idea-ultimate-2017.2.2.172.3757.52.ebuild 2339 BLAKE2B a4b69179e6a87fb78774b481f2efca4ee8f04d454073efabd35e069c45864ef9757b5e7c245d89d568ea6caa6f781f48c54d36d91fbbdac4c4e3d4901fe22449 SHA512 40c6af842f8f3bc155e9084fc886234a4accdb725d5f04f0809b7fbec710c4b99e110a015e9f67b986da0bc04573a85f75d9694f08fb5ef494d1183a251aede3
+DIST ideaIU-173.3942.27-no-jdk.tar.gz 562044023 BLAKE2B 57da196682db817b175158b9c9913502490c2a692153e5e5b8a4449958c5613469a0060f1260095e9fb70ca54b5adaf59494cd9c0f6b0cb0b9f7c25cc4571335 SHA512 9cc7e687bef5d213f37e2e24aa2464e0d3dc9a40cb683d1d8fd1438efc6ca988134509a96f558ec87960e950336e062d5161ef6cb491f9c1c572ba077dd0a990
+DIST ideaIU-173.3942.27.tar.gz 635548505 BLAKE2B e123d731b3516dee3342310b3204dce2247430e81240e4dc729b23146887fef552001bee9aad7528d46c0717654507f16b505f76baf8407609cb9cca7aa9d773 SHA512 1f3586bc2082feec5b986298334445c7b91318f6d5f3d71fe6bfbb1546a63bb33e2bc978ef5fc4438e13d2a3d1dd5abc96fdd4ea5659f64563afbdd3410df8b4
+DIST ideaIU-173.4127.17-no-jdk.tar.gz 562765679 BLAKE2B 7d287c2723646b4fa541c314099cee96242c058cd67811ec1633737ce33e90678504d0d0b9af1cf1279dbf7281fb87ec9c2723bdb926d554f5a1f0793e13867c SHA512 a3c0afa388705158f431064223f42a7b0daacaa928ef9bc68df1cd5ace542f22c3648620d56478896f663688ea1bf773dc04d8d0ab962d195ace7b057708a272
+DIST ideaIU-173.4127.17.tar.gz 636265697 BLAKE2B b01efe844375b009c03474df362d2a208008a47e14696e816ded1573f591a777e23db393838c8592277d68817b3d7ebd714bb79445cd0cf0653da3d575af5bf2 SHA512 e05dd3986f77d39bb48f12ac6af5ab76d9c67b3502772c2bc16c16f922c90a3e6b8adb24537eb37defea2e3488968a6dff343eeabf4c6c78740895c8ec7c93fd
+EBUILD idea-ultimate-2017.3.1.173.3942.27.ebuild 2625 BLAKE2B fde443d28a0df190be9ee6f0b7132d58ce92f1575a0481e8b1bd1dc995f5051fc85080a0a5fbab5747d4d21672e20a1ec7b7653da6c01d937e3642e782e90716 SHA512 b33c3d98f40f96806f33b1705144ac9c6cec0eb8b90f18b7f63c49a7a6e9f4c9bfa1623adddd063c036eaa7b96f361937c4c15f4b319e1266cba8b910b73f2b2
+EBUILD idea-ultimate-2017.3.2.173.4127.17_pre.ebuild 2625 BLAKE2B fde443d28a0df190be9ee6f0b7132d58ce92f1575a0481e8b1bd1dc995f5051fc85080a0a5fbab5747d4d21672e20a1ec7b7653da6c01d937e3642e782e90716 SHA512 b33c3d98f40f96806f33b1705144ac9c6cec0eb8b90f18b7f63c49a7a6e9f4c9bfa1623adddd063c036eaa7b96f361937c4c15f4b319e1266cba8b910b73f2b2
 MISC metadata.xml 535 BLAKE2B 60d09c4839b751d9c6a7ea683ea541ca962d6360bb96526075ff4cc941796cb5ca082834dc81926133533c96b791ba57257c09c4caead13775079242df717b54 SHA512 a01da16279cb79d0b6a0b806bdf78f1030877ab491de95461c5d27ee6c1c8565a580cba03dcbed836e438be9c7a94ea5958c91383cce1e40398622435f86bfe8
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
index 088e87ce25bb..6a53389fc5c9 100644
--- a/dev-util/idea-ultimate/idea-ultimate-2017.2.2.172.3757.52.ebuild
+++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.1.173.3942.27.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils versionator
 
 SLOT="0"
@@ -14,11 +14,17 @@ if [[ "$(get_version_component_range 7)x" = "prex" ]]
 then
 	# upstream EAP
 	KEYWORDS=""
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz"
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
+	"
 else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz"
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
+	"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
@@ -37,6 +43,7 @@ S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 src_prepare() {
+	eapply_user
 	if ! use amd64; then
 		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
 	fi
diff --git a/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
new file mode 100644
index 000000000000..6a53389fc5c9
--- /dev/null
+++ b/dev-util/idea-ultimate/idea-ultimate-2017.3.2.173.4127.17_pre.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${PV_STRING}.tar.gz )
+	"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="
+	!custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IU-${PV_STRING}-no-jdk.tar.gz )
+	custom-jdk? ( https://download-cf.jetbrains.com/idea/${MY_PN}IU-${MY_PV}.tar.gz -> ${MY_PN}IU-${PV_STRING}.tar.gz )
+	"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+IUSE="-custom-jdk"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IU-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	eapply_user
+	if ! use amd64; then
+		rm -r plugins/tfsIntegration/lib/native/linux/x86_64 || die
+	fi
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+		rm -r plugins/tfsIntegration/lib/native/linux/arm || die
+	fi
+	if ! use ppc; then
+		rm -r plugins/tfsIntegration/lib/native/linux/ppc || die
+	fi
+	if ! use x86; then
+		rm -r plugins/tfsIntegration/lib/native/linux/x86 || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre ]]; then
+			rm -r jre || die
+		fi
+	fi
+	rm -r plugins/tfsIntegration/lib/native/solaris || die
+	rm -r plugins/tfsIntegration/lib/native/hpux || die
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre ]]; then
+		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Ultimate" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index e5b2f9a058d3..375f6c0e01a4 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-php-5.1.2.tar.xz 678624 BLAKE2B c351adfaa6be6c6c7c6d01e13e4de04d16eb4a0184ce5657a0152d3365e4006cf8bc4d89a5ce91c77c9e31c06fd8ad2ed2fb6e5c13d965f58450508f869762a9 SHA512 c5c6fa288b048fb19597c8cd9708a2d8570c8eaab4584a1ec0808cbd65788ae15b140e8c0437a3a18c2561c078c26208597c674efb37623b5199260ed5b3f851
 DIST kdev-php-5.2.1.tar.xz 683244 BLAKE2B b0418049ac8eeda1a57c7e5a863c91feda3f84638a69d018f4d5141815ebe2f34b94fcc166632c6146c4110015e8c42069ce3c129fb8c346a36f123ae682babf SHA512 4f2a0f08ff8f341d5b65c28d7392e794a20182d5f898a6723c6a9cd34bf1ce81ed2f8e505cad5a920a6d2a2c50210b0836b7718a892b61a27e8cf6c4d7f30f52
 EBUILD kdevelop-php-5.1.2.ebuild 1143 BLAKE2B 46b646ab5e0c34d42076473b89b52c100ca133e02fd91c8049d46f1365d419f952faffe5ca7f7587a3b0e677866a781ad57f0832c3e2e800acf17774b3d425b2 SHA512 8903207ea6055a10cf174d7c45873107c02decbf149457874030b34aa3451118cac3c1423761e9deb22f483949e6a22a5b42faa4034cf69b90fb1954ce76836d
-EBUILD kdevelop-php-5.2.1.ebuild 967 BLAKE2B 4ad3239ad2f993e8db464f84ff108015107a12c2d419b12cd7ec1194ec63751a840eca1d505d499aa3d353acf2d770373a83c9ada7df2117d2eb27c50535de39 SHA512 5eadf98c425c4c3090c6778eadd954833c58df1dcd50a795b91084cc965639416562de0024c4e19699f543ffa15ebc79cf6ab8b2a51a9c6da2e9bd78e280d8ac
+EBUILD kdevelop-php-5.2.1.ebuild 1064 BLAKE2B 5bd99788e66c4fa05291f95836237301f74874417e8593a21d52725661eb7b414773a4f461f898f56740fb64f8242823a6e0a7d29c7bc5b4c6de02465355c329 SHA512 d70b4dd90c7636f5cf59054318d21b3180c95649f1da16dbe9f95542cbbaf22152b44ffc7fe72bc71cec39b6adcce75fb741a10c3d3d28745217fff20f0119a8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
index f6d4bf8fd219..8b45c88c5835 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2 LGPL-2"
 IUSE=""
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
@@ -35,6 +35,11 @@ DEPEND="
 	dev-util/kdevelop-pg-qt:5
 	dev-util/kdevelop:5
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!dev-util/kdevelop-php-docs
 "
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/kdevelop:5[test] )
+"
+
+RESTRICT+=" test"
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 21860477e39d..aa18392fc3c7 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,7 +1,5 @@
 AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
-DIST mdds-1.2.3.tar.bz2 287079 BLAKE2B 84f0a36dc7af566ba79c86695cc70de9b924de5a221041d3d721a93f40589a0bd19167e66e17d6811e2bcea8fa9ff2423b29b6fe13a9011ecf3de05f1bc99032 SHA512 e5935fd99a53df124532cfc8e46349b2ef9ca79f5f184ca2da941c9a77e66ee40e11478e520bf9cb62e1bcea4b69deab5088265e1b89fda04417130aab227c3d
 DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
-EBUILD mdds-1.2.3.ebuild 945 BLAKE2B f9c56d7135f13e59119e0bf72ce2b7c5cc8438afe3a48aa88302707c4503704a576a9bf2ed7cd9b3981fca2fed9aea1c605cba7893a3a9d1d6b6153301917717 SHA512 37843f2ad2bd96b4c4372922617a4ca67befa8b7d27977e6bdc86dd5a37bc9a65c4213a3b463648eff2d599bcf0a4f7821becd8bf8bb9cf4f8d22479cb8040e9
-EBUILD mdds-1.3.1.ebuild 948 BLAKE2B ba7eaaf8a6a0f99c575c8bae10a4e5d87633282e874e3b3227069db15abaecc0d952e1e3b375b63d2190faf23236097680567db2d1a9df6337ad5796a17a3c10 SHA512 cb27659a68a6fc71b2ccb56174196eb17089211d6ea7e947b7062c9a0ae91979b712d1dbd4cadfecc487f4a31046bdb69a2621affb8a541eecdf4621819980a1
-EBUILD mdds-9999.ebuild 963 BLAKE2B 7a08f3367a54b451b33a648c89f44779588d8b241f4df6b9a23e7f1828219a8837391df471b3f516616113444f0a77726324a31ce1f61e9a61dea6bde4ef6369 SHA512 30fc4b8185294db0dc04c3194259961976a48f7ef13944015f5f85b68076bd959f4674513366ec5c8b138c53cd43ed46d8d213701c7dea36bf87d26532cb7569
+EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
+EBUILD mdds-9999.ebuild 996 BLAKE2B e1ca3357c730601129ef9e698d6d200152dc29e99b1198e4e9b5de556e228e741829c0e8c25abbecc5bf8cb7fbf2b10e0d25a24ab6b25c0dcd2b88f42821daf9 SHA512 39a037513bffeeac8931380b00f46a151b930c50dedc81b5d27c960a0448e123505ae50d5e399bd514ac695af0187a4b93d826bc766bb608b53013e3b5291185
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/mdds-1.2.3.ebuild b/dev-util/mdds/mdds-1.2.3.ebuild
deleted file mode 100644
index 049fdba59a09..000000000000
--- a/dev-util/mdds/mdds-1.2.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
-
-DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
-HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="1/${PV%.*}"
-IUSE="valgrind"
-
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
-
-src_prepare(){
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# docs require dev-python/breathe etc., bug #602026
-	econf \
-		--disable-docs \
-		$(use_enable valgrind memory_tests)
-}
-
-src_compile() { :; }
-
-src_test() {
-	tc-export CXX
-	default
-}
diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
index a1634f386055..1473b988ea99 100644
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ b/dev-util/mdds/mdds-1.3.1.ebuild
@@ -17,10 +17,12 @@ SLOT="1/1.2"
 IUSE="valgrind"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	valgrind? ( dev-util/valgrind )
+"
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
 
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 4f81092bb113..8059254bb67f 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -25,6 +25,7 @@ DEPEND="${RDEPEND}
 		app-doc/doxygen
 		dev-python/sphinx
 	)
+	valgrind? ( dev-util/valgrind )
 "
 
 PATCHES=( "${FILESDIR}/${PN}-1.2.3-buildsystem.patch" )
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 6a3a6b4df15a..f0b93e4e3094 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -3,10 +3,10 @@ DIST meson-0.42.0.tar.gz 1042920 BLAKE2B 8d537abcb641a033e228bf93401345ee4c493ba
 DIST meson-0.42.1.tar.gz 1044883 BLAKE2B 23a3df2b294a59bf6a5ad355afe448f2a96c638cb6ae3529bc1925aca841b3c02e698db9b238fd902ce2acbd1fc232e94a2100ea6f7a4aed4d8eb11a10ad84c4 SHA512 43dc72ea4aa697c0dea6cef57308f487814fb6cf2a4a2338b658172a43603924122ed892c707eb6b974db72f86d767aac23a7397b97270cfe2032d2e6a68911d
 DIST meson-0.43.0.tar.gz 1066663 BLAKE2B caf96bcc1b5a3b538b2cbb9edd40221a7b826cf06034db3cfe1a9cf941ff2ebe8d6864a4bdad53f1b6678557cdf75dbb45fd9fa49848a9824ac65a42b14bb528 SHA512 17f7e7f87c344ae0a2f53975c65ef3b4eae204a57eb97141aedb4edf65aa21af29a6f61e3870022efd2d126ce768602fbb894ec7d919875dd44ccdb39a5df044
 DIST meson-0.44.0.tar.gz 1102630 BLAKE2B 8365c54ea0ebc72685f4c98966bead90b5c44d761a92e00c5d4801aa83fa6bdeb8386c12e0214ac6a7582a2603649e344c5447a989f7de07ad396e5d5646c6d4 SHA512 32312842bef6d15a73abb250972df29212ae495eb13f9ddf50f300974a42c679c51d34af560b430ef5465f8353d9f98e91a90e749590584968da766ad75ae989
-EBUILD meson-0.41.2.ebuild 791 BLAKE2B 22c49cae20ffc107eb013b7d5d35e94f4b9be84cc21f927d39b6815732b733420367ca2c4541985eae8168afb35b6f9b6572bd86bdd91c2f62e2704ff8fc90d0 SHA512 de61068488e5457c1f03a330d17f08dabe49cd36f65588046df272e52039ca816bb85b5f11a2f6576fc74aae1a76fd84328ceffad561622803a5965e14fe89e5
-EBUILD meson-0.42.0.ebuild 799 BLAKE2B 4d4a448f0ba298d4cafc2e9c68dda13d3605ca9913901be2602600d2502f6b2dd316d03d2e4b5d9be3a7747414e79e939254d3469fe51e585769eaf1df743c6f SHA512 186dbe35a63021389ed94bf8ed24b23181477006dcccc6cd7117031e05bf31637064e27238bb201e6ea72cef2eedcfa3434831be5b6a974a579d2da9f1337f53
-EBUILD meson-0.42.1.ebuild 799 BLAKE2B 4d4a448f0ba298d4cafc2e9c68dda13d3605ca9913901be2602600d2502f6b2dd316d03d2e4b5d9be3a7747414e79e939254d3469fe51e585769eaf1df743c6f SHA512 186dbe35a63021389ed94bf8ed24b23181477006dcccc6cd7117031e05bf31637064e27238bb201e6ea72cef2eedcfa3434831be5b6a974a579d2da9f1337f53
-EBUILD meson-0.43.0.ebuild 792 BLAKE2B ca2b473813c312a96e69a0803b3366cfd9f89516637498e8feca999c240bce22213d1346d73a3f9156f99d3e8dcc9cf4e8d7ab5c487bf0ee2df12f36749d4f2d SHA512 177c4299767cde14463fdb4232b7e159b1d8b6aeb7738299cdf7c6d50573145daa750d89131bbd931c06c46e77bbf8330bb75348693159a89fff1586833596b9
-EBUILD meson-0.44.0.ebuild 877 BLAKE2B 1eed9943bbad7912de4a3f22da51c39f6594fed035ff2f058e6ce3d121fb19d27dd23efac5a64f3fb730833aaeefc10e72523e4d6b92f717c5672b348b338c6d SHA512 b9e7196035c105064d667b89919343f2d8af203b404d299189710d96ea6dfd924a8aad00af1b0153e0f63ad44f3796c57502dcd75cc4dd260fb70b507b547522
+EBUILD meson-0.41.2.ebuild 797 BLAKE2B 8d070beaa894b2a3c4c96fa1dd538ec6e32bf62913d12c8a391f93cc82f920c0272521c6bf62ca91dccd206fdea6dc599cf92b9eeef0b15896901dbc1980bc0c SHA512 e713577c98de00817deb4854f845d2dfffe0df0c3cf8a0b994842ffcbaaa6a16fc78d1751aef89e3cf6873b01c2a350a75ce85a62b700224a8bbe46324edae69
+EBUILD meson-0.42.0.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
+EBUILD meson-0.42.1.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
+EBUILD meson-0.43.0.ebuild 798 BLAKE2B 2696dae59c445e29d0538d6a8cb9656647f3931f8047fe95e6af1c06ea8797ebbe22748fe2ffffc31dbdeb7e152dde1c87bdd4ebd6f49bcbc3c7b02953ae8562 SHA512 89385f25f16ac8d9b289618eb313c9a4d6e44c11ed71ce5e9da2d2f0b160accd02991ce33d412367c3597c153950ee206a5420362b295971ee2e685cf417bc05
+EBUILD meson-0.44.0.ebuild 883 BLAKE2B 6ff58ab085b6fb618685bcd7a9baee45a9d42b66a3353bb6905fb1a64e1ef8fa2fe746e1963005b2fe5be4d8f24edbc5a0517466a8111dba56fa08831ed9d0da SHA512 28dd2ac2ed97fec08b0463c32c489cb6467599715aa91b8aaa5316aa5d3b7047c5055b140c59f4a20e6d00d55b4112f73dfd614299e0d634899e952cedc2fc19
 EBUILD meson-9999.ebuild 792 BLAKE2B 05d42a8f579b200ad6f230c6b02fa3c4ce0d216bc6e676f7873d179e69057e5d09f52f54402df6d8a8fa65de194259a0f1669cefda2d2b0e3df66dea1cce169c SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180
 MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
diff --git a/dev-util/meson/meson-0.41.2.ebuild b/dev-util/meson/meson-0.41.2.ebuild
index 4f8853daf672..89ba3cee8fe7 100644
--- a/dev-util/meson/meson-0.41.2.ebuild
+++ b/dev-util/meson/meson-0.41.2.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.42.0.ebuild b/dev-util/meson/meson-0.42.0.ebuild
index b4d30079140a..3be15a6bccb6 100644
--- a/dev-util/meson/meson-0.42.0.ebuild
+++ b/dev-util/meson/meson-0.42.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.42.1.ebuild b/dev-util/meson/meson-0.42.1.ebuild
index b4d30079140a..3be15a6bccb6 100644
--- a/dev-util/meson/meson-0.42.1.ebuild
+++ b/dev-util/meson/meson-0.42.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.43.0.ebuild b/dev-util/meson/meson-0.43.0.ebuild
index 79db96315d69..c4fda060df24 100644
--- a/dev-util/meson/meson-0.43.0.ebuild
+++ b/dev-util/meson/meson-0.43.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-0.44.0.ebuild b/dev-util/meson/meson-0.44.0.ebuild
index 30a68a1548ea..c9d0ed682e2b 100644
--- a/dev-util/meson/meson-0.44.0.ebuild
+++ b/dev-util/meson/meson-0.44.0.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 6efccaf82b74..7fcab200b720 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -22,5 +22,6 @@ EBUILD mingw64-runtime-5.0.1.ebuild 2560 BLAKE2B caf05db1d9a9a4578c044edb30d2513
 EBUILD mingw64-runtime-5.0.2-r1.ebuild 2651 BLAKE2B e3b044350a01e75c1bc32a67ad6593b2a9cee0002ea00f7c6546a6a66d24ec45fb1d2f8cc70a62d1f07c3b347d8da7a672ced76011bab1068845cdbcd955681c SHA512 f8c0fd5cc01431016675bf3831488e5852c29d9a0621216842f72b2bef1bdc57585b98885913d7c859a4aa8de01d1294a65ff1f7bd3224c691db7208d96946fc
 EBUILD mingw64-runtime-5.0.2-r2.ebuild 2691 BLAKE2B f05cbb14202abd1c5ac32c69c872aab7ebb879f020156faf975c1c6d1df63a29b2e59d89ac2b3da2b3271962e8dc569df4f5b53ab5c153d3d4e91842c67c1284 SHA512 33615d4db2e4fe13bc0a63e3b84445392133edbac907514dc41a0bc29f82be0ce54c837bd0dfd6c1872e74f89055cdc3d2b7989f6912f3d8f37e3ffcc72b3106
 EBUILD mingw64-runtime-5.0.2.ebuild 2560 BLAKE2B caf05db1d9a9a4578c044edb30d2513d028478672c5d1258eddd8863e34c949ed5bea5a44a5a6262e89e80de58b3d298b9bd5f5c21e6d535c955675b23a7c476 SHA512 a701ebddba123544e6c1854beac891ec1104d5bc3c5dbf151d0ed3c1be7e05a13a18885d0c9f5f74cb8e5f615cf30d084692e28770a57bc749a8504a36328392
+EBUILD mingw64-runtime-5.0.3-r1.ebuild 2569 BLAKE2B 61fb453aa51120d8c6ef25b1a72d029c579e9759cef08cc1c830907924478a57e8678d20f4b00706ee0b8c242abcec244bcf25a9b24e5ef64d3a5629563d77ba SHA512 1e566d554e2808e30bc952022ad427b8aa0ff46157815eafecbeca0e52740633f55e851a2a4b0bbaa2fde52ed17f5034551895102bbf48ff97e1df2c288d1dd4
 EBUILD mingw64-runtime-5.0.3.ebuild 2533 BLAKE2B 4449ac0eb34c7861c43884328b82983f424f45dc0e1565629a5aaa75e41b894d3144841c0ec25c96b4a7cd4787a958e4b502a08a1b878c7d4f2dce8eb4aa33a3 SHA512 ec22d9a4f4bf860e35167445d521d1e7d8a193b09e334ee17fa5fbb3b8313b565e0d474e18e1e47ddd60bd0dfffdde46a337aa12749502ae550f4d7e341688a5
 MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
new file mode 100644
index 000000000000..1b9f05639b8d
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="crosscompile_opts_headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-build.patch"
+)
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use crosscompile_opts_headers-only && [[ ${CHOST} != ${CTARGET} ]]
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	CHOST=${CTARGET} econf \
+		--prefix="${EPREFIX}"/usr/${CTARGET} \
+		--includedir="${EPREFIX}"/usr/${CTARGET}/usr/include \
+		--libdir="${EPREFIX}"/usr/${CTARGET}/usr/lib \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/rats/Manifest b/dev-util/rats/Manifest
index f5f782c4fa69..9786ccfaf5ac 100644
--- a/dev-util/rats/Manifest
+++ b/dev-util/rats/Manifest
@@ -1,7 +1,4 @@
-AUX rats-2.1-add-getopt-trailing-null.patch 367 BLAKE2B 182f887fbf021a338808fdbcb6ac7d2a1185381180f171ee1a43ec5ee18a8d4eb38b7c865c36017923c55006779071314e6c372bb725f42908c76b4137666fcc SHA512 50a246a36b7d26d228d5350bbde260792ff7cfcf168038efe284d6c138d25b112f209778fbeb0b118af7c96debadddc59719d73fc373a7e5ce8d1ce3ebec6b36
-AUX rats-2.1-fix-null-pointers.patch 3600 BLAKE2B 62d67e310e4f152da93d898dbe741610852319cf798a75c6edf008de0cdea7fe2900f135162e0bc558ac2980c97c978c681daa923c612512908b2de7882f8427 SHA512 a1b332a5a436cb4e3b27b8c97f1da582c93ca783b89fc0b0523825fa9046af1916bcfa95704cc3aca3588130139eb61b8c4fd40fba3536997370065387e2e3cf
-DIST rats-2.1.tar.gz 326930 BLAKE2B 4fa47cf69ab1b04ccf42b300fc55da386a9b5ac783517ec2efcfb545aba2cf27cc1b2a11d5d0d003cc8a0a5112a0cd1183f263c77a62f280268d214bc9ce7634 SHA512 2fdb670dc9559c453a6c69ee2d411e2626c0ee4cca4b59ceda878142008e136dfd11f8265c0719383212b38b0358a9cab1a29f1cc92a986fc800dd0c46bdf0d3
+AUX rats-2.4-fix-build-system.patch 1131 BLAKE2B a9890ebe1af624e2ede486da6ede63318a7de2775028df5d37f004b575e35890cd833cfc1211196b4cc772b3fff13b6b0f76e0dd0558b781b1e54b96a9a2af4e SHA512 d56accaedbb5b0fa5961c79ee19510ddd36428d3a96b6066ffd304a3167df5cd510041f3eeee9aabfe66b71a29090a9199125d14ae6be6443b5e490e2cdeaf07
 DIST rats-2.4.tgz 393114 BLAKE2B 73dfefc42cd99420edba9ac28d56b51e058b144d9deaf9f1e322e7fe4331e16d05cff049efccd344723fe1634c3691f911dd71001671058c5912f84cfdc0bdbb SHA512 f402717fc935a2f9c2464e1623807575044258fd998cabc8f115c063141004b5978bad739021f109cbbd1abd84231155eb59671ae202aefb40e1fd6733d8ac6d
-EBUILD rats-2.1-r2.ebuild 1017 BLAKE2B 6e1547e9f646f18883117e51667097f0db7c4bd90167a83e92bad174843ab370aa792ceba9995b7f2194c9073b3f522ecd11a362798a2be7d11923e7ad5bd01e SHA512 322954d36971597725bd6c5facb436c06ccafd93df788a93ebec2b0ec92900960bf8acfeb22c180c546def22cdea0528831032079d4fa23e3e538617763b1bb6
-EBUILD rats-2.4.ebuild 1162 BLAKE2B 31665ff7671edfcd84037177801e7703e228d54c57e3048d8b8033476ce56d28afe507caedf22bf798d87682a0222f280c718fa1f45f854135374edea4dc04d4 SHA512 96ffe97c9003989173278654195aabceef2562834c215f7d8ca33f6e215fc5dfddb4a3007cf0009c85db6f27d573ea6c4c9c548534baa355a0dfaf7ad690d423
+EBUILD rats-2.4.ebuild 1127 BLAKE2B b52d2b6c3df8a763d7d89ceea46b0812940afb376819d110c79817dd89cd47100353bb7756924fb25bf0b13df3bb4cf4b914a7cc9eced7fdc41cc0f111f7788f SHA512 ceb6ced278b7c50f321cddfbb705737d97edd821e97543e515996576fbc0589248d2fc6cfe0a38f9b6c4afdf7fa673369bb436d64dedef6d3ddbb65439336217
 MISC metadata.xml 604 BLAKE2B 1df7626ac554d569d4bae9ff3821a998cf2457441e81c55d57b1ed0bc319226847083de8a97f4362339b9b6f9d9de973777274270d19540dfdba95674f456478 SHA512 14edf04ecb58d9fd69c549b9cd64713338aaa8dab9230ddc00824dfaaa3b2e77090deeb0dc7f87fc875ebb3851ea3bae4765ee8e140b8695ad4088f1eb1fbdad
diff --git a/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch b/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch
deleted file mode 100644
index 65ea6df1f456..000000000000
--- a/dev-util/rats/files/rats-2.1-add-getopt-trailing-null.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nuar --exclude '*~' rats-2.1.orig/main.c rats-2.1/main.c
---- rats-2.1.orig/main.c	2002-09-16 21:05:43.000000000 -0700
-+++ rats-2.1/main.c	2006-05-21 21:56:29.578601459 -0700
-@@ -278,6 +278,7 @@
-       {"columns", 0,0,0},
-       {"context", 0,0,0},
-       {"all-static", 0,0,0},
-+	  {NULL,0,0,0}
-     };
-     progname = argv[0];
-     flags|=RECURSIVE_FILE_SCAN;
diff --git a/dev-util/rats/files/rats-2.1-fix-null-pointers.patch b/dev-util/rats/files/rats-2.1-fix-null-pointers.patch
deleted file mode 100644
index 0d4c701f0bfc..000000000000
--- a/dev-util/rats/files/rats-2.1-fix-null-pointers.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -Nuar rats-2.1.orig/report.c rats-2.1/report.c
---- rats-2.1.orig/report.c	2002-09-16 21:05:43.000000000 -0700
-+++ rats-2.1/report.c	2006-05-21 23:16:16.323046789 -0700
-@@ -122,9 +122,15 @@
-   return result;
- }
-        
--   
--
--  
-+/* Exclusively for debugging vulnerabilities.
-+ * - robbat2@gentoo.org 21/05/2006 */
-+static void debug_vuln_dump(vulnerability_t *ptr) {
-+	fprintf(stderr,"vuln_dump: this=%x f=%s l=%d c=%d d=%x t=%d s=%d u=%x p=(%x,%x)\n",				
-+			ptr,
-+			ptr->filename,ptr->lineno,ptr->column,
-+			ptr->data,ptr->type,ptr->severity,
-+			ptr->uses,ptr->next,ptr->prev);
-+}
-   
- static void
- replace_cfname(char *filename)
-@@ -317,6 +323,27 @@
-     insert_vulnerability(log);
- }
- 
-+/* These are special static vulnerabilities because we don't
-+ * want NULL data elements in the vulnerability_t->data
-+ * field, because the HTML and XML output formats use that
-+ * pointer without checking it for being null first.
-+ * - robbat2@gentoo.org 21/05/2006 */
-+static struct Vuln_t vuln_PerlBacktick = {
-+	.Name = "Perl Backtick"
-+};
-+static struct Vuln_t vuln_PhpBacktick = {
-+	.Name = "PHP Backtick"
-+};
-+static struct Vuln_t vuln_PythonBacktick = {
-+	.Name = "Python Backtick"
-+};
-+static struct Vuln_t vuln_StaticLocalBuffer = {
-+	.Name = "Static Local Buffer"
-+};
-+static struct Vuln_t vuln_StaticGlobalBuffer = {
-+	.Name = "Static Global Buffer"
-+};
-+
- void log_perlbacktick(int lineno, int column, Severity_t severity)
- {
-     vulnerability_t *   log;
-@@ -325,7 +352,7 @@
-     log->filename = current_file;
-     log->column   = column;
-     log->lineno   = lineno;
--    log->data     = (Vuln_t *)NULL;
-+    log->data     = &vuln_PerlBacktick;
-     log->type     = PerlBacktick;
-     log->severity = severity;
-     log->uses     = (toctou_use_t *)NULL;
-@@ -342,7 +369,7 @@
-     log->filename = current_file;
-     log->column   = column;
-     log->lineno   = lineno;
--    log->data     = (Vuln_t *)NULL;
-+    log->data     = &vuln_PhpBacktick;
-     log->type     = PhpBacktick;
-     log->severity = severity;
-     log->uses     = (toctou_use_t *)NULL;
-@@ -358,7 +385,7 @@
-     log->filename = current_file;
-     log->column   = column;
-     log->lineno   = lineno;
--    log->data     = (Vuln_t *)NULL;
-+    log->data     = &vuln_PythonBacktick;
-     log->type     = PythonBacktick;
-     log->severity = severity;
-     log->uses     = (toctou_use_t *)NULL;
-@@ -374,7 +401,16 @@
-     log->filename = current_file;
-     log->column   = column;
-     log->lineno   = lineno;
--    log->data     = (Vuln_t *)NULL;
-+	switch(type) {
-+		case StaticLocalBuffer: 
-+			log->data     = &vuln_StaticLocalBuffer; 
-+			break;
-+		case StaticGlobalBuffer: 
-+			log->data     = &vuln_StaticGlobalBuffer; 
-+			break;
-+		default:
-+			log->data     = (Vuln_t *)NULL;
-+	}
-     log->type     = type;
-     log->severity = severity;
-     log->uses     = (toctou_use_t *)NULL;
-@@ -432,6 +468,10 @@
- static void build_xml_vulnerability(vulnerability_t *ptr) {
-     int i;
-     
-+	/* Debugging - robbat2@gentoo.org 21/05/2006 */
-+	if(ptr->data == NULL) 
-+		debug_vuln_dump(ptr);
-+    
-     printf("<vulnerability>\n");
- 
-     /* Output the severity */
-@@ -593,6 +633,8 @@
- void report_vulnerability(vulnerability_t *ptr)
- {
-     int i;
-+	if(ptr->data == NULL)
-+		debug_vuln_dump(ptr);
- 
-     switch (ptr->type)
-     {
-@@ -890,8 +932,10 @@
-      
- static void build_html_vulnerability(vulnerability_t *ptr) {
-     int i;
--    
--
-+ 
-+	/* Debugging - robbat2@gentoo.org 21/05/2006 */
-+	if(ptr->data == NULL) 
-+		debug_vuln_dump(ptr);
-     
-     /* Output the severity */
-     printf("  <b>Severity: %s</b><br/>\n",
diff --git a/dev-util/rats/files/rats-2.4-fix-build-system.patch b/dev-util/rats/files/rats-2.4-fix-build-system.patch
new file mode 100644
index 000000000000..42972876a5c8
--- /dev/null
+++ b/dev-util/rats/files/rats-2.4-fix-build-system.patch
@@ -0,0 +1,27 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -50,15 +50,15 @@
+ 	$(LEX) $(LEXFLAGS) -Pyyruby ruby-lex.l     
+ 
+ install:	$(BIN)
+-	./mkinstalldirs $(BINDIR) $(LIBDIR) $(MANDIR) $(MANDIR)/man1 $(SHAREDIR)
+-	$(INSTALL_PROGRAM) $(BIN) $(BINDIR)
+-	$(INSTALL_DATA) rats-python.xml $(SHAREDIR)
+-	$(INSTALL_DATA) rats-c.xml $(SHAREDIR)
+-	$(INSTALL_DATA) rats-perl.xml $(SHAREDIR)
+-	$(INSTALL_DATA) rats-php.xml $(SHAREDIR)
+-	$(INSTALL_DATA) rats-ruby.xml $(SHAREDIR)
+-	$(INSTALL_DATA) rats-openssl.xml $(SHAREDIR)
+-	$(INSTALL_DATA) rats.1	$(MANDIR)/man1
++	./mkinstalldirs $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_PROGRAM) $(BIN) $(DESTDIR)$(BINDIR)
++	$(INSTALL_DATA) rats-python.xml $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_DATA) rats-c.xml $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_DATA) rats-perl.xml $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_DATA) rats-php.xml $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_DATA) rats-ruby.xml $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_DATA) rats-openssl.xml $(DESTDIR)$(SHAREDIR)
++	$(INSTALL_DATA) rats.1	$(DESTDIR)$(MANDIR)/man1
+ 
+ clean:
+ 	rm -f $(OBJ) *~ $(BIN) core
diff --git a/dev-util/rats/rats-2.1-r2.ebuild b/dev-util/rats/rats-2.1-r2.ebuild
deleted file mode 100644
index 161aeea514e1..000000000000
--- a/dev-util/rats/rats-2.1-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-inherit eutils
-
-DESCRIPTION="RATS - Rough Auditing Tool for Security"
-HOMEPAGE="http://www.fortifysoftware.com/security-resources/rats.jsp"
-SRC_URI="http://www.fortifysoftware.com/servlet/downloads/public/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND="dev-libs/expat"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-add-getopt-trailing-null.patch
-	epatch "${FILESDIR}"/${P}-fix-null-pointers.patch
-}
-
-src_configure() {
-	econf --datadir="${EPREFIX}/usr/share/${PN}/"
-}
-
-src_install () {
-	einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man"
-	dodoc README README.win32
-}
-
-pkg_postinst() {
-	ewarn "Please be careful when using this program with it's force language"
-	ewarn "option, '--language <LANG>' it may take huge amounts of memory when"
-	ewarn "it tries to treat binary files as some other type."
-}
diff --git a/dev-util/rats/rats-2.4.ebuild b/dev-util/rats/rats-2.4.ebuild
index 1c49b7c4df49..0a41658a9907 100644
--- a/dev-util/rats/rats-2.4.ebuild
+++ b/dev-util/rats/rats-2.4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=3
+EAPI=6
+
 inherit eutils
 
 DESCRIPTION="RATS - Rough Auditing Tool for Security"
@@ -13,23 +14,25 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
-DEPEND="dev-libs/expat"
+RDEPEND="dev-libs/expat:="
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.4-fix-build-system.patch )
 
 src_prepare() {
-	edos2unix $(find "${S}" -name '*.[chl]' -o -name '*.in' -o -name '*.am')
-	#epatch "${FILESDIR}"/${PN}-2.1-add-getopt-trailing-null.patch
-	#epatch "${FILESDIR}"/${PN}-2.1-fix-null-pointers.patch
+	default
+
+	local f
+	while IFS="" read -d $'\0' -r f; do
+		einfo "Converting ${f} from CRLF to LF"
+		edos2unix "${f}"
+	done < <(find \( -name '*.[chl]' -o -name '*.in' -o -name '*.am' \) -print0)
 }
 
 src_configure() {
 	econf --datadir="${EPREFIX}/usr/share/${PN}/"
 }
 
-src_install () {
-	einstall SHAREDIR="${ED}/usr/share/${PN}" MANDIR="${ED}/usr/share/man"
-	dodoc README README.win32
-}
-
 pkg_postinst() {
 	ewarn "Please be careful when using this program with it's force language"
 	ewarn "option, '--language <LANG>' it may take huge amounts of memory when"