gentoo resync : 03.11.2017

author: V3n3RiX <venerix@redcorelinux.org> 2017-11-03 18:18:28 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2017-11-03 18:18:28 +0000
commit: fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (patch)
tree: 6be36785f6ffa594c4dbd785b3213c995b5195b9
parent: 27dfd272ae3be15b1017f733682211afa1c7c0f0 (diff)
304 files changed, 2378 insertions, 2037 deletions
diff --git a/app-admin/sysklogd/Manifest b/app-admin/sysklogd/Manifest
index 4bcd75bfc274..fbf7e96fdae9 100644
--- a/app-admin/sysklogd/Manifest
+++ b/app-admin/sysklogd/Manifest
@@ -10,7 +10,7 @@ AUX sysklogd.logrotate 402 SHA256 2e864ce0e5a2ca2c7964f7dff0fe1a76a5dcb90d237c0d
 AUX sysklogd.rc7 1447 SHA256 704c5a7eb81023a8de4f5e0b2aee7f6701ffec2e5a49f62093e68c60864adb47 SHA512 f3c8f00fbf65833735d57927fe25c6299103bbc0b8fa548103b4f2f06f0dc2aa2276f12326ff7477f4ba491a96ccd30fe01cc53e841b0ccee83c4dacabb5a94e WHIRLPOOL b9a481d43e57288e08d3aa0bce58efb7dd4418759d15ed24aff6246da340736ff95dfe9392abbd235231d4dc7536c14098d6284e831394f09ff8a48022e6bdaf
 DIST sysklogd-1.5.1.tar.gz 90011 SHA256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 SHA512 a72196a1a172d25be1c4791ef6256fe71fa2ba8c1383d230e646e93f8a65c3a57c535189726325da4c792fdb2e9cb119bba43c878816a8e78e78189fd32b12b7 WHIRLPOOL a9be298553e89d1b61f3ac4d5cfc6bd5662ab84d9120adfcdd6b8aaf5fe4d54d9e34ac19dab5c1738578af302597e424e95fc68345a1855e3be2760b093037ea
 DIST sysklogd_1.5-6.diff.gz 25677 SHA256 1c5366865bd058530071a6071c317ab3562f33f4b0f3a934878cb97059fde20a SHA512 816961a835a43057569f62fd20d9f7b5e0bfcfcb173b68947457708504db3ce47e635956c8a9564f9bd577d8f3c49dfc725d321dfd3370b2de918363c30f838e WHIRLPOOL 0c330ed79b5a688ddec0a80e6333c181cfa297350ec9559166e5828d715a305b5b52eee5f7cc95f7b4ebccf03f21de594d428fa2b2ef117bd0a1630684c71364
-EBUILD sysklogd-1.5.1-r1.ebuild 1711 SHA256 685ec783b516cc32d68567687af8cb3eb79312beb86a5b661bc9a6f25a42eee2 SHA512 ca3d1e099db4e4bc4c66fadd899469eee3090420e7cdb52a0b42bc7ea81864be016ec28550b1f80c6bd09a56a7ed80146fdb199292a0b955a9897e9d0584228b WHIRLPOOL f4e6e4c6ca5d9d84f6aa033c292c3fa92d3c19456845a02f371059df492d8ef5e6fb7208d78b115f8261136c025ad900e3f2bfad9b8398f1c7359d0d3d81b226
+EBUILD sysklogd-1.5.1-r1.ebuild 1709 SHA256 dce898cf1d4bcded01faf9a7c5966c0eb840052bcdd559e21d38e81f01e3f37a SHA512 ae65cc780cc5a289c3bcc3fd51b52e7eedb739862ce58fd34da3faf39f65cc80039548e917da8f80ccf379ddaeeda565f3f47c7880a6b4e3fd63b46bf9950f4c WHIRLPOOL cd4cf78e9cfb13ac0b9abfa3b9e7e96122396a9a9ce4ded99428025c2bbfb3c232f98aa6c8357e29fe42181dbb84241418a8fbaf03959aed38f6ada53076d73d
 EBUILD sysklogd-1.5.1.ebuild 1640 SHA256 9a6b736f61db6b68bee7e91ce87a89ec5926553b4e5561f7de32c8e381e94fcd SHA512 7608dbe2f695a63775e89022088cb4f191f3100475f90c6d5194568661b7b9171c16ff6499a8b7344de7da4499127c41c442261ba5955e60f39468b6e4452248 WHIRLPOOL 6b7cd1b21fade85a28edb637eb9f5792ba992925d73b39bbd291a3a6988993b84ef24794fb35ee3911c6373fa098b6e3c60cddb63176646a1ff9655a842d8aa2
 MISC ChangeLog 3315 SHA256 4441e6ba58fddb02cd7f9822fc9358815aa787e77128cad32da43bd4cd41e350 SHA512 43cb2daa243d6b1df40b72fe86d1828aebc1ec4173335a50a08291dfbbd9dc7189aea26b9a7c7c7dd53741965dbb8acb93b4863bce696346866c00a85a0d49eb WHIRLPOOL d232d2a8d1a22ccfb315e5bcf06a122797a01655ab9cf5889a848cea90243466a52cbdaffbd3decc17d67c9c4022f87843aa8ffff91f4311e328ee5aee0b548b
 MISC ChangeLog-2015 15635 SHA256 cfccc77a19c2729be872db0550b7e0f67c97a659803f2c82edf724c4622a9dd8 SHA512 51b47993682d6e95eccb280d1287f434c0571b92d81bfb12fa27bac13fd44d5736b3c895725ab7787b1a1701bd4ceb373e7a85483518c5f365c2910309694d73 WHIRLPOOL efd9b53f4b75b728f913efbf91e8921618bf85cb59c0bf7eb0db726fc4645740c75b30e89305aa090efabd74109fd1aa69fc1688f21d1b3b3efad7e7cd02c108
diff --git a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 3f971c2babb9..4a60e537b871 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="logrotate"
 RESTRICT="test"
 
diff --git a/app-admin/tripwire/Manifest b/app-admin/tripwire/Manifest
index 1d6542396bcf..86e26da0a8af 100644
--- a/app-admin/tripwire/Manifest
+++ b/app-admin/tripwire/Manifest
@@ -4,7 +4,7 @@ AUX twcfg.txt 604 SHA256 31d7d51cf90ee95627e27732524a3ba2b90f074ceda23d0035c52d2
 DIST tripwire-2.4.3.5.tar.gz 965014 SHA256 4bb0b400d8f5d7f8762ffb87a683f113f8c77186689cc63b8cedbbc628c9c33b SHA512 7aef0e7d38f4b6966a806a4e556636c7b2477f4ea5451e89f1749c1535a489c2f490ea13898edff5d7786acf572f77d04430115b8ddd4c6a03c38382feb45269 WHIRLPOOL f5f06d2f509e8047ede81226d3179f253e32aae4193817ab1000dd843f4b9810f6aacc6cd9c0bdc8a0c6835fdb11f79c85838a3b799d8c6565861d43dd433a99
 DIST tripwire-2.4.3.6.tar.gz 1001145 SHA256 f55fe6805f2c159bd67fa3761ba52df95b2a7d0bdd06196847564bac00dd5606 SHA512 4757827b908fd56a014de81609be9cfdf3631d34cbc02214ac800bf6d9c413d85d812bc3211f9dc32ceee97e1f13decd955037a0cbbaf2f8e3020699492bd9bf WHIRLPOOL 0dad2b00a6e868179c1538ec48859a03857fa5bc62dcb9eb3240e11e10cd7ebf4de1fe85802c08abbf1ff1efca0768dcd63ff8088914f53f32cbf7fda20ec706
 EBUILD tripwire-2.4.3.5.ebuild 2407 SHA256 e92dcd221898e4735b4b352ad222ad3b5c78c5475276cb8d15b28b5142641b17 SHA512 a16a7873ce32ee7c86afb14488c439257f5697b84dd20fc9321ab5bb99603b0a614202ef37916e2ce3df3d6b777af06c3e680caec160f9d50add847f06aa9d59 WHIRLPOOL 8da61324fc67f11ef545638b75667f56b33715df2130c02822f28b91783e69778aae12775dfabe04115eea5779b760d6607138887ba9d7841680bc988eb157b9
-EBUILD tripwire-2.4.3.6.ebuild 2410 SHA256 33850be1591ec7add9f1b5abdd316b12b22256cf618b25c9c0b809d7ed33acef SHA512 8afaee953af4e49e2af180a5a941889812f18299fbe05b6ff19966ea639400efc506ebdfe77ce16297b03cd166590d5d2ecb98dd95344430057f81f5f4beb0c6 WHIRLPOOL ab34aaa09b0ae374e79013011f2fdaa0f14fe5b78d1723918cd1f3a7e576aed0b0d1d8df93f866566e049be57493bcf05967abb7f0dacb4047f0dd53592ee98b
+EBUILD tripwire-2.4.3.6.ebuild 2408 SHA256 f0afaf8e38bb9ab548d455a96c2f8c44fd9317eeb5970b8e490b71de3f1872a7 SHA512 b35e263e3c204403f9d73574d2fc7028cb4e9eb24a0401af9d0e1285eff74c75a7f2eaeb5d55b563b72c6a2235d3635d1cac2290cdfc8a0c1547b41ab9e28070 WHIRLPOOL 05802919dc91ff27e7c13e8b019fde1726ed9a824d98111bdb5379d0ee058a132a54bb8f76d9006f8858a0d83938da82c71e21e450a490a1f6c3150522540da5
 MISC ChangeLog 4534 SHA256 70b8e927eb118da4b9f8fc0a3b45d39c53d75f2c2fcff4088f4292464784a449 SHA512 42e38df0a2cc9a95dbfe37299321655bfa637f4c9a9361508cbcfb3e9e57c313d426bbb8af69d0f96cfc1f299e741f6694593c748e95e9635c17e2dd3d0a4af5 WHIRLPOOL 1b86ebc590ff89d1a79b0097b6db8d7d99c0248dc09a2f2103a6f8aa976144f117a83912ba8db5f3a9b831e801e2358181cae976cc2f0b51c67b91fec2d89d2b
 MISC ChangeLog-2015 10548 SHA256 7160399cc44557c92981c50f67f726c44103810f2cdd92173d2f636193723324 SHA512 0e6332b6021f6ffe3f0bcdaccc13b2f5af85b8d135e263e42b6b2c3a4caa3e5dbd8efae01e9c04ab3daa977d1ac7e977542c96718443a5a94d2e04e60be9b110 WHIRLPOOL f4b70c099751eab07d4bb85b9effb68b443c870c5eecad70e6ec42441049d26e567abdc4659122a6cc8263efb0dceddd58f798bdd01906dce1f6bf9bb74c33ba
 MISC metadata.xml 1616 SHA256 0b739488758f343224051751110c9a5ea9189df298e31c471a8a7929d5d28de1 SHA512 ae04a581b34beb18adb7aea67d9ec17dc5cd897d3e974515c5c59e2e5e8391f86238bcaa59967aa7413c99ce56ae670a7badf8008ed8b6926f7f0a4eab0b83a2 WHIRLPOOL f6e75fbe709dcb4b6d11293edac615288f750b66a654eee24d34981da4ffa0c677fc50ec39262e702c4122ef2998765a827b6e8d639e8266cb358d31b69f9efd
diff --git a/app-admin/tripwire/tripwire-2.4.3.6.ebuild b/app-admin/tripwire/tripwire-2.4.3.6.ebuild
index ec2cc9bc418b..deeba1cd8357 100644
--- a/app-admin/tripwire/tripwire-2.4.3.6.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="libressl selinux ssl static +tools"
 
 DEPEND="sys-devel/automake
diff --git a/app-backup/amanda/Manifest b/app-backup/amanda/Manifest
index c9e323848893..c8ee4c2d16dd 100644
--- a/app-backup/amanda/Manifest
+++ b/app-backup/amanda/Manifest
@@ -15,7 +15,6 @@ AUX amanda.socket 107 SHA256 47df2b337c4726068a5bf5d3dfb9ad6dba5c36f5851a445a1ff
 AUX example_amanda.conf 635 SHA256 a1b0520fb0fca0f4146c59589987fffa637a0ce643a91d6d71dde6f538faf325 SHA512 c025aeba89ae686a7bdc5211d9f9b52663cbf8d90fc293f8e3b7ec4b86810d0098e125f4d41bd76af4f3a451bf98b292aa062760c40efba226e15a06bb3a85a9 WHIRLPOOL 50d4e2bab918f54be0ffe6cba018bf468b55e5286d58b99f0d0d7ed0b69761f020c3c1224f8c00e4457acf068ecf54019283bdfb032a4b58931f4089f85258a9
 AUX example_disklist-2.5.1_p3-r1 177 SHA256 bc0388e7de0cc36888d3b27430b4a6b138dd39c77263fdc53dfee9f0b93142f8 SHA512 43fd73b55d48396e1863b23b20b84781aaa7e38200ee4fdbcb898c9a8c5479e24b8448a68ceac01bd6339202935bbf32f02e70a779ee989eeb368ec88d890ae3 WHIRLPOOL 8784e8944c67644e204160aa488486fd028b2f79333bae724d9fb5bf3cf66fb306e8d59e3d9172a0bf9d8639c41899a97d1aa9c7f8f4c1f38adbbc07e98bb8af
 AUX example_global.conf 1377 SHA256 5223d061cd160b241e0d1fad1e328d241387fecb753e797d2e216f77d97a8808 SHA512 c432bdfb97ceb1005bc004d12208f90b09d4c41c8562b8bba0f7b43bbe510672038ca1658a764cff7c6f8e56fa1439a7c15c69714773438e602a693a4f8195a5 WHIRLPOOL 778bdc964d4a7af1bf28775a4c0b46378ebb9812cfe4fb2bb96e4d85d42a96a5dfc60b93f5bfc6e760fcbe9d79477b902466c4a8c1478729568260a96d17a435
-AUX local-amanda-perl5.20.patch 4509 SHA256 58f88bc8aa469c9e62beda31003f5a257a67896e0941b6c3b6defdfab9551dc8 SHA512 222161f9e341232e1e9582ce02d02e6c80977f70c7a566b397023d623086cfddcd913e2e1c322d8dd2d02f4406aa41e523196bb82553c654e43e9217af4063cf WHIRLPOOL c7469768d0268e20358d68019054802e7adc802f52069ddcc07cd977e8678a3f4f3e03dff063e18583421a8ee83d8af92a2ef293c560da552b50271da0ee66b1
 DIST amanda-3.3.9.tar.gz 4673301 SHA256 2520b95ca96f1d521d582b7c94bd631486e7029eda1de8e1887d74b323549a41 SHA512 345670a20cff335453e8dcbf457d1fcdb9f266e4a03d729c2b1ba762f4fac323de4a87713d0fd54c11ca244a08dc97fb8c641625f7fa81cb241b3c17748b1b7e WHIRLPOOL e149ab7dbc30cf3585e41d9fb338dd96ab4dd440e31723be51b8ccc9e5841f8dda31d3b89418474e31c7c2498f40177c646f03713c256a4d9341152e2ce2c8e4
 DIST amanda-3.4.1.tar.gz 5338575 SHA256 1f69e9bdae774ac2394297dd9d7f98ccbce44ca9199317ada764ca173909d2ac SHA512 245bf334e36fe8b4361d9fc27ea7e7ef5bd2ecec74719caa16cc94d1ebb3abbef058e28d9afd85851654aaae0984531593a35c079d1ba4aed0fc5177e907ec16 WHIRLPOOL b9608456f28fb35137276f16ec24d79ae397a44450b42ec4fa28256763798dee623ab560ba0db147ff41d2abc57810e2318ae64741ea0a054a8ff853f4ad9c59
 DIST amanda-3.4.2.tar.gz 5353734 SHA256 175c6a2ef57fe480ddeeefc920a93c8d1cde4111eec76d76e088101a53eeafac SHA512 dea44ffa5eb30318336395ccbd582df2f83da9a4cf91def2834a2e65b2e0f36cafc1911f6b73c3afb63be256484a78b006bdeb1db5b3ecf87dc59d34754987fd WHIRLPOOL af08e2b7b42cead569b69edfa264c1439d21d455e36ba5d346a74631e037773f20cd0563c6cdf95eeea0ee0e1e45328e553a5490ef4c66545acc1a3bd85570d0
diff --git a/app-backup/amanda/files/local-amanda-perl5.20.patch b/app-backup/amanda/files/local-amanda-perl5.20.patch
deleted file mode 100644
index b62df65647a8..000000000000
--- a/app-backup/amanda/files/local-amanda-perl5.20.patch
+++ /dev/null
@@ -1,205 +0,0 @@
-https://bz-attachments.freebsd.org/attachment.cgi?id=149027&action=diff&collapsed=&context=patch&format=raw&headers=1
---- perl/Amanda/Application.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Application.c	2014-10-27 08:48:58.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Archive.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Archive.c	2014-10-27 08:49:05.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Cmdline.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Cmdline.c	2014-10-27 08:49:13.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Config.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Config.c	2014-10-27 08:49:19.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Debug.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Debug.c	2014-10-27 08:49:25.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Device.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Device.c	2014-10-27 08:49:30.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Disklist.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Disklist.c	2014-10-27 08:49:36.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Feature.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Feature.c	2014-10-27 08:49:41.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Header.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Header.c	2014-10-27 08:49:48.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Logfile.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Logfile.c	2014-10-27 08:49:53.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/MainLoop.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/MainLoop.c	2014-10-27 08:49:59.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/NDMP.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/NDMP.c	2014-10-27 08:50:19.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Tapelist.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Tapelist.c	2014-10-27 08:50:24.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Tests.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Tests.c	2014-10-27 09:01:12.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Util.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Util.c	2014-10-27 09:01:17.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/Xfer.c.orig	2012-07-25 17:59:54.000000000 +0200
-+++ perl/Amanda/Xfer.c	2014-10-27 09:01:22.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
---- perl/Amanda/XferServer.c.orig	2012-07-25 17:59:55.000000000 +0200
-+++ perl/Amanda/XferServer.c	2014-10-27 09:01:29.000000000 +0100
-@@ -1450,9 +1450,6 @@
- #ifdef eof
-   #undef eof
- #endif
--#ifdef bool
--  #undef bool
--#endif
- #ifdef close
-   #undef close
- #endif
diff --git a/app-emacs/doxymacs/Manifest b/app-emacs/doxymacs/Manifest
index 508335166209..97bfdf91348a 100644
--- a/app-emacs/doxymacs/Manifest
+++ b/app-emacs/doxymacs/Manifest
@@ -1,6 +1,7 @@
 AUX 50doxymacs-gentoo.el 502 SHA256 55d0746f7855c7bc3e09cd332076a64bd7528199475643a20354f37d525d74b4 SHA512 1ce4aee60f650daca6d1597356ccc8d2e411c8d71f4236dd396709c6d2e03699d78626dba1e0f0b7c67701267436d62d56b70c9fbc1a5770e0018e7014badc75 WHIRLPOOL be57d8df024f98ba9ba90154d661fe6bece33ad60e5068f69dbae28cd7cb7dd5d6a068cdc32eeacd53fe08eadf58010dbe3baaf191926b5ee0093317f7d52e53
+AUX doxymacs-1.8.0-gcc7.patch 2868 SHA256 04e9d6d2642bd66845a16a88ed37d92754b98ce6a7c9e18e2c7ff0b4a0709e7c SHA512 2ac07420a59ecd2a90de1dcfe0b0750d527a6e12100bbbf453adbad9e046ab036708c4463e9d50507e099cf2246d867e748903d8b6a8e213b0755288625c1e03 WHIRLPOOL 0e968b90ebdb9d1b2c9e840eaff3343147112fa9bfd4f0b6edd55efb6c30b5a401dd796cbe5956e5b5e02d053c413b8a6f811a54d1eb20afa6e93516ac0a1013
 DIST doxymacs-1.8.0.tar.gz 133600 SHA256 a23fd833bc3c21ee5387c62597610941e987f9d4372916f996bf6249cc495afa SHA512 7461a8a415aadf331f856e4f122712cbedc2907eff9e452f24e6ee83b96903d9944d2cfdbcfeab8a66144a0be508eae723c29f82a081df9723560b10c444f8ac WHIRLPOOL f8b39d0a38032c1364d1d4ccf9a78f87be877fc8655cf29a8b189a01ec0fb76ca2b26b52c19fd780c27243c0ebf5f344331b62f1278efa3c341851ee7a9c86c0
-EBUILD doxymacs-1.8.0-r3.ebuild 679 SHA256 b2b2fe51f524467b3bd6587ffc54538903036ee90ae0c0515b36e5675a0b7da5 SHA512 6d37c93fa0f636cd84ea30041856e1027c8186bb812e2635ff0175f4bc0ecf7af8cb619685125165e83a3a7c31cc02960f8c46ba2642a8ea3732fc0eb392fe56 WHIRLPOOL 6efe238f34c0571ac78dc8114c4e33241a837db3c92a45a0e8234eb60d86b210e6dcef5f922fcf98a90c2b76b4399765c7c3a69d9431da2961279feb180e6d82
+EBUILD doxymacs-1.8.0-r3.ebuild 711 SHA256 94bb74a89a7052a0533220ce8b3232c2a7e667a1d1a5cfb36414c7598c8825f8 SHA512 a90c2f6704d36637630a9a43b1fe8619e08a531716c22361b6066d2476f8c572443521b6afcaad338a2bfce1b5517bd617c28b299b43817507f9c9b85e1b9ef0 WHIRLPOOL 6e5842426d5e77840f0a3a3cbc0d28acde3c594916d75dc51f6aa5386bd5381f190a6c5b1b21ddba56d6b5c6eda1d917c02c165042abdbc6796a3063ffc28ea7
 MISC ChangeLog 2353 SHA256 fc58587c81c790ee684aeafde7c193d6d6bf0d549c66cdcb8e70e28a690ecc35 SHA512 2e9cd10cf790a23950b5ab296423b91c8850316fd74b3d405673246354bc4c94b54ffcf3e3a74024cb4d9cc4a6d9dba66cce3fc6d94498c634963a0a09e5815a WHIRLPOOL bdd01d02847da02264c93233893d53667a23ce835c822856f9b3a54200c3a1df1a5c394fce8199878fa1f6b6a68b4220ab3f2ababc108d6b3655e8559267f581
 MISC ChangeLog-2015 2166 SHA256 88acb57d616e6e28b61160f08b01af93c49fcda34d7068725380abe30ed6d119 SHA512 4bb21d657d5791f988b0845598e1947c31d97c957dcaa3c0dcf52215eb48daf6059c77b7f4b75392672eb4667caa73ac04df6b1109826110f4930fad0b334a4c WHIRLPOOL 327ba9eb3cd869dc27b88cdc9984d63fcb2515ebc5c0943bba7e1f95bce3121bd341a2f90c7f0b5563c274ff468f11e086d8f0c45b485b92b5ccd9076e81cb1b
 MISC metadata.xml 335 SHA256 9e97df755db16d310ec44a2b0d0139e84edadd2e6d0ceaa1177c9d71c4b61bda SHA512 25405ab050cf5173b07c80dd4e0eec376be3e6e666934d2f64ad978dfe8b9ad54a33c6b83adb01b96cff912a97cd64ae1009dad45c83ef0ec7c3dfde2f3fe9da WHIRLPOOL 80369bbea92e8608011d52241525f517a02ac98d94f878f4ff8f52d93e8557d83bb9ca873f25fab3922de724985299a360be7aab0fd052462a92a439ddf27c23
diff --git a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
index 9cd5531e5936..5d9ed4e59e7f 100644
--- a/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
+++ b/app-emacs/doxymacs/doxymacs-1.8.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ KEYWORDS="amd64 x86"
 DEPEND=">=dev-libs/libxml2-2.6.13"
 RDEPEND="${DEPEND}"
 
+ELISP_PATCHES="${P}-gcc7.patch"
 SITEFILE="50${PN}-gentoo.el"
 
 src_configure() {
diff --git a/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
new file mode 100644
index 000000000000..b30a955baa87
--- /dev/null
+++ b/app-emacs/doxymacs/files/doxymacs-1.8.0-gcc7.patch
@@ -0,0 +1,104 @@
+Fix compilation with GCC 7.
+https://bugs.gentoo.org/635746
+
+--- doxymacs-1.8.0.orig/c/doxymacs_parser.c
++++ doxymacs-1.8.0/c/doxymacs_parser.c
+@@ -70,6 +70,7 @@
+ 
+ hash_entry *symbol_hash[HASH_SIZE];
+ 
++static inline unsigned int hash(const char *s);
+ inline unsigned int hash(const char *s)
+ {
+     unsigned int h = 0;
+@@ -82,6 +83,7 @@
+     return abs(h % HASH_SIZE);
+ }
+ 
++static inline void AddToHash(completion_list *cl);
+ inline void AddToHash(completion_list *cl)
+ {
+     unsigned int h = hash(cl->symbol);
+@@ -96,6 +98,7 @@
+ }
+ 
+ /* mmmmm... free hash */
++static inline void FreeHash(void);
+ inline void FreeHash(void)
+ {
+     unsigned int i;
+@@ -117,6 +120,7 @@
+ 
+ /* XML Helper Functions */
+ 
++static inline char *XMLTagChild(xmlNodePtr node, const char *name);
+ inline char *XMLTagChild(xmlNodePtr node, const char *name)
+ {
+     xmlNodePtr cur = node->xmlChildrenNode;
+@@ -141,6 +145,7 @@
+     return NULL;
+ }
+ 
++static inline char *XMLTagAttr(xmlNodePtr node, const char *attr);
+ inline char *XMLTagAttr(xmlNodePtr node, const char *attr)
+ {
+     xmlAttrPtr props = node->properties;
+@@ -167,6 +172,7 @@
+ 
+ /* Look up functions for symbols and descriptions */
+ 
++static inline completion_list *LookUpSymbol(const char *symbol);
+ inline completion_list *LookUpSymbol(const char *symbol)
+ {
+     unsigned int h = hash(symbol);
+@@ -187,6 +193,7 @@
+     return NULL;
+ }
+ 
++static inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc);
+ inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc)
+ {
+     desc_url_list *cur = entry->descs;
+@@ -206,6 +213,8 @@
+ 
+ /* Add the given name, description and url to our completion list */
+ 
++static inline int AddToCompletionList(const char *name,
++                                      const char *desc, const char *url);
+ inline int AddToCompletionList(const char *name,
+                                const char *desc, const char *url)
+ {
+@@ -274,6 +283,7 @@
+ }
+ 
+ /* Encode the given string so that {X}Emacs will understand it */
++static inline char *Encode(const char *s);
+ inline char *Encode(const char *s)
+ {
+     unsigned int extra_len = 0;
+@@ -341,6 +351,7 @@
+ 
+ /* Output the completion list in a way {X}Emacs can easily read in */
+ 
++static inline int OutputCompletionList(void);
+ inline int OutputCompletionList(void)
+ {
+     completion_list *cur = comp_list;
+@@ -400,6 +411,7 @@
+ 
+ /* Clean up */
+ 
++static inline void FreeCompletionList(void);
+ inline void FreeCompletionList(void)
+ {
+     completion_list *cur = comp_list;
+@@ -428,7 +440,8 @@
+ }
+ 
+ /* Add the members of a compound to the completion list */
+-
++static inline int AddCompoundMembers(xmlNodePtr compound,
++                                     const char *name, const char *url);
+ inline int AddCompoundMembers(xmlNodePtr compound,
+                               const char *name, const char *url)
+ {
diff --git a/app-emacs/emms/Manifest b/app-emacs/emms/Manifest
index cc113ced23ee..3673ebcea5ab 100644
--- a/app-emacs/emms/Manifest
+++ b/app-emacs/emms/Manifest
@@ -4,9 +4,11 @@ AUX emms-3.0-texinfo-5.patch 509 SHA256 66ddbc99b6fb938955f30dee1f1c7cd26939cc93
 DIST emms-3.0.tar.gz 200838 SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119 WHIRLPOOL b8f9eecf1c1883e59051a31076888abb038627960012c22d9822764d558e84d97afb0b3eee9c6bf3fe89b707c6657d62099b384cac684709f1250f8fe63e9c59
 DIST emms-4.1.tar.gz 283625 SHA256 032e5680c39f70234245e2c6d56bc8278cfb80e5539f3aa1ed26b771c330c62b SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107 WHIRLPOOL 4ce84196531fae53e37d50b4e802b731db5f99a530b83965dfc95c63f105cdf1703df65af95fe2b4849ce1f412e3ba2fb4141cc6f9ec9bae0541e73226932de8
 DIST emms-4.3.tar.gz 287153 SHA256 00112d631eee0cfee80a85c048bfbf7c2d25886067ee02152376208ae87c2c36 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed WHIRLPOOL fe7347c9a7013d0be81c9dff0c52e94ba5d62cbf9a04b4fcd18e7074658f12c0d3188a9242554d28143c5ebae62101e1d5f39ce302c94ed1852b0cf5094a23b0
+DIST emms-4.4.tar.gz 288922 SHA256 10ecc2e9c957ca1f80bbf8d9a0473b9eae552218aaea278dc8b10564215513ac SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba WHIRLPOOL 0c25526a7c55410a25fc7c873c3ba63b7caea87a00f24ca5c763e402e5f12aff93e2f37cbd28cdfd34ea4411eff053990591209e85a01385c983a58c394968c9
 EBUILD emms-3.0-r1.ebuild 1015 SHA256 eaaeada17ed3feec111ac65831470c331e358ed07e6ab185f58f6e859bddb0da SHA512 1aeb482a49dab0a35825a3e382393a54fa98e86716ecd6fe0ab8cae28189570ca90e7ec99acb719d860cd3ec8e6479dd287e8f016dfed70cc69196f4c7cbf776 WHIRLPOOL b23d3999cbcbb29822db2d2d673aa7578bc1834159f36c7770c9637ee6e46915f258c4c791f2ae79f86fee7e2372c84856985498bee882d8692dc2b789eb842e
 EBUILD emms-4.1.ebuild 950 SHA256 f2a8309015b0107c1074225662c61b741d3c5c859c728d595952de9d3c8ecdb5 SHA512 1fce44cd0519199ea6f70ee847906aedf527a23f537a0a4f8a55ba2a2db198c955b6fa226cfa35d312f548a1fff4c1fb20cd51aa3e02a51ffec98d45bc8c845e WHIRLPOOL 17652ccb59e02e65c68af059e72ce17afa400ac148ac453bfa7923fb40f57cd9425a8244540b84e1ca78547b6843ad9744c06f3a699d6e659718c81df34cc396
 EBUILD emms-4.3.ebuild 969 SHA256 4565c3b01ad78babd38458d271a31749714775ccd3f0d347d8ed6e8e3d6682a6 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a WHIRLPOOL 5b94b73dad614e336d8031513aa4a98080e2407dc3c01baaf4a16fd9ebace940de5c526d125c6d5a45e57df7963db26ba30b81797c6e77e5f906eaf7e49e3936
+EBUILD emms-4.4.ebuild 969 SHA256 4565c3b01ad78babd38458d271a31749714775ccd3f0d347d8ed6e8e3d6682a6 SHA512 615ada145b969798344b3d620d5a6248535664230256f524f2be3e7eecb9585974c033d83ba4963b4c8b57bf0e0c180a8713582a6588f27b99d57622d912b83a WHIRLPOOL 5b94b73dad614e336d8031513aa4a98080e2407dc3c01baaf4a16fd9ebace940de5c526d125c6d5a45e57df7963db26ba30b81797c6e77e5f906eaf7e49e3936
 MISC ChangeLog 2712 SHA256 bf89234a0caea60e977e5ff616596baa09f88b7960e483fe7576fa936d2b5e91 SHA512 4f88022abcba9709c08bd90fb7c1e709d8c8da26358a260ebbe95ab8d4b5a637bbcf821f3e4c35ea21224b7d0935f98f5b07804b31ac08f8c078f52b677b6c6c WHIRLPOOL f002fb707931e61a8f09663ce307c4a543e3c8226ef7e85ec1148787d42f4972f643d124fdd203af178ce1c5d088169ad8bd4a58a78189bda0075af27991abfe
 MISC ChangeLog-2015 2670 SHA256 f943b164b3b73591dc8876a0ebb9cc86a7992bc63aa34f4678921e98b8610fc4 SHA512 25f7477f12bdd93c2b2ab5d863acaa5954cdc41c6fd9c4c67cdc33a133d48b1176fe77eb7f0fc2726305a734d4e7019c9dbdb352a12b6e26d4dc23e0aaead373 WHIRLPOOL ba93caed0ba301ddee75ee315239035a0d155986d90df2417f2e35dbcf7eac93022e981892d789597c03a6f0e70cf8a6fe9c5d881c701fcecb0429f1d4fd2e09
 MISC metadata.xml 781 SHA256 8d133d600ac7130fc07f36916e4a6266af67bc65497bfbcd1999000f8a197039 SHA512 5208cf25762a76d125453737c53d318ffa79e132eb0aff994161e8e0fe7594360789a21128d854b675f46766a97b6e1a9db99fe9ff98ffbadd137d481e14692a WHIRLPOOL 73149a434eb2a77429867c3cb618441351580398174d1ba56d224b6ce8e6a5d8b982ef5515f8921739f24def9aa30ba4e0f4bc3e259031021cacb931630f6536
diff --git a/app-emacs/emms/emms-4.4.ebuild b/app-emacs/emms/emms-4.4.ebuild
new file mode 100644
index 000000000000..1aacf114f268
--- /dev/null
+++ b/app-emacs/emms/emms-4.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp toolchain-funcs
+
+DESCRIPTION="The Emacs Multimedia System"
+HOMEPAGE="https://www.gnu.org/software/emms/
+	https://www.emacswiki.org/emacs/EMMS"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="media-libs/taglib"
+RDEPEND="${DEPEND}"
+
+# EMMS can use almost anything for playing media files therefore the dependency
+# possibilities are so broad that we refrain from setting anything explicitly
+# in DEPEND/RDEPEND.
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
+		all emms-print-metadata
+}
+
+src_install() {
+	elisp-install ${PN} lisp/*.{el,elc}
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	doinfo doc/emms.info*
+	dobin src/emms-print-metadata
+	doman emms-print-metadata.1
+	dodoc AUTHORS ChangeLog NEWS README THANKGNU
+}
diff --git a/app-emulation/containerd/Manifest b/app-emulation/containerd/Manifest
index 0bffcf5c88b2..b67aa75a9c62 100644
--- a/app-emulation/containerd/Manifest
+++ b/app-emulation/containerd/Manifest
@@ -1,11 +1,11 @@
 DIST containerd-0.2.5_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d
-DIST containerd-0.2.9.tar.gz 1228977 SHA256 2360fec91d40e4e93757f964f07c74e35b6bfe838252b1cc814a176e1cd1c604 SHA512 6f0de476668e6b86a0cd5e1ea0f6dac24e0e68fe2dd52b8915dbafa5ffab137a5eea866c216f8184ffa6e4750c7b69bce3d46552e8be283a15ce676ea4356fc8 WHIRLPOOL b9fdd57af3cf39e6a5efdd67f0302ad38d6634d20aa3eb45431d2900f5fbb7dc62d624b07a5028bbb09ae763e07103e37703cf52f3e14e7af72fc2198d9c7876
 DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e09e4734067f84ae85b6ef75ec31b488a91ae54 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9 WHIRLPOOL 880f19a994f623b7cd8c3f771b5c56468681de349ae4196e60ffcb5a34d42ef423d8eefc82c07134c9e50c33bc0ecbfc1a9e47c3df987050d8dcb82da0178d80
 DIST containerd-0.2.9_p20170917.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0
+DIST containerd-1.0.0_beta2.tar.gz 3681494 SHA256 3130384a814bc0a43fe3b76e2bbb2db2372fdc96490b76f8b278362ebc0d3fb1 SHA512 cecb4d2e0dccbc27c1e59f3e49f8fd5b08445988e49aa4b8a2a5910851509d51e001b5295905288c29fee2d91eadf2180a6b86947e130abe1b33a9a01416a286 WHIRLPOOL 4d526904a146971d57adbde6102e4fe42e0d303b102e721e34aaea3f54ef3176586dedf31a347f52d95a6e5c1850454b31ab3e5c6195b868929d32fde6218eb3
 EBUILD containerd-0.2.5_p20170308.ebuild 971 SHA256 357c0c0c8399ca40b0222d95cd467b595a0877fdf694429329d8a9f299b6e5e9 SHA512 f519a8755010a178a1c96e266e86d4b2177d1d60498f68d51394bb4546fd33d4ac281480d0daf43a8adc0784e5057e8789f05aa77ed28e79197e7b2483671ab7 WHIRLPOOL 95af6f5c16e68ebebebad4d494d1bd9844d38a9073c0ecd522684c30fb6a06ad6b0417837cb6c053e9dbd137c56155e4955ab5e7575fe63dc92564bc93dc7016
-EBUILD containerd-0.2.9.ebuild 1001 SHA256 c07047e6f19d55893171c223d44ddad4f0b1649e23da7af67b1a0d6281cb7b4e SHA512 57492b30f3852cfc235212de64b6efba8e2785cbdeb0acdf6fac9cbac653532693e5472f765a5f41dca9e8af0e3ed1f847e18c2e48dc745e355d0df01b60a5ad WHIRLPOOL a024ef762464c97cd51553418006f55fe78dfcfce1956f59aeacb9432a4265095c581883b36baeb6962ab5a6ed56e11e8c2a2345388b3c88257ef4320e100617
-EBUILD containerd-0.2.9_p20170605.ebuild 1001 SHA256 76cc9d2eba27a3a48c6d7d96804496f122f6bb46228f281e07ad9cf617c89287 SHA512 8c562f29fe227fc9f9f26b5fcf17f553a48c65a2413fb971d5f4ec7945659a86f74ed59062832c0dd80cc81f7ccda901f568bd39743f64e3000946111348a38c WHIRLPOOL 60af398e7c692f14e1d8b0c7a14c11a53548ec88ee599fd8fa7199c042c2e1fdb92c9166f7fa8a606e28d34ab009ff9fea08582f55e6fbf823b7580b9dd64ef3
+EBUILD containerd-0.2.9_p20170605.ebuild 1000 SHA256 d8b66bb902a1e5ca6c58efc0c1b534832457bda08825f55ae6c177458761c9c8 SHA512 adec8a0e7d4d2e4dc200d470c1cbd2dbd38daf2ae2b931c9d32f5cd1b7c580cc1222c628c2e9b22fb64098c800c956a636e6167d6c7a6f391ec280b77a438a04 WHIRLPOOL 744713fcdd4726983c9cd4c1959446d9631d523e62aa28ee47b5ca679609d59701bc0f7c122c58e65325fa24917e68752e882ee4d9a0998328e88b717920070f
 EBUILD containerd-0.2.9_p20170917.ebuild 1001 SHA256 e05ed2f3fabbd8d0466506292b0a75e607ca3de9d3e799681eee9754ad5e1313 SHA512 d206822a85e56f2226b1099b98605800bb3f1aad7aac1846ece87c75b740e6e6aacee0def14925c96ea8ff86cf21622e5821e6112a39ea75edef1dfbeaf71b1f WHIRLPOOL 0eff2136f756f39b09dd1205052d3e6f5efa6d9f6dd5fc2ce8eef8e8b539946cab211812b6682275a79bbbb31a32c63a203cdeb62381ad309c39336512170c97
-EBUILD containerd-9999.ebuild 929 SHA256 46f91c0f86a04a209d291f588ddd8e04e3106f35366e943caea68ad9d2d5eec6 SHA512 c6a3cf6625ed2b919f1486b285a2a15de6b7457cee2acc7278210accb5548aa98e0de7e7729b27f10789e2ae4862445322f920c46b2d29ae7bcd213960b92979 WHIRLPOOL d88d73cfc2b479a36051448dd19dbfb9af7fcb8c95640858593d2fc786bd8a669842f4303a9ed01210fd8deba5e75a73507b947a05e2db2a77a6313e4fe67a9a
+EBUILD containerd-1.0.0_beta2.ebuild 1228 SHA256 036490a9b30c448eb8912f7eb1e2630dc21b7751e31fdab757d7a9424eba7c36 SHA512 77a154a7a0d4f10e247e9f2b4a1f3c0b44f7cfad18c59f86afe25e77fccd3686a1e96d34603aae24889ad422037aa7cda8c80822f7168544bd2af0b6e828e9ed WHIRLPOOL 9a3162aec6cdac742c3aeabda449ad0934a1ff7dc8aa3a45fa8cbac252595081dd809c4712dacf389653ff47bf7eb3be27d918a6f48fad18c4ba320a437f480f
+EBUILD containerd-9999.ebuild 965 SHA256 b7e8d103eb3c8439cab6cbc0eeb7a0766a4611eb2f1dad0b68f7f299aa5fc912 SHA512 b2acd6bd1c237a1058cec02875877d82e2e8c568bf3143cca020c64e13a0649975e3adcdb68540216e8ce1bcdbc7141eda8476c1c01ee2ca313120eca2850012 WHIRLPOOL 6ea886f31c397d58103e7f7892826dbabe71e3c3318d81cb71c79f17a035ac3e52a68a71a3ba42ccab251d3ca9442101eabdf776a21146d89eef985a2ac790f1
 MISC ChangeLog 3648 SHA256 23d267d9839cf9ddd25ec70935aa9cb0d751f1e1fec5fe04b0ab363ac5305df4 SHA512 6692f12dbd09bdfa0f7aef7a9d96e31679f2f8c0ea83c0ee265cf84557ad3cf644410c7372142206509925ac99e500adc9b73390d7868c1a014e76a2fdfc8b9d WHIRLPOOL 7cced3a814774acce4c1afe07e5522845f70f084aeb9975dba4351e357b653b1559267e17b4561029a39c014e149ecbad2501e0ed094ad361414794df9dc7d94
 MISC metadata.xml 909 SHA256 649d7ed77a830933c54e829d88186959f369abb5575e6b5c51f76496da04e95e SHA512 bc18fe0db42a7d9eccc8757f18a92ab3c46f1941f0cc28e0ed4c7be2569b7cec64e1ef49bbddbaab2afea5925f67bb4f6a06f4d1015e29e73c9742f475731d03 WHIRLPOOL 52e6bdcbefc6b473da57e3920fc67d0d593e0028e87f9d4497bc095416ff630671634ef089d62f153e9cfd25c1efb702968fa3d4ef04e4c7f21bf776b2c40c00
diff --git a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
index 70e979be3fa9..e574004b67ee 100644
--- a/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
+++ b/app-emulation/containerd/containerd-0.2.9_p20170605.ebuild
@@ -12,7 +12,7 @@ else
 	MY_PV="${PV/_/-}"
 	EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/containerd/containerd-0.2.9.ebuild b/app-emulation/containerd/containerd-1.0.0_beta2.ebuild
index 3849a49ca7a0..a9b3d5c5ae5a 100644
--- a/app-emulation/containerd/containerd-0.2.9.ebuild
+++ b/app-emulation/containerd/containerd-1.0.0_beta2.ebuild
@@ -2,15 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-EGO_PN="github.com/${PN}/${PN}"
+EGO_PN="github.com/containerd/${PN}"
 
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
-	MY_PV="${PV/_/-}"
-	EGIT_COMMIT="cfb82a876ecc11b5ca0977d1733adbe58599088a"
+	MY_PV="${PV/_beta/-beta.}"
+	EGIT_COMMIT="v${MY_PV}"
+	CONTAINERD_COMMIT="a543c93"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
@@ -23,20 +24,28 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="hardened +seccomp"
 
-DEPEND=""
-RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170607
+DEPEND="sys-fs/btrfs-progs"
+RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
+	>=app-emulation/runc-1.0.0_rc4 )
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
-RESTRICT="test"
+src_prepare() {
+	default
+	if [[ ${PV} != *9999* ]]; then
+		sed -i -e "s/git describe --match.*$/echo ${PV})/"\
+			-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
+			Makefile || die
+	fi
+}
 
 src_compile() {
-	local options=( $(usex seccomp "seccomp" '') )
+	local options=( $(usex seccomp "seccomp" "") )
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
-	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
+	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
 }
 
 src_install() {
-	dobin bin/containerd* bin/ctr
+	dobin bin/containerd{-shim,-stress,} bin/ctr
 }
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
index 42467124d22e..345b3fa9b966 100644
--- a/app-emulation/containerd/containerd-9999.ebuild
+++ b/app-emulation/containerd/containerd-9999.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-EGO_PN="github.com/docker/${PN}"
+EGO_PN="github.com/containerd/${PN}"
 
 inherit toolchain-funcs
 
 if [[ ${PV} == *9999 ]]; then
 	inherit golang-vcs
 else
-	MY_PV="${PV/_/-}"
+	MY_PV="${PV/_beta/-beta.}"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
@@ -24,17 +24,17 @@ SLOT="0"
 IUSE="hardened +seccomp"
 
 DEPEND=""
-RDEPEND=">=app-emulation/runc-1.0.0_rc2
+RDEPEND=">=app-emulation/runc-1.0.0_rc4
 	seccomp? ( sys-libs/libseccomp )"
 
 S=${WORKDIR}/${P}/src/${EGO_PN}
 
 src_compile() {
-	local options=( $(usex seccomp "seccomp") )
+	local options=( $(usex seccomp "seccomp" "") )
 	export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
 	LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
 }
 
 src_install() {
-	dobin bin/containerd* bin/ctr
+	dobin bin/containerd{-shim,-stress,} bin/ctr
 }
diff --git a/app-emulation/docker-runc/Manifest b/app-emulation/docker-runc/Manifest
index bdb90bbd549d..5aa79068090f 100644
--- a/app-emulation/docker-runc/Manifest
+++ b/app-emulation/docker-runc/Manifest
@@ -2,6 +2,6 @@ DIST docker-runc-1.0.0_rc2_p20170308.tar.gz 561400 SHA256 bdd0fc0b5db42bb1fc439d
 DIST docker-runc-1.0.0_rc3_p20170706.tar.gz 1042839 SHA256 d09b31b9a5adf0a3295d10b20e5f65ec8e1c52a371d463218694c37e075829e9 SHA512 8e937e8ccaa114913d61a450b030496668c1e2d80eecccf5e4914c5685d7dde9a0d50bc2aef9be844dc69eab81621aa1c043abbc72ba28ab6bdb9db5e86daeaf WHIRLPOOL bec7b506a6b2522d401733b32a9f500aec69920dc6d8072ab434c7bfbb1c88a6fb00afa1d2728f78fbaac1d58f890a2b5932fdbe2b0e87b749293f2b48ed2e8a
 DIST docker-runc-1.0.0_rc4_p20170917.tar.gz 1094599 SHA256 d5820f1c655061be79441bd57efea4e5b60b25b6a451214b64172395b9fda383 SHA512 0cb0748812296294a87dda257dbf0947897a1ada2aa861ff3e65309a6bbecebbe798929845fca6f23b66fd0dc019bca0a032737c7192fe20618d8e1849866f3d WHIRLPOOL ed34894a3878c0cae50888c936eba1dad8d58da8d7042d5e421f06e4e98c1d7701a5c877baaba14a46d588b2ee3354e19d72bb141d5d8e7f6c0bed2d3a6b71b6
 EBUILD docker-runc-1.0.0_rc2_p20170308.ebuild 1369 SHA256 30437a9a1b5c4a0887ed57f81193fc10aa5859dbfebe5494019e0b3f3f61721f SHA512 7ca6bdaa6b7935c1b1b094fcdb94be734f9d5f1cd5f4e53afa9e8acde8fbc417e7a8d2d7957e50d26b32c613457b6d45907225e51db37ce22efc6746cb2e0cc3 WHIRLPOOL f6ee74ece4cf5514685b69fba0d5710815546647e2120249b7f0630dc2e119fff1f0d3a0af27c6e68b46b4a3d7247a42a1766015bb5325dd6942d68e940462a3
-EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1384 SHA256 4a6afd296bd338a00e3af96907c85f17b3c6d03a32882c80bb0dc75ae099cb2d SHA512 0706dd11a2ae64ab7a56badff4e6e4220a7ac4613e87514e2e633c5f5a875e0da8fde7135f2956bfdf2f14fc6266709e1dd478d31cedbd328be0c9406c604830 WHIRLPOOL 85916ab8e340407d9fa525c90bb8e045984a5499c4c4ab587617d6008a65c6c029eb646a5892a106ebab7414641412162f218ab2861682643067ebe4c92f128b
+EBUILD docker-runc-1.0.0_rc3_p20170706.ebuild 1383 SHA256 c70b72fae7ba1ef8f9f7b0fec7f573b20289e1a1fb4f62aaf78f7092e1bb3ede SHA512 e06eafdf1d1f6af0b6c994bdf7cd278b6f7d1f0a9e649a0dcbf2a41c79c5b298418cfde46a47db85105140012871c9ba57d0dbf8c1d6d3f191da7547ec911b0c WHIRLPOOL d2736eddc18e69bc6160a380d8f389166862dd2d6a7720d8348f243f87ed8a9988ae7f60e86116a36011a579f14003988934fb45a552813da6975743d3750ad8
 EBUILD docker-runc-1.0.0_rc4_p20170917.ebuild 1386 SHA256 cf3dd55eba4360b1a49fe5bd460366741490dbb118c17a7599dfef1b32350b7b SHA512 06d41f7d5a6a1fc20e4a6d2a284a00131d5290fd9b305cf7bdf7ffbb9878449a3a9316ec70ebb0e5eef7df57d976fe6774b4ee4e768d491b08572e2fbce95133 WHIRLPOOL da0bec13658a2d919fbea058c0619314a335abf146845ba5bde0dd8d76aaf33ff359c2b2c4879361252598b194305a109a46cfdfb681cb94b67d4b0ca65e70f6
 MISC metadata.xml 627 SHA256 36fac17c0d0f354ffc9dcf5d8154f3a6c70b7b92cc2161c8b2f13e0e589e2167 SHA512 1038519441e238a48dafd9a0827d931cc3ca2618e57f7f1300bdc138e6bc2b768ae47f936456bf2aa5c434e617b628344aa4071fe805e698671d5f74ffb10163 WHIRLPOOL 5c90aaef62b5c3905f1f82a5923dd0b965e5f7335665f5d583a3d3992504b0a1c611fdd12e54f6a0278193b277378b8c2fda18d91d01c895dc5abece21fb70fd
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
index 03e8e10d6e78..930d6d1ff44e 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc3_p20170706.ebuild
@@ -11,7 +11,7 @@ else
 	EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
 	RUNC_COMMIT="810190" # Change this when you update the ebuild
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc64"
+	KEYWORDS="amd64 ~arm ~ppc64"
 	inherit golang-vcs-snapshot
 fi
 
diff --git a/app-emulation/docker/Manifest b/app-emulation/docker/Manifest
index bbd23dc36c00..d7d675cf7c40 100644
--- a/app-emulation/docker/Manifest
+++ b/app-emulation/docker/Manifest
@@ -4,7 +4,7 @@ DIST docker-17.06.2.tar.gz 9684548 SHA256 cfcb5646db32f52c4c394bc688fff405e585be
 DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b
 DIST docker-17.10.0.tar.gz 10252333 SHA256 90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be SHA512 4ec5dae379ecda36b9af7066432507947142631efea471cd7f447677f9db1fe1522fe81ef68b28d3e63b5e759535a1c518ce1ef71f4de0e9dd32c957c682098c WHIRLPOOL 5e8278c663f0a0e793c2f439ce84e541371a45e605f78194a86ab3da4922400d8ef7101b5534ac35927381a658a88929c9a83a8ffee0f984488edb5a3c993eae
 EBUILD docker-17.03.2.ebuild 8320 SHA256 7a83f7993f61edb28427d1864db270483682e21f1ee3498d12c98a316eb0ca6a SHA512 f6f1115d0ef9a55e92fdd927731cd4011a0c69fa38f3a57e96c54d481a86e99c4fe856a2c2931d1fb87077b6a69ebc751157efd6e9402518e6e8862a4534b302 WHIRLPOOL 38e30777580017ddf31af256ab612f2236dbd9c839f6c4e1e2be054fd2c4f39e3f222cec838f1d38fe6f3af0998f52cc3a4dfacbf14122e3585688a7aeb1f48c
-EBUILD docker-17.06.2.ebuild 8712 SHA256 b622233449ca47beb40144057c8b426fbce76ff17ed8c45c8f88ac45c04e0c22 SHA512 1ddfadbbda4edcab0406005debc9ecd2743babfdadf45ade9d88d18197dd5be4ca2b4313f440adec5140e7032103df7cccd2da9cdb63374d938c56792cc7d477 WHIRLPOOL ab9ccf6ba69a79ff7d00b9d9947d93a8e8a380b6efa65049fdb5403d8645229b01926b3db0a6203da68c2fcf01a950da44550e8496f87b3d590154f9d2e10d7d
+EBUILD docker-17.06.2.ebuild 8711 SHA256 b7bc73cd441558c353e31e5ab5025d41a8b3d2537de1254e0c898a788e23d72f SHA512 6037ebc36e28e89905a3e15b4816114c16c624fc0072bdbda628fccfff5574509099923c15cc33cc7a39d0b67eabfb1511d7650ead4d5fcd360c7ac9b97408c4 WHIRLPOOL e460ce19a3fe9299011f611ec60b9cb22db2b1089426997b99fd7bf6a260a5f4dbcd4f39c754aba2b7eed17903e633440d287e7011de9e94d3560008d3c89e5b
 EBUILD docker-17.09.0.ebuild 8767 SHA256 5e1ee06656f94a6b7ebee013c2ca7404535ef1eace7f727ed99102dcd19ce699 SHA512 5455e549fbcfa75082e1e0f4211d75439d26b028306ebc9bbecfec36fa951e52d7014e78d8893043194047ddcecbcb0b7fa1c4e2ad947373b1945576b270279f WHIRLPOOL 93f75fd8c11a0700b32aedc3abf90fcdae4c894ae5e0c3077c2bfd838f3cce47508a2277ad0f560ed48828c105b1ea703b18e012429775498402660e7d578863
 EBUILD docker-17.10.0.ebuild 8766 SHA256 1f12a633572fbd9dec5bb9c875fc5b872de6229494c27910fc94f2c912f7199f SHA512 b6ed073a46053c9b0dad42888062890aee6186871f72802e56a131bf1a1b123b0f778307c647c24ddd2be3710b357c56279e7fd2e5894c165b8fd940b8b75ac4 WHIRLPOOL e8a7f8aaaf7804e0669353d94f7d4241876a2bd926156cf586deaad1db8f7f21a831a87f9a345c27cf081ca1254cc953556a6adfa363fe2c3473e6fe305b2b8e
 EBUILD docker-9999.ebuild 8077 SHA256 a88fd76547a4100ea43224e72e3d4507d3211a3de6f07b60e3f79ebd87919a75 SHA512 a2ec513765edbfb246460aaf41beae4a24e4fc8413ce20702785ac7403de7a0567017dc205b864d343dabfdeff7405e734a9ea9a9584322862b9b19005c285a4 WHIRLPOOL 9e93646899e5e43064f67b37768d526001d070c048555125991c5eb03f55fa9caf043cf13c045ab97eef45e8f737159a4d18f072798725dbc6d13d33dd5e8fd8
diff --git a/app-emulation/docker/docker-17.06.2.ebuild b/app-emulation/docker/docker-17.06.2.ebuild
index 29b50ed130f2..8d869dab470f 100644
--- a/app-emulation/docker/docker-17.06.2.ebuild
+++ b/app-emulation/docker/docker-17.06.2.ebuild
@@ -20,7 +20,7 @@ else
 	DOCKER_GITCOMMIT="cec0b72"
 	EGIT_COMMIT="v${MY_PV}"
 	SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm"
+	KEYWORDS="amd64 ~arm"
 	[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
 	inherit golang-vcs-snapshot
 fi
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index ffc34362144b..b557b930dc3a 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -5,7 +5,7 @@ AUX free42-2.0.6-fix-makefile.patch 1742 SHA256 6736d62ecfd328a1c00771f550bcd1ec
 DIST free42-1.5.15.tgz 22683600 SHA256 2dda0558141cd26d4b04aa96608c85eadb0770c4f2b660889d4b2a6f3a880c21 SHA512 fc09fcb0efaa6502776517b22cd0015ea7ac7d128b80bd740f64272b6c7aa41f5509dd7e0166dc18043790b4bef725a37a6a7210308a67aeaed02622f9e6daef WHIRLPOOL 5f6f5b33ccb2c320515fbc4e67ee52c6bc6c25fdbc8cf24c05772a90be87fed03f48dfa363b195071c4bc722428fb116d246e9df2eaddba20742648891ad7769
 DIST free42-nologo-2.0.6.tgz 7348647 SHA256 862135da3066576d71dbfedc1e41e97230e656ef2f0db3a5b87ba96650c12b9a SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d WHIRLPOOL 5740055edfbafc6f91ba9d3a8b1dc259511dc99b1e5d06a78cf03976b71928c5423d57cd023c9d878108394f3b0992a3bf532f06e69089b976a8ca789dcae9ed
 EBUILD free42-1.5.15.ebuild 985 SHA256 2c7bdde9a7719969d4beeefc37991ccd9ab11ed528cd8800e892b3f62cce67ae SHA512 58c18f521601fbe863cc90dec6954a41e26d7f3aa1d0b12c549e84675f17be153f10014b223d46275a0438c240a356caccca41bd7dc85457d7ea2448624cf201 WHIRLPOOL 10d92d850276e84353ce3a946ba2badaef5cbe3faa9dc39ad45bfb1a8cac833033ad910f008eef2e748b81726004f981c7ee15864f187c55d98c162e49169b22
-EBUILD free42-2.0.6.ebuild 1045 SHA256 b6c84d49241d89b49b873f7fa59e5b02cb9e7a36ad6408bc3c3a4b495462e7f1 SHA512 ab27426244237727b0a8aa4fe3189978d5e096290c5df9f5f9a32d30c0102b09adc83116b02fb5988abec7a11794c679c7fc3220dea28b3594cf2217d79b2f79 WHIRLPOOL cc94b2db377515e61b649cb98cba4cf31d6781ac64b65ff09652dfdf10de7f7f3b3740c6f9538f4582ada3a32ebb4947eb2553fbd0ebb72b684c260717f51630
+EBUILD free42-2.0.6.ebuild 1044 SHA256 e6a36c327a13bc79fc73900917f32b49e8ce7b821d8ba1bbf6d88ecafb51366c SHA512 0cb13769bb6dacd1bdfc4e675d57579b440d575ef679fdbf6fbf575832014b2bc5d0d31501c299e0ffc049299c72d64ccc146936d5d5158a37c6e61c23caa920 WHIRLPOOL 936737111d4cd3e29b37e9f68090e004cc12d79539bf05aed1dc91aa700be3f94ac93d95fc588a1e89cf7d9551fd068b3fb3170e567880fcaa838c5c9f7f8eed
 MISC ChangeLog 4309 SHA256 ff56171f5a0b3d9cebe3608d4ba414d3ed6f64c7d780c3833fc9214f2d59b2e5 SHA512 271749df206b6e5523c1af2ed2d27d2dcb24c4db48c3eeb20ccb8d4619793b31abc1b85d9259a8444224db12e22f54b70eb5c2f4a84c964aea60161f0b4e554f WHIRLPOOL 0e0be69e14aae1d3f117f2bd100dc57c3948f03fa475fb214b772e0da705219c4bbb55755674d443ae44b45280f400a90fdb96a36cb637219bc9b8e2d07268ef
 MISC ChangeLog-2015 4257 SHA256 d76539bb1c895cfd7cd2dc8db0227070ae9b095c19370e59bfff7077b9601672 SHA512 8786752ccb9203b31f629cb48d17eb854aa0c6d1f55d286eeab31a6757c7c81d340b88ee34021f4269e093ea15c1d5fd464955f14f1df981f08f3a4d57031d0b WHIRLPOOL 45a1d888198cff6778e93f99dd330289ac0926b016f51608d15f124aee024b8ac691895a2e10a155dffd5194792392fd2ae5325ca686a0bd0db6ae86fec34486
 MISC metadata.xml 554 SHA256 678bba466793d567beef67661d467532c6c15bbfea57d1fe222a32da7f6c9c67 SHA512 f1035a6c26c5168022e623c83784da4585fa16edd71889bc5b608494eedcb0f34c4a6f478648784f1a30fb64bfdf48b95e31d01213fbe29754b7208ed43e1579 WHIRLPOOL cf8ae24b3e284e8b3c99150d573190bf51cba61dd0361c38021170d99cf619f496ce4149db9108713374db0d8009ebecd7f4da81ab173b47a0cfa217859667fb
diff --git a/app-emulation/free42/free42-2.0.6.ebuild b/app-emulation/free42/free42-2.0.6.ebuild
index f40b9a599bd0..deb8bf3bcab7 100644
--- a/app-emulation/free42/free42-2.0.6.ebuild
+++ b/app-emulation/free42/free42-2.0.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="alsa"
 
 DEPEND="dev-libs/atk
diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest
index 6958e56580fc..5d30f1408e56 100644
--- a/app-emulation/xen-pvgrub/Manifest
+++ b/app-emulation/xen-pvgrub/Manifest
@@ -13,7 +13,7 @@ DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7c
 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276
 EBUILD xen-pvgrub-4.7.2.ebuild 4855 SHA256 05ecb38bd3cf2d7d2ee916bde949f7cc5e51e3c112786dab71864f55d0255644 SHA512 86198959919f66903003d83a0b9a9951b85c25bae2507a2cf98701adf7f2d61149bf2653687f9f8f24384b9119269c35b67ac4e7eb727f18e96fa1f892233947 WHIRLPOOL 15969302211b83c417a9481f31636c6555777f761ed082dbe5f510f8b86f5986122359481879b8d660f256bbb3629699c987309a82b8a1a8966913076b4ae030
 EBUILD xen-pvgrub-4.7.3.ebuild 4858 SHA256 b1a306442f38efe10e1699b44c7b0ef6da6765027e3b14505655bce7de77dfd0 SHA512 98342e4eb779dc0c8bd204baf73c177242d5678eec14871c252581456f0afd395e8758ea9f697b15bc242dc14a9c8217bba315ba71f891c238cb051c132fedd1 WHIRLPOOL e0f909b7701460529463cbc411e32f27e0437d1f1883c0b25bb84a8aafa8439875684057f4418a9a71aff5cffb8c6f63b7de4e5c2573137045ced23c4d4a9b5c
-EBUILD xen-pvgrub-4.8.2-r1.ebuild 4868 SHA256 fa393804ef71b058ac21c60f37ffca18aad6d29dfd81f51c1b64ba872c07f311 SHA512 d301a42271af0af034f7d97b358f3931401331493198fdee0e40b36ed260a9d32fc5cab4b546a544fcd6d4218cdcee1cbb8b7a0b7bea3c8a62dd9979c4593fd1 WHIRLPOOL cc71a62b5d777640592877048c9b4527dd44d176cbea4e0629f8bc648c51cef7b699ad4c994ef2f15fa4b65c6853abbf54c94408fd4597270a3248a8601617a0
+EBUILD xen-pvgrub-4.8.2-r1.ebuild 4867 SHA256 c1e2814c844c251ff8dca36275734810e111bf4e6fd6c935494389272470f16f SHA512 1d675f142afc4b52f4b216091d6109ac906548dedd04f67b312bff1823a5c2b1ca5adc06fe4ac80caeffcc58a3f7501be3bd83219c242e118b660e3e164ba4ba WHIRLPOOL 028e15584f5d7156ff99c0de989234768c415df223052039f168dd34987d38295485235a069c7b5fbe163f102e73760ae10e7728227ee5abb3292b7193f4e4ed
 EBUILD xen-pvgrub-4.8.2.ebuild 4860 SHA256 1d3dae13bc0280ec2627db29f9e875d2e61228fb4cd52899ac123462e4d5e431 SHA512 54ec10e72eb29850b48216e9d81c38cfe82510aac751be69bdcae124f05f07021562757f85e18f091a65b1dcf1f257ba4652d994d415d05ec4485845beedecc4 WHIRLPOOL 2a9ba421dc9e35d0fecd978d597c0b84d83f05671e0c2422985b0be2606f5fde3a818cc6c9d67eb7b429f2f11f3430b31710d06638c082454e4ebfdbc16c10aa
 MISC ChangeLog 7852 SHA256 ad4918f5c2385e0cdce11a5a4dd3025138389a2cdb2242b111d4d2318bd62975 SHA512 182aac066289033e565c50fe3ed620a6d123ffb9570e55fcfe1834f59f172a758a9238e160b7a9525512f94887617ff89165df1519d752fe26df84ef0016405b WHIRLPOOL c77c268d908fd4dd26888841e295eabc2040598a7651e36e712ae9a94149ebdd28b778895a76eb804276f791da832360c02559fd70c2973a8f88fce62d2cfa6c
 MISC ChangeLog-2015 15121 SHA256 729879428f3b9ee1f4d94eea1e3e3eaab4875658088799cfefe49eae3755fdcf SHA512 55627fe8e88dd3af475d65c33f28766ce475919add045bbf82a950729b4eec4df2ca02534cd39eba07dafb77b02c82d773d6540c05fa144ce96bc624c7bb915b WHIRLPOOL e66c52cf6783b0d77865b20074a3e2d4b8da4f3c37340e3f8ef96fbd9fbaf04ef2f8adcc0e21fa164bb2da1bab7ae5d664544080fa968f3d83e1d1461c3f27dc
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild
index 4f3af9d41003..863eff7c2b44 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.2-r1.ebuild
@@ -32,7 +32,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
 HOMEPAGE="https://www.xenproject.org"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="custom-cflags"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index f99791ec0059..00177e10f0b7 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -22,6 +22,7 @@ DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da
 DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
 DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
 DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439
+DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
 DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
 DIST xen-gentoo-patches-10.tar.xz 27876 SHA256 aa91759d25611afa2e851e190c8445b18e4262037fc06da886f2fa4a4c500b94 SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece WHIRLPOOL e02cc3c6ffd701b2f04df111ab33b18f7fa09e292b94a34af4d806509a564b896a7b677ab64654523ee992f363d59bf6bd4c2cbeaea7330f368cf657bfa2d538
 DIST xen-gentoo-patches-9.tar.xz 27456 SHA256 67c410d12ef4628a8c0a931e5868b425f2eb4b2f0e307304a75384cbe509734b SHA512 9a797be9dd2392c34b3f6561c2274e116b4f5b114f4520dbbd0b51818c774479ceabb45aa916f93c1a2bc49787f4ca6e6c83bc743baa6bdeef91d77276b20f36 WHIRLPOOL c41cde532726bb55acd05d558b35d575b229d2ee64eba7438f7b196df313f0e44154148c1e47bf6e8c810667b3b237bcfa410371b4bb6f097b981f6b2637ead3
@@ -29,8 +30,9 @@ DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd76
 DIST xen-security-patches-25.tar.xz 9208 SHA256 ceaa520d4d98ab7b6ce5b58c380499372cb513dda0c8236106cdf878385d4458 SHA512 18539c1f42bc95a06f7b06855614fafb4ed7c07a145d9ab90e02954ba405d21fc4c379908e3233ddfb85ccaa04515b261ac4bbf3987ce00e4479158f03edd917 WHIRLPOOL 4cff34c29a5c38e6a5bd0d4f4fe89d8daf944740934b05cd61f4b8a345ddb4d8a8b2de6db27a723154169e3f28d5b34a43eddd08c909cfa3d6d5aee26fcae693
 EBUILD xen-tools-4.7.2.ebuild 14072 SHA256 61ab7974b863a2791aaa188c5f5df408f115c21c7a1f770654a807ca45d33365 SHA512 2a8119fa5eaa93594379d51d039e0af86c11d4082cc9f723fb87beb4c7f04d6bf1b09da858ec5919e29e6d322771994589080f68dfd61f32dfa699bf852db0d4 WHIRLPOOL 8d22df2a0c065d0b959a1cb4f5d3242ac51a28f9c4d86e07b3b27a52d06c79b7c0efa0f2c32a8ac5e9d701a009b12a1a0a5d53c3f987e14819a79f004333a621
 EBUILD xen-tools-4.7.3.ebuild 14050 SHA256 bc76a043677701c09d900c4661a6c0a280c542ee12511230f3e242a682208967 SHA512 9e7f809973bd7bd37a8761d22fed9704e94b1a9a41c346799d81066a64b0ee9ba02cb0e5687fccb7618088f548fe58644bee7f81b1a6d44e43c5755ae49bf154 WHIRLPOOL 10939d779ead31d040cdaf3d3d5894628405c2a6ef47e056ac5c5a19b3741cb35201a42da5c504fee45acf681bf040f30bd6e9599eb09101bf196bdd6d4f5daa
-EBUILD xen-tools-4.8.2-r1.ebuild 14101 SHA256 5ec0ac7e080f65b1a251741450f6ab822e96fa58f23b60059fca638f4ed0b097 SHA512 f0ee35035973c31fb8ad151acf1dbd087817eb20a1391a3284d086f2b2aa1ca0b5d4c645aebf659f398a796311d4b7fea126b2b3c7881c64952b6ff165b50134 WHIRLPOOL 747cc55bde6436ce03b4ebf8a02e7902835dcc973291b580dd8e44b98f60ce6cd5c32a48aac23fb5891435b9bda9a7d46ffd1e6dd0dc8c2487f30a979b0df4f5
-EBUILD xen-tools-4.8.2-r2.ebuild 14129 SHA256 55436a876264fde1ea13af717dda2a7ee1ad60516659eeb0f508ce39130f32b3 SHA512 d8462922f0707c7059fe7b7b9910b087e3ea06f276203a3512970ad65e2b76a6bfac8d822463416ac49a29a52b43376eafcb9466ad11b22268be9f60162b2d37 WHIRLPOOL 6a91e9d3d5178af5b96491e46c357a7e63488e9268aed5fcc66089438143737d735b48d107ec762c985ce56e707696c49a4fb4241a542efc7bb5168ae7c5fcf5
+EBUILD xen-tools-4.8.2-r1.ebuild 14103 SHA256 e4d47b3fe72e202674954d7a45640b1ad63d1dfd1121444f1285aaf1b5e4e8df SHA512 61a2b8c34d5f6f54887e893007843719b40178dfb85b47c42ab53e588cb2abf13dc0f34d1785b60dd9fa2f673e899783fedd07d9e6089e95a9e948bb693770e3 WHIRLPOOL ba0fadaf8842ff6a31e1847cd9109407338e6a8f389431478d74ccd1992e13267d0df7a69f7fb549791a374750dc9f7df5ff7a096fc24df5e3ab8b4bf514ea9a
+EBUILD xen-tools-4.8.2-r2.ebuild 14156 SHA256 750f3847df14d1d1c6fa23166e2da0bcfc7996be822f78b7df933d0c0bb66b63 SHA512 c10bcfee7bbd61ba5e27c5e183afd952b0f3e773fafec2fcc8705a106aecee17e4e44aac97c4a74bd41e7b9eaa670174b6eb568f09117716db0e4613fddf74f7 WHIRLPOOL 5b3c0016a70a412d5c5e91647db4c8d2de843c5abc1c1285b20668099b5d74a1750938f1c003aa85dd7bed23f59d3f0a5a9e333ba486ac76fc699887ee4ade2e
+EBUILD xen-tools-4.8.2-r3.ebuild 14156 SHA256 dad3618f9bda10450f57cfbb1c9448a3550a90d8d33acfc3a75748948946dfe5 SHA512 af7bdee9f7185b5eb4a4444ae7951723a72e24d324d9d363f2ad0df4d5c67c6bb7eb370c3d1c41501a05b3332fa38f1a4089244ea44ef1108441575e61bab1b2 WHIRLPOOL 0cd7f4165f4067417e8f1b354c457fd11abed716f92f6aece812d2524d7e5eed7c75835dae03a16977d1b4cb513568396b0b9de54841a38a3d512673b0ab6d98
 EBUILD xen-tools-4.8.2.ebuild 13727 SHA256 0d4650499b9177eeb87a5b023a51dd497167c10ef6a3de74365256d597365e03 SHA512 b01cdfe60007b8310d34f1c9be7ea268831f4b333219b2c0fbbd7ea501bdf6ca5ba84cae202e8a25aa1da9137f889d08bf49e3820ea9f923e3c5035e8ecb97aa WHIRLPOOL 36dfcacd7eb9876e64961de292f638c142a1678fa9d0d2d580f7f51eef33a612cbf1ad3f92b56f2dc563b21d4b0d044a325b2364bd4dc286de4a615f5e90c49d
 MISC ChangeLog 22964 SHA256 15c6bdb3723570f38291c42047455516934b7d0e29969a0b7ac0176309d09509 SHA512 29a5c27e3fc0dba37b6b54a7834e39e34d3056d999b0a0ac0278607d7ac7adf7a924b054b941390c06643fabf873d559d627c0a026f1c6352c0732289ebf6707 WHIRLPOOL 2ecd5711ccdb9823c04cc4ed68392f8d1743c7070f34dbfe9bb0c264651bdf51d65210b4879e303ac550caf1fbd9ec6c2913feaaf5cfb96dd14b40e04af02a05
 MISC ChangeLog-2015 70841 SHA256 e2535b416e2777d7e80d7d96a388c50ab42fb18cd2dd242feb09e339726574ef SHA512 ea9f464a5cf37ce8e7872934f46794a23dec950d6de7d81610e3410356b9a9916dab7d6a7a114819ebe678517e60f53b3debb692383274c74e04adbb59368069 WHIRLPOOL fc0e6610406053b81d3d4258ca0f3117c552f3ab8a33ee282ba31aa69f8b07d196374c74b4f97a8f60422d53dae27fbd02e4cfea1940bc14b7b5ec995d825b07
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild
index 3e35cd4c8eac..6e96925cfed9 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r1.ebuild
@@ -13,12 +13,12 @@ MAJOR_V="$(get_version_component_range 1-2)"
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="x86"
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=1
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
index 3de1759592f9..d7c419329aaa 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r2.ebuild
@@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-lang/perl
 	app-misc/pax-utils
 	doc? (
+		app-text/ghostscript-gpl
 		app-text/pandoc
 		dev-python/markdown[${PYTHON_USEDEP}]
 		dev-texlive/texlive-latexextra
diff --git a/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild
new file mode 100644
index 000000000000..431efbabe512
--- /dev/null
+++ b/app-emulation/xen-tools/xen-tools-4.8.2-r3.ebuild
@@ -0,0 +1,467 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='ncurses,xml,threads'
+
+inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
+
+MY_PV=${PV/_/-}
+MAJOR_V="$(get_version_component_range 1-2)"
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	REPO="xen.git"
+	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
+	S="${WORKDIR}/${REPO}"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	# xen-tools's gentoo patches tarball
+	GENTOO_VER=10
+	# xen-tools's gentoo patches version which apply to this specific ebuild
+	GENTOO_GPV=0
+	# xen-tools ovmf's patches
+	OVMF_VER=2
+
+	SEABIOS_VER=1.10.0
+	# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
+	OVMF_PV=20151110
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	[[ -n ${OVMF_VER} ]] && \
+		OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
+
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
+	http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
+	https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
+	ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
+		${OVMF_PATCHSET_URI} )
+	${UPSTREAM_PATCHSET_URI}
+	${SECURITY_PATCHSET_URI}
+	${GENTOO_PATCHSET_URI}"
+
+	S="${WORKDIR}/xen-${MY_PV}"
+fi
+
+DESCRIPTION="Xen tools including QEMU and xl"
+HOMEPAGE="https://www.xenproject.org"
+DOCS=( README docs/README.xen-bugtool )
+
+LICENSE="GPL-2"
+SLOT="0/${MAJOR_V}"
+# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
+# >=dev-lang/ocaml-4 stable
+# Masked in profiles/eapi-5-files instead
+IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	pygrub? ( python )
+	ovmf? ( hvm )
+	^^ ( qemu system-qemu )"
+
+COMMON_DEPEND="
+	sys-apps/pciutils
+	dev-libs/lzo:2
+	dev-libs/glib:2
+	dev-libs/yajl
+	dev-libs/libaio
+	dev-libs/libgcrypt:0
+	sys-libs/zlib
+	${PYTHON_DEPS}
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+	x86? ( sys-devel/dev86
+		sys-power/iasl )
+	pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
+	api? ( dev-libs/libxml2
+		net-misc/curl )
+	ovmf? (
+		!arm? ( !arm64? ( dev-lang/nasm ) )
+		$(python_gen_impl_dep sqlite)
+		)
+	!amd64? ( >=sys-apps/dtc-1.4.0 )
+	amd64? ( sys-devel/bin86
+		system-seabios? ( sys-firmware/seabios )
+		sys-firmware/ipxe
+		sys-devel/dev86
+		sys-power/iasl )
+	dev-lang/perl
+	app-misc/pax-utils
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/pandoc
+		dev-python/markdown[${PYTHON_USEDEP}]
+		dev-texlive/texlive-latexextra
+		media-gfx/transfig
+	)
+	hvm? ( x11-proto/xproto
+		!net-libs/libiscsi )
+	qemu? (
+		app-arch/snappy:=
+		x11-libs/pixman
+		sdl? ( media-libs/libsdl[X] )
+	)
+	system-qemu? ( app-emulation/qemu[xen] )
+	ocaml? ( dev-ml/findlib
+		>=dev-lang/ocaml-4 )"
+
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/iproute2[-minimal]
+	net-misc/bridge-utils
+	screen? (
+		app-misc/screen
+		app-admin/logrotate
+	)"
+
+# hvmloader is used to bootstrap a fully virtualized kernel
+# Approved by QA team in bug #144032
+QA_WX_LOAD="
+	usr/libexec/xen/boot/hvmloader
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+QA_PREBUILT="
+	usr/libexec/xen/bin/ivshmem-client
+	usr/libexec/xen/bin/ivshmem-server
+	usr/libexec/xen/bin/qemu-img
+	usr/libexec/xen/bin/qemu-io
+	usr/libexec/xen/bin/qemu-nbd
+	usr/libexec/xen/bin/qemu-system-i386
+	usr/libexec/xen/bin/virtfs-proxy-helper
+	usr/libexec/xen/libexec/xen-bridge-helper
+	usr/share/qemu-xen/qemu/s390-ccw.img
+	usr/share/qemu-xen/qemu/u-boot.e500
+"
+
+RESTRICT="test"
+
+pkg_setup() {
+	python_setup
+	export "CONFIG_LOMOUNT=y"
+
+	#bug 522642, disable compile tools/tests
+	export "CONFIG_TESTS=n"
+
+	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
+		if use x86 && use amd64; then
+			die "Confusion! Both x86 and amd64 are set in your use flags!"
+		elif use x86; then
+			export XEN_TARGET_ARCH="x86_32"
+		elif use amd64 ; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+}
+
+src_prepare() {
+	local i
+
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		einfo "Try to apply Xen Upstream patch set"
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf || die
+
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+
+		# apply qemu-xen/upstream patches
+		pushd "${S}"/tools/qemu-xen/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUU}; do
+			epatch "${WORKDIR}"/patches-security/qemuu/$i
+		done
+		popd > /dev/null
+
+		# apply qemu-traditional patches
+		pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
+		for i in ${XEN_SECURITY_QEMUT}; do
+			epatch "${WORKDIR}"/patches-security/qemut/$i
+		done
+		popd > /dev/null
+	fi
+
+	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
+	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
+	pushd tools/firmware/ > /dev/null
+	ln -s seabios-dir-remote seabios-dir || die
+	popd > /dev/null
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
+		einfo "Try to apply Gentoo specific patch set"
+		source "${FILESDIR}"/gentoo-patches.conf || die
+		_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
+		for i in ${!_gpv}; do
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+				epatch "${WORKDIR}"/patches-gentoo/$i
+		done
+	fi
+
+	# Ovmf's patchset
+	if use ovmf; then
+		if [[ -n ${OVMF_VER} ]];then
+			einfo "Try to apply Ovmf patch set"
+			pushd "${WORKDIR}"/ovmf-*/ > /dev/null
+			EPATCH_SUFFIX="patch" \
+			EPATCH_FORCE="yes" \
+			EPATCH_OPTS="-p1" \
+				epatch "${WORKDIR}"/patches-ovmf
+			popd > /dev/null
+		fi
+		mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
+	fi
+
+	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
+
+	# Fix building with gcc 7, Bug #634338
+	# https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=f49fa658b53580cf2ad354d2bf1796766cc11222
+	sed -e 's/name\[60\]/name\[100\]/g' \
+		-i tools/misc/xenlockprof.c || die
+
+	# Fix texi2html build error with new texi2html, qemu.doc.html
+	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
+
+	use api   || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
+	sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
+		 -i tools/firmware/Makefile || die
+
+	# Drop .config, fixes to gcc-4.6
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+
+		# try and remove all the default cflags
+		find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
+			-exec sed \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+				-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+				-i {} + || die "failed to re-set custom-cflags"
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+		unset CPPFLAGS
+	fi
+
+	if ! use pygrub; then
+		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
+	fi
+
+	if ! use python; then
+		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
+	fi
+
+	if ! use hvm; then
+		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
+	# Bug 351648
+	elif ! use x86 && ! has x86 $(get_all_abis); then
+		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
+		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
+		export CPATH="${WORKDIR}"/extra-headers
+	fi
+
+	if use qemu; then
+		if use sdl; then
+			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
+				tools/Makefile || die
+		else
+			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
+				tools/qemu-xen-traditional/xen-setup || die
+			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
+				tools/Makefile || die
+		fi
+	else
+		# Don't bother with qemu, only needed for fully virtualised guests
+		sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
+	fi
+
+	# Reset bash completion dir; Bug 472438
+	sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
+		-i Config.mk || die
+	sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
+
+	# xencommons, Bug #492332, sed lighter weight than patching
+	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
+		-i tools/hotplug/Linux/init.d/xencommons.in || die
+
+	# fix bashishm
+	sed -e '/Usage/s/\$//g' \
+		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
+
+	# respect multilib, usr/lib/libcacard.so.0.0.0
+	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
+		-i tools/qemu-xen/configure || die
+
+	#bug 518136, don't build 32bit exactuable for nomultilib profile
+	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
+		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
+	fi
+
+	# uncomment lines in xl.conf
+	sed -e 's:^#autoballoon=:autoballoon=:' \
+		-e 's:^#lockfile=:lockfile=:' \
+		-e 's:^#vif.default.script=:vif.default.script=:' \
+		-i tools/examples/xl.conf  || die
+
+	default
+}
+
+src_configure() {
+	local myconf="--prefix=${PREFIX}/usr \
+		--libdir=${PREFIX}/usr/$(get_libdir) \
+		--libexecdir=${PREFIX}/usr/libexec \
+		--localstatedir=${EPREFIX}/var \
+		--disable-werror \
+		--disable-xen \
+		--enable-tools \
+		--enable-docs \
+		$(use_enable pam) \
+		$(use_enable api xenapi) \
+		$(use_enable ovmf) \
+		$(use_enable ocaml ocamltools) \
+		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
+		"
+
+	use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
+	use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
+	use amd64 && myconf+=" $(use_enable qemu-traditional)"
+	econf ${myconf}
+}
+
+src_compile() {
+	export VARTEXFONTS="${T}/fonts"
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	if test-flag-CC -fno-strict-overflow; then
+		append-flags -fno-strict-overflow
+	fi
+
+	emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
+
+	if use doc; then
+		emake -C docs build
+	else
+		emake -C docs man-pages
+	fi
+}
+
+src_install() {
+	# Override auto-detection in the build system, bug #382573
+	export INITD_DIR=/tmp/init.d
+	export CONFIG_LEAF_DIR=../tmp/default
+
+	# Let the build system compile installed Python modules.
+	local PYTHONDONTWRITEBYTECODE
+	export PYTHONDONTWRITEBYTECODE
+
+	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
+		XEN_PYTHON_NATIVE_INSTALL=y install-tools
+
+	# Created at runtime
+	rm -rv "${ED%/}/var/run" || die
+
+	# Fix the remaining Python shebangs.
+	python_fix_shebang "${D}"
+
+	# Remove RedHat-specific stuff
+	rm -rf "${D}"tmp || die
+
+	emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
+	use doc && dodoc -r docs/{pdf,txt}
+	dodoc ${DOCS[@]}
+
+	newconfd "${FILESDIR}"/xendomains.confd xendomains
+	newconfd "${FILESDIR}"/xenstored.confd xenstored
+	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
+	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
+	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
+	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
+	newinitd "${FILESDIR}"/xencommons.initd xencommons
+	newconfd "${FILESDIR}"/xencommons.confd xencommons
+	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
+	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
+	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
+
+	if use screen; then
+		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
+		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
+		keepdir /var/log/xen-consoles
+	fi
+
+	# For -static-libs wrt Bug 384355
+	if ! use static-libs; then
+		rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
+	fi
+
+	# for xendomains
+	keepdir /etc/xen/auto
+
+	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
+	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
+		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide and the offical wiki page:"
+	elog "https://wiki.gentoo.org/wiki/Xen"
+	elog "https://wiki.xen.org/wiki/Main_Page"
+	elog ""
+	elog "Recommended to utilise the xencommons script to config sytem At boot"
+	elog "Add by use of rc-update on completion of the install"
+
+	if ! use hvm; then
+		echo
+		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
+		elog "support enable the hvm use flag."
+		elog "An x86 or amd64 system is required to build HVM support."
+	fi
+
+	if use qemu; then
+		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
+		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
+		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
+		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
+	fi
+}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 6fe25cfff6ba..279cfcccb4cd 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -4,11 +4,13 @@ DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da
 DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
 DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
 DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439
+DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
 DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
 DIST xen-security-patches-26.tar.xz 8276 SHA256 2a21ec429f8952875f7d95f24697600e606326f1a16d5622cee73628cd0401c1 SHA512 f54fc7e720a70258263d29cc482b8269386818ad75792de87b0d0357fdb6af81f2102e5983100db47563435fa28f875a84e8c6d73d44797aadaf0c469d9fb0ec WHIRLPOOL b31667d8415dc1fbcd60160fdbc2fe0ad4de9bd2171fda875f5585b8d7821c4c035b029dbf382abacf4b6be745aeeb708f419fdcabdd86f78ff1c13703802e3f
 EBUILD xen-4.7.2-r1.ebuild 5385 SHA256 4378b88ad0cbc515f40c2cf1151281a77678799c96d932e25b75682510c93e99 SHA512 8eb417f766c4c07c80ec3ff53734f3c24d703ef3ce99dad0052dbd5b63232cf66e22470b9779e45ee6662e4057c78d13a3b01d9d7e5e7d8203bf78452cc08f3b WHIRLPOOL 90fd34819474f35141be31efc48f11a7838058cfe9b323ab46d0164bf7b5bca4ecd51694e7b2765a6e72b62b3dad8d4620252996263959ea4ba203ac74e1ae1e
 EBUILD xen-4.7.3.ebuild 5386 SHA256 74a72af9515f3ead828cc0906f754572a0a2b3fd5afefad45cdec4ac0508e744 SHA512 4f9b09496d2c6aafe5e5a6a50b8e3cc926856398ae46149e05a451f8ee2f615640fa3d2fb444d3a95ff3b00210f3249cd8828ec168b61e2466656ae5e7eb5a58 WHIRLPOOL f7d88913e532714664fa1f9eea03855b3bffcf5926bc0ba9401fa401c78fc2a9a056428886300a5d0549cad30c0cc35028bb386e92dfcf593af4ffc02d3610c8
 EBUILD xen-4.8.2-r1.ebuild 4934 SHA256 e38e9660e801b5f1cb3b88080b0e804c563fdddd22b85677bb2d3249e031ef87 SHA512 2911276e186ae07c1e8322fb7e3638d3f1c6fe58d5214f23febe87e0231f685567312a5595e9da18bc852da02dd7457ca4cba4e7f568207ad6f47c4a042494e1 WHIRLPOOL 08142c3b1897231e8d355a8b0322194feb0c7218bd6388ad2db82ac69327be0aa8e39a60b25d40081b3e5320b676d4077b1b1028feec01069f7a05ee79157d07
+EBUILD xen-4.8.2-r2.ebuild 4934 SHA256 7335043936cfd6e5b18e82c3ffadcde298e8473bc5296239ffa207d45e2fa0c1 SHA512 360c886e6ee22373e29d0b3c8776d04689cacdd4280226ba6da728642c25ee543f11e91e061f1303ba1cc5979155ff7b624b4219a7795cad45cc51f399258c49 WHIRLPOOL 5dde9f078d3ef7749150ce9df1c5ef307975c5d1cc43e9872d0ab243baa146c2e4149a5df26b9c247c3e4fbbc98c118d8597b1decd67cac17a859d156c47ad1e
 EBUILD xen-4.8.2.ebuild 5379 SHA256 78930fde5e11e655cf854cc23739e074b350e0b931716309e6c5aa48394db511 SHA512 79edc5c83b563b69851112afa2971f21ad2971fe62f4e7a5feafe3cb31abc866e8cb4156cf83ceb17a6f033fc5c23789be47f2cc5ebe7ce1a76d6db3e60dad01 WHIRLPOOL b0c85962342bef988cdeb945250d1f847c08c9b68c1a1fcb882eb0846e73b6ea2356fedad265aef5d6abc7776aaa0530dff4b02b179805fcc4ff05a749d46f38
 MISC ChangeLog 19246 SHA256 ae107ab371c71d67ccbbb373a29add15e6203ecd6e42fbbce8d37ece1b186fc9 SHA512 b51269964858e15797062599b5b0329686c202da6aeeefeb3f72bec596f35080221ce7591db7a662d973eb1e17d80af8de953a27e1df70e365b9538e1d311bef WHIRLPOOL 72136dd18b3e3341e0fdad7abe3d75f633588c800c647a7a165c5a11741d6c98e492d22eaae4da40ce1d105c96db4ee9071ed0955ef2c376bb0d2e4415581339
 MISC ChangeLog-2015 39538 SHA256 43b9fcb224880329df3962d7a0a5f67469d8a29677e9dcbc002e5e5d45b488df SHA512 0a23ab62077924f2daad976e7cb9a3f16de0c7b5eee9be874e4606168b495fe6d9a06245c7c6a375e93b411776f09b4c176de8f7f05ab9eef578b677f179e27d WHIRLPOOL 48ba9ac7cf44b1522d3846df5b917bfbe36839b60d9bee3b151aaad7ade953af73c2bb852c7b7181be8eff26a34ceddad5d97c323b9bd014ecb160daf53c5261
diff --git a/app-emulation/xen/xen-4.8.2-r2.ebuild b/app-emulation/xen/xen-4.8.2-r2.ebuild
new file mode 100644
index 000000000000..9ddd4bb969ca
--- /dev/null
+++ b/app-emulation/xen/xen-4.8.2-r2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
+
+MY_PV=${PV/_/-}
+MY_P=${PN}-${MY_PV}
+
+if [[ $PV == *9999 ]]; then
+	inherit git-r3
+	KEYWORDS=""
+	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm -x86"
+	UPSTREAM_VER=2
+	SECURITY_VER=
+	GENTOO_VER=
+
+	[[ -n ${UPSTREAM_VER} ]] && \
+		UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
+	[[ -n ${SECURITY_VER} ]] && \
+		SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
+	[[ -n ${GENTOO_VER} ]] && \
+		GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
+	SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
+		${UPSTREAM_PATCHSET_URI}
+		${SECURITY_PATCHSET_URI}
+		${GENTOO_PATCHSET_URI}"
+fi
+
+DESCRIPTION="The Xen virtual machine monitor"
+HOMEPAGE="http://xen.org/"
+HOMEPAGE="https://www.xenproject.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="custom-cflags debug efi flask"
+
+DEPEND="${PYTHON_DEPS}
+	efi? ( >=sys-devel/binutils-2.22[multitarget] )
+	!efi? ( >=sys-devel/binutils-2.22 )"
+RDEPEND=""
+PDEPEND="~app-emulation/xen-tools-${PV}"
+
+# no tests are available for the hypervisor
+# prevent the silliness of /usr/lib/debug/usr/lib/debug files
+# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
+RESTRICT="test splitdebug strip"
+
+# Approved by QA team in bug #144032
+QA_WX_LOAD="boot/xen-syms-${PV}"
+
+REQUIRED_USE="arm? ( debug )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	if [[ -z ${XEN_TARGET_ARCH} ]]; then
+		if use amd64; then
+			export XEN_TARGET_ARCH="x86_64"
+		elif use arm; then
+			export XEN_TARGET_ARCH="arm32"
+		elif use arm64; then
+			export XEN_TARGET_ARCH="arm64"
+		else
+			die "Unsupported architecture!"
+		fi
+	fi
+
+	if use flask ; then
+		export "XSM_ENABLE=y"
+		export "FLASK_ENABLE=y"
+	fi
+}
+
+src_prepare() {
+	# Upstream's patchset
+	if [[ -n ${UPSTREAM_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+		EPATCH_OPTS="-p1" \
+			epatch "${WORKDIR}"/patches-upstream
+	fi
+
+	# Security patchset
+	if [[ -n ${SECURITY_VER} ]]; then
+	einfo "Try to apply Xen Security patch set"
+		# apply main xen patches
+		# Two parallel systems, both work side by side
+		# Over time they may concdense into one. This will suffice for now
+		EPATCH_SUFFIX="patch"
+		EPATCH_FORCE="yes"
+
+		source "${WORKDIR}"/patches-security/${PV}.conf
+
+		local i
+		for i in ${XEN_SECURITY_MAIN}; do
+			epatch "${WORKDIR}"/patches-security/xen/$i
+		done
+	fi
+
+	# Gentoo's patchset
+	if [[ -n ${GENTOO_VER} ]]; then
+		EPATCH_SUFFIX="patch" \
+		EPATCH_FORCE="yes" \
+			epatch "${WORKDIR}"/patches-gentoo
+	fi
+
+	epatch "${FILESDIR}"/${PN}-4.6-efi.patch
+
+	# Drop .config
+	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
+
+	if use efi; then
+		export EFI_VENDOR="gentoo"
+		export EFI_MOUNTPOINT="boot"
+	fi
+
+	# if the user *really* wants to use their own custom-cflags, let them
+	if use custom-cflags; then
+		einfo "User wants their own CFLAGS - removing defaults"
+		# try and remove all the default custom-cflags
+		find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
+			-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
+			-i {} \; || die "failed to re-set custom-cflags"
+	fi
+
+	default
+}
+
+src_configure() {
+	use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
+
+	use debug && myopt="${myopt} debug=y"
+
+	if use custom-cflags; then
+		filter-flags -fPIE -fstack-protector
+		replace-flags -O3 -O2
+	else
+		unset CFLAGS
+		unset LDFLAGS
+		unset ASFLAGS
+	fi
+}
+
+src_compile() {
+	# Send raw LDFLAGS so that --as-needed works
+	emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
+}
+
+src_install() {
+	local myopt
+	use debug && myopt="${myopt} debug=y"
+
+	# The 'make install' doesn't 'mkdir -p' the subdirs
+	if use efi; then
+		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
+	fi
+
+	emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
+
+	# make install likes to throw in some extra EFI bits if it built
+	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
+}
+
+pkg_postinst() {
+	elog "Official Xen Guide:"
+	elog " https://wiki.gentoo.org/wiki/Xen"
+
+	use efi && einfo "The efi executable is installed in boot/efi/gentoo"
+
+	elog "You can optionally block the installation of /boot/xen-syms by an entry"
+	elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
+	elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
+}
diff --git a/app-i18n/anthy/Manifest b/app-i18n/anthy/Manifest
index 0662dea4a858..a5bfd07f3e30 100644
--- a/app-i18n/anthy/Manifest
+++ b/app-i18n/anthy/Manifest
@@ -2,7 +2,7 @@ AUX 50anthy-gentoo.el 63 SHA256 7a1e9904ba583fce8e3275d8e73cc3f5a171099b8abe416b
 AUX anthy-anthy_context_t.patch 174 SHA256 9caf62c425cf537704599da459676ce42cb6a2fb5deca80439ba3be7948652bc SHA512 3f252628f77f53dd96eac50f08a36bb782f0ddc37446c1bdd5bd94fffa3454b9adcaff7118d76fdc7e8bc3f86b1a84e9830da5b67b2b0d281847b26ff62cdee3 WHIRLPOOL 6329db64e6cd3c5487d647f860d3802b19b14e34504c35de69222031f2c73cba3db235f9bb0f2300c15b6e4ba29ff061c977684ef35050e4bf169ff78db53401
 DIST anthy-9100h.tar.gz 4446148 SHA256 d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547 SHA512 315ebd9e1af208f3ecaeaa13620213b35f004e47edb54e60c3e02c2997444cd2326cc58b725dd2d0bd6a723130884d946ea193ea3d92418082256b59ecc8d88b WHIRLPOOL dfdaa96e19dbd53ad627c40521922c7df74858e9836a770059dbd6005a09e3978bcd46bcd40380360708c4234e91e77d91161064614596047f53020c2c571245
 EBUILD anthy-9100h-r1.ebuild 1319 SHA256 a78e82f1363d090099d22e1ee5eb0121564209d23d475e810c9488010687cfed SHA512 ad8723d14c9269670c8f46131b92f0646fffdc1e8b20be6bef387e8fdb0168b6f715ebc4a39f0de5e74afbb3fd9619eca755023adfc46e06946f21576b443baa WHIRLPOOL e545556f3c90d6e800a99c4a8b0d4160d25b7c9d06a7bffb5e9cd65e40e3788d4a38695ad9ddaad6ca1e5bc9b13c874bf4f4190c9cc6a305726c9f3794219475
-EBUILD anthy-9100h-r2.ebuild 1271 SHA256 91e1de54bd722dcca0c87f85bdf1d5966a99df09d35f24dcd763bcb742441eb4 SHA512 88d39f33c281f5c2bcf98b871b29aece756056efc3b8c11053513e4ae8cdda403de379914e23c300466c926c1c1cd48f43fe61ab33796e603fdc11d4d482ffa4 WHIRLPOOL 3230fe2203d6332d2f9273e673305e35a9a3966bcecb4ff10aa2749212814b5d191750938762ee0b61a7b1b00418badb609ed79ad2e4a00677a81ab602d82ae6
+EBUILD anthy-9100h-r2.ebuild 1270 SHA256 488f3e453e640cefa4b6eaec00416a6b05dc599af003afc8e6c9b9f20a2cdfb2 SHA512 235f254eceb4cc2343c45d4bef202ac4718b7d5e2443303cd95b0da99076db6d570af19b160c0c2134a4bf2a81a505d328146c17d1080090f4cfd009da6e8f16 WHIRLPOOL 83efbbd1e3c7dfe65a8a2a45062aeb45ca70118dcff1cf82612743c1c169631254910133dae868615b5622d98de34a979c4fe300f2199f2e3283b9e3ffcfca96
 MISC ChangeLog 2636 SHA256 40fc27d15ed3932047aa3a2a2f8c0ae1c8fab243864a8fe24f935108c2346f63 SHA512 a6ed41a2e4b303e8d58dad1ab1d616457fd5d2f95ec9df8e87600bc35d56b4124e6ef7a87d0655d0d1c0b555328c4963eb06e2468fdb740b6dadba8d990a0616 WHIRLPOOL 7b5c14bfb04aeaa34b35a057b5f505cbadbbf866b7e7b16ada17c050bb8e6ce94d1811b47e4a95be1dfb6397f5a6bb8f61c0a7e77f1261bd85d2f7be3a4bbb04
 MISC ChangeLog-2015 16940 SHA256 64c550bf8282c0c7739ec8a26a8d6f54b9d4f6fda50e9ebe6486728b9902a6ec SHA512 c919a2643933290b77c6f4940ea8f6242e4914426f10e2a401c316054b8627836347d4d395f73bb21fa13bb34dabb1671859638b01b6e8b72ebbe10278731c4b WHIRLPOOL 437cb056e614b7917f2b686d94758d488bea1e4e090f4250f063c62b096498af426898b9cbec03041760271cf6997d153d145bdecce0d623ab1789f2431a8cb5
 MISC metadata.xml 903 SHA256 ca6cf4e8cb82690a02e746deef29a2c6d388b9571e82cbad29082c943876b25d SHA512 6fed9f2dd2b723292db8348fa4977659600b2d755f74bdfd7d9007b60d2c505473af01f5277d41155e9cdee6243d6e8faf9254c9e6963787509ea4a3f37117c9 WHIRLPOOL 3a7c86c9792ed93937dcc90bc93d0c486fc6e9869abee789a4ba17a9a9d50ba7f8f9b780f4373e87e2d0094245ec47fc108886dfe6d8746551ea633b4d73c964
diff --git a/app-i18n/anthy/anthy-9100h-r2.ebuild b/app-i18n/anthy/anthy-9100h-r2.ebuild
index fb6bc0839f32..f1da94a6a778 100644
--- a/app-i18n/anthy/anthy-9100h-r2.ebuild
+++ b/app-i18n/anthy/anthy-9100h-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="canna-2ch emacs static-libs"
 
 RDEPEND="canna-2ch? ( app-dicts/canna-2ch )
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index f7c0e120c1dc..1ba25df2fa1f 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -4,7 +4,7 @@ DIST graphlcd-base-0.1.5.tgz 99863 SHA256 7b11d1e68aa3f9b65ae437e9d6b5bd8bdaba86
 DIST graphlcd-base-0.1.5_utf8.diff.tgz 5040 SHA256 02aeee8f7fcfacf927c86cb9bcb7a67fa5574ad43871938f1e99e618852fbfcb SHA512 ac9cfed725be4a8d04f6898a8e5810a888e4b50c341f9ab668dbb27798007fb66d160ab021729af6083ec1b5e902520602e871cbdd7edefce1e03c06826e9dd7 WHIRLPOOL 1dd8ba284593173efff7b03e70ce80b58d8b03bdb3cb6653ff5f7f885545a41b45407b6f12090f82141cbdb4a1dff2dcf4fa2ce96e5b8294fc050e9716ebedcf
 DIST graphlcd-base-0.1.9.tgz 130390 SHA256 6579e47150e1a9e79fd7866430f4090a50a1c9e0303251012b3fcb433f538fcc SHA512 3769cd31281f40c1cb343a70cba1fee4b27b5ab1454609dca430199b731744d63244ac39d6460c18b236dd1eaaae8284e236c63493b2df23c394ff628f3fb834 WHIRLPOOL 8718c6aecab2036412dcaf962d9725cf2e6052b86bac06b7aff63273cca9363a411b4d4255e14c820216c2e035784f51718e3c8cfd980a7a2a82f4a013358da6
 EBUILD graphlcd-base-0.1.5-r1.ebuild 1176 SHA256 8c25753955a85b249613ec6b7e7c0b89f5f6294b9fcf7ad6ca66f42b49179a7f SHA512 9be8f847f52cfed58961998e5e51f03df644d0483f0394a87476c49604ddd4ec028aaaaafa2e1a24f970036345ee88ec7cfe262010702488f8046dc393182f28 WHIRLPOOL aaf75bd73e91b71d50da686610afc7df8783b816da9115f709995a12795236e4231404c8ab152a6598264d5fda47d71026a04f67c095995e9f524a3492e993c8
-EBUILD graphlcd-base-0.1.9.ebuild 971 SHA256 f399862c6abce084454a8975eed08492a54622e579098294e1b52af32f5cb01a SHA512 82440ac5e7833692546bf71dc5bfeecc5c447f9cf077d15e0e4de278aa0df7e6d3e8839793c47aa809342e4573f4aa1fd8da1fd22396918bf95716b841f689fb WHIRLPOOL 8c92c460fe053110c5430357856c1d5f37724a9ee4e9baf77ae3b156dd99d933bebc5baaa85d066a6b4fc63416a61bf658f3504219f17d40bc513005cb8e5cd4
+EBUILD graphlcd-base-0.1.9.ebuild 970 SHA256 2b80e03e6c8e6b71f42246b08348530f9fbe54d7508a2199432d4431614c6769 SHA512 68f5c181c57853e71255804ca25163522775431518ad4e90fbd6bbf5f762babb7168a7c3f20a05146b73b8d93eed8bc722213b071097864c2dc64f4f5d62d04b WHIRLPOOL d987e1bd6858faaaf4e8e8e85caca75eb6b5fb9aedb847d813cb63c147b2c29e13def76a12ae798419c9240410eb76e93ddd74fe5b1fbca465035bbe9affc93d
 MISC ChangeLog 2907 SHA256 daf03c738866d41cca83c5ec35d61126595da5c57a3670cbe695e441a7f5fafe SHA512 46803fd9fb55f10aa11721c873d57b69f1a66cbe0ee59e2117884f33b66eecaf1fcf209c5242950f452fafd50efd14a9d3045412cb72f9291d2ea96e9acaf602 WHIRLPOOL 406a0283eba3dab20e2c4da628e801f771924dd69b08ac9d3f6efc447f190dac0718ec015ecacd88e8a466dfd6b3171435aeaff893d14cbe625ecec7db23a389
 MISC ChangeLog-2015 5147 SHA256 c3079b9358e0ac52357cd37f93607483adda6ee7b78bee0f1ed9e71b465456cf SHA512 945ce36d0fe85fee0dbe8112fc3c5e58fa1a30296c83f31a0c915a51091ad0c9da4339d8aecbe3cc3767e87678a9dae68a18d7a611ccc6a335f8e5c68ae42919 WHIRLPOOL e312622663a631a040448ddf968ae3b12748c41ac4cfffbecd445290be8042f180dbc9097b66345ea0fcfc67ad6d82d691b58bf982902f3ac3d7f1ba0de8a37f
 MISC metadata.xml 464 SHA256 a5b9963beb650fa0d7db41a8d06de8b101294b3ac8a483506d70bdcd4b8f52e1 SHA512 a1c66dfad0b364ba3f03d42701c22f7e67c81fcbd03e8e5228f5072aa78d05ad0b09554173131456d789771cd53d3f77898c46ed853216407ace1786870fbcf9 WHIRLPOOL 4d0b850bee0047d079ac624e9c713000dfc4edb786d66d69b8c4476fa6587ef95b6ac33a168d6a9d242852a8ddcf5b87f3af85a978588f8a7aa7f135263533b6
diff --git a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
index 1dace97bd83c..0249fd650684 100644
--- a/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
+++ b/app-misc/graphlcd-base/graphlcd-base-0.1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Graphical LCD Driver"
 HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
 SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
 
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="g15"
diff --git a/app-misc/pal/Manifest b/app-misc/pal/Manifest
index c26fd06bdef1..0f2a8de4fb3a 100644
--- a/app-misc/pal/Manifest
+++ b/app-misc/pal/Manifest
@@ -4,8 +4,7 @@ AUX fix-Wformat-security-errors.patch 1909 SHA256 1df7021da5ebb417a93593bb7c0d06
 AUX pal-0.4.3-pkg_config.patch 521 SHA256 588701828764e094f87872cccfc4355d821bf40b4016cba688d5b32f54fe8ad4 SHA512 216d34abd73cdfd7f539d4881c25717ae2bdf919df05ad553bf4ed3a0a8e8a616dcb688f06f6beee6b2f5943f3accf1d144ae3a226ee5a2d0078d5450640eaa5 WHIRLPOOL 6a7e420364d8b5fe963ea5774f6b98369103f0a2f4b9da2bc15eb7fc327977ed541a51659d36c1c1f7c99e3a25cad32fc7baf0a07909828a55e395ce84fcd43d
 AUX pal-0.4.3-prefix.patch 1519 SHA256 535f83042a6faaad01603e56a7c7c66f3e3eeadfc9d4f2627878926d6eafd39f SHA512 428cc71d6775f33916e6b9025627027dc8b75fa66dadb4cef42b3e2167a662e04d94fff7edec68916efc3a1944f3579fa88e3324e0a131b7bc10d7f3105ea2c9 WHIRLPOOL 6c322e0bf3ef6390c7fc78e28d3774339a24446e5e95249f2941f6e74275efce12e32531699528b7925a8817f8c43310156f14c11c4b20ec1793b4090eb538e0
 DIST pal-0.4.3.tgz 130865 SHA256 ce470cb7be76522ff58cd0325ad7817b6cc2132a5e0cea55de8c9eb63b54551c SHA512 8d543706e6dcabbdeb246ff18917b490da43c3211266dc67417906eb92602a107b066e2cb156da2b5362a19ac4992d1f21dc873485d3250912a53143f8257bf8 WHIRLPOOL ffe71469258a9f78ce47deed4b488b49df466c6ed2144186852ade1a55ee670747580ff18140dba92b007c148701bfa8a2c68a260259831f5eb357f5c8bf4d5c
-EBUILD pal-0.4.3-r1.ebuild 1159 SHA256 4bcd1763e1787520bd1999b9f2ad056b745b58049c2c526d27e09743a1e157da SHA512 5eca53d7c34dd7e6c4b117234aa60609615c7630b01be8b01189e6e3c6759649c55d0235687b975c4f417778db2ef22e4d2d01740c723276859cd753e8c1784c WHIRLPOOL 517dc2f9ee32d645b39f9f835b25a5c442c1e61ac76ae4742d93a06b76d75c18b4cdd1dc49530bb4ba32ba89f99a964540f57c7b9c4ce2d5a3e475d5a8e394fa
-EBUILD pal-0.4.3-r2.ebuild 1356 SHA256 63d334c8b8c36e58091a76e20b803ad76cb0f955060e66632206c2f8ef5b2a13 SHA512 d2e331b5eba924feeef2344a7d22d40ddaade85441af0e5bf595cbd1202fae86288fd2a6a6afa7665bf97ebdcc3bb85f56ef97383876994c84702ef9ebe23f90 WHIRLPOOL 060f057fedf2759c4af1129e9dbfd569c348fd5ddd3366cd7492bafd230e45e121be4808992a5a68f48d4e75015834251a05ee27e014d7ac4ac2c2c6feed7065
+EBUILD pal-0.4.3-r2.ebuild 1355 SHA256 07d352ce3b570507ea96eb8d0f785c792941f222cb7aa6bb41dace48869c04c4 SHA512 5c15a133be6a2adbaa5634128b4706e0f189942d102edb05450350b2b869e3e8e03f0fbca99953793149a44620f95699f3f0a5d8a3239db9fafb6b28df132d4d WHIRLPOOL 336c73398c26d1f5fbb483f8bafbe2dadd1c5ef23a8664384d89bcbacf9cf29e72b2055020e35bd6bc515cce29f88a391db836c49af8be9d355a05ffb7688197
 MISC ChangeLog 2892 SHA256 c6b4a108cd2469d9af62766e85b615a4d5e4d10ecb5458db2f770e90f38aa5de SHA512 d32fb43986b2a6a2e8134d60ac3bb6cb7a5b2cabe6e4cccf2aee04d0dcd427acab8ef913d5c928f0c7b3398e297887cf967a161ca78c37fcc1cc3e4328c86aec WHIRLPOOL e41bbfc850f7f58aadd228e57adb214c351efade7d4501e6822cb5200d3967126f1ed4676b6803c126e06c9ea26c871ee2da0b00705487e912f3b26bee4e9f21
 MISC ChangeLog-2015 4937 SHA256 fe677cbc3f048730c8537a077fcf5ad31b750e70cf5db4d404d048f0a948110f SHA512 2e8cea7d7826e2a39a7a13d28a9c2ac60b240651b9f9827c8d04be5e1e612855b22269fd13ec706f1f536a79ef6fbb37b628ce55466461d7f76992df744d4637 WHIRLPOOL 042445d74b98aee99391a6a2e3613a59dffef2766117dabeb512bf694d19e2519de55244a619221f57f40487ba69626a63fc099307bd0c75a87b1d4a6bd68121
 MISC metadata.xml 509 SHA256 ded4548aab2080a1cc58bf812fd442839d6c6d7328902866ddf8b1571b25f4ca SHA512 cea3652f00f870d6db65ed87bc3b37b429cc4d3c8cb91d40742ca0dda93961d14779d348a84fe43d432e5a8dd4deb67ae2439151a8cb5c249fcf3b4e4ed2dcb4 WHIRLPOOL a6f51c2eb1d67577d368ebd86ad84dc0becb5ddb5d8f5c88e1ca22d85bbfefb7bdf75c524c1b5ab4e8e215f6551604926ad952bb9ac43fc67c216a467918bca3
diff --git a/app-misc/pal/pal-0.4.3-r1.ebuild b/app-misc/pal/pal-0.4.3-r1.ebuild
deleted file mode 100644
index 132f917792be..000000000000
--- a/app-misc/pal/pal-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils prefix toolchain-funcs
-
-DESCRIPTION="pal command-line calendar program"
-HOMEPAGE="http://palcal.sourceforge.net/"
-SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-libs/glib-2.0
-	nls? ( virtual/libintl )
-	sys-libs/ncurses
-	sys-libs/readline
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${P}/src
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-strip.patch
-	epatch "${FILESDIR}"/${PV}-ldflags.patch
-	epatch "${FILESDIR}"/${P}-pkg_config.patch
-	epatch "${FILESDIR}"/${P}-prefix.patch
-
-	eprefixify Makefile.defs input.c Makefile
-	sed -i -e 's/ -o root//g' {.,convert}/Makefile || die
-
-	tc-export PKG_CONFIG
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" OPT="${CFLAGS}" LDOPT="${LDFLAGS}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-man install-bin install-share
-
-	if use nls; then
-		emake DESTDIR="${D}" install-mo
-	fi
-
-	dodoc "${WORKDIR}"/${P}/{ChangeLog,doc/example.css}
-}
diff --git a/app-misc/pal/pal-0.4.3-r2.ebuild b/app-misc/pal/pal-0.4.3-r2.ebuild
index 75d5f9254a67..4b730ffb3e7c 100644
--- a/app-misc/pal/pal-0.4.3-r2.ebuild
+++ b/app-misc/pal/pal-0.4.3-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index f8888a12b016..553ceb3f7008 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -6,7 +6,7 @@ DIST portage-utils-0.63.tar.xz 529012 SHA256 7a754cccad2d4c3331d348ba9df51bb3b95
 DIST portage-utils-0.64.tar.xz 533124 SHA256 a53505758d04b2115f636afc9f0c15176a591f3cdb58f684cfd148b29c4783f0 SHA512 e384b88454607aa9123ac3a71d55fb16de475ba59f4ba6efd236594f42140e75650696430138cdb6e1c4e1792db091bbc1db42b1c1102fd579af6514ecefffb7 WHIRLPOOL 19e34782c2f1ed637db73865acc6c07c4162ace55c0b24287bf92c66a9ebea4ca0ab230bb94478aa71bee72280231f75dd5de4eb8fc10248b52ee77cc977392e
 EBUILD portage-utils-0.62.ebuild 2255 SHA256 521aa5d3d09a887c1971d6f2003840feba084f26ab58806bfbda8113c57759ba SHA512 7623733d270ec35228f8ae3383ec123a4593e764aad2c960ab37ad3e08e616cc60e690dc59494dfcf4a06162ff822377bda580a0393beda20ea026bf557cf22e WHIRLPOOL 74b65fa301f624495c83fbfeb47e1f1d1e34efb2531778ab2ca2df9dd42c97db5b668c6e11464071b88183637c4b38824fc669363607eaf05cfb1c1fc23a975e
 EBUILD portage-utils-0.63.ebuild 1202 SHA256 3b1d9e46fc06983f68e1596f696e5577a1ac915e2f8dc30810b87be66c34224e SHA512 59a8f22bff1da852dbc0b4cf6d37b98c8a7dbf4c1fe5abed40f771479471a08de418a4e898d90b6e52fd13a1bf92e6a3f74a88792bf52b54de27d9ae41cec3ad WHIRLPOOL 5b99ad53bdc322a9d4216c018b98d430a3f3003e8b0884be7b2613f3ca89a38c4040377f3b69502542db819b5ed96c75ad48362c5b357578680a4ab1e4a68962
-EBUILD portage-utils-0.64.ebuild 1091 SHA256 ce0ce84f03c77d99f263bbdd1ede443416c2ee58b954bfae515c047799779961 SHA512 ef73373fdfcd7dc2c205f90cf96bad725c3d9578a816548e7aeefadb6414b43dd290ca637d79e8969e8e40a41b6146a9dc28b05288719a18dcfc8f07f67e2cbe WHIRLPOOL 60332b47a5bfd03fcd8c7096a10046d601f77b8300964e05bbc2a5c58da27197fead3055077b429f254560c35ce69d9ccb588090c157de964d59c30a007416d8
+EBUILD portage-utils-0.64.ebuild 1090 SHA256 c90ed018844f52fc0738205c285adc657fbea0a94d962078a1622cd2f08e6a62 SHA512 022ed59527c945db427a97e9eb5c301730c501c8170dd3a786b8f762b474068fd456a80b70d6842044e1a1e01c9ec3032ac0e8df5d781d36355901cc0246eebf WHIRLPOOL ef61bd9430983f54c1368678307ad69b09a74488d7cf7ba3e85c1707754d0533238e7dae4031887e64c6cde6fd30abe582c302cca6e255a34cb0ebbe6b1a48d7
 MISC ChangeLog 5551 SHA256 ff22e38cd7884953731308cce4eec5c58ab6fc20346fe1f63b67b8218f5a3045 SHA512 b60867699b62397ad1eeaa58a1f7a39ab7582b73df14901a3d7fc12c7c073a31090e051b8e5de4dca5ab5998765b20a015783569b2678efdd19b6d868a9b4ad0 WHIRLPOOL 69858193d50d6c894f176dffa6ea92cd759a1ed0eecb3403d3c695211260f9301e3dac724f0ab9571f74afc2d28b3e4512f18a5eb7b865eb97c36ec47bc31385
 MISC ChangeLog-2015 29800 SHA256 fb987414375c6e0cf3014c646223045e16cb82678578617025df2a8b51c05312 SHA512 3905ac03de51f61ceaeb5873c57702459af1dc6158594015752e2b72a636006664ee1a6da783f531a27988352d73c9dd8a68aa1775d44fd9649565ca380a2134 WHIRLPOOL ee3a960bc7e66f1f5501b2ad24aedacc7fada42337a3f3a7a6478098e48177f8c334749b13272fb27ba4ddefa37dcc3d85826decabe7363230bcb80973cae427
 MISC metadata.xml 214 SHA256 67bae2549564e628c2309c047a10077b3864da7f3903a79a64597be1197ca4d4 SHA512 d0c4ab837bd2d936086900fa4ad3d048ad069bfbc58dc7f07ad3819b383646d66f392407314bfe8f542fb8b0b2ffec0848bc7b2d122469f23b9ddaa4aec0a9cd WHIRLPOOL be2c2d84627f9fd53ea5a6b1d1e7bb570423c19588c69157546fa3f6d615be5f98caf2227a0d218ff4ca5df3433baefef6f6d2d7b1ecdec773f8ba8689477758
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index 3d08632ea6b0..a8fc399937e4 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-text/djview/Manifest b/app-text/djview/Manifest
index 8fefb973ed92..1aca71315c7b 100644
--- a/app-text/djview/Manifest
+++ b/app-text/djview/Manifest
@@ -5,7 +5,7 @@ DIST djview-4.10.tar.gz 1077198 SHA256 7caf7ee249edd994092b32a5573f111b2337ec991
 DIST djview-4.9.tar.gz 930676 SHA256 d150f557aaa073356d77c1f5e566a6a566281df5f92395b6822139f0e5c90e0c SHA512 dc2862d673eb77cca77a512a64257e7b37707789de41362fb62295ef495201a81cf31d0282a88ed70e32f8c7cd5643b568ce9761297d0e61d72fdbea7ecbfa94 WHIRLPOOL b522f9ba7283430fa7134f172b6a358c95da03e10fcf1e5f55bdd5c9be1f2929c07682e48e3a90695c838dfd2ffb875794c95e70d4096dd9595da402f76523fd
 EBUILD djview-4.10.3.ebuild 1977 SHA256 f2cfe4778660d5c37877c878add10aa1e064d367872974d7ff130532de9ca37d SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 WHIRLPOOL 7bc2ac522517b70b93501f84763c506eaae126a5e13fec09577fc817c0763c59ca5a7abb94391efa5ff17b95109b6335948ad2384ac0f45d668e6862eea3f2f8
 EBUILD djview-4.10.5.ebuild 1977 SHA256 f2cfe4778660d5c37877c878add10aa1e064d367872974d7ff130532de9ca37d SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 WHIRLPOOL 7bc2ac522517b70b93501f84763c506eaae126a5e13fec09577fc817c0763c59ca5a7abb94391efa5ff17b95109b6335948ad2384ac0f45d668e6862eea3f2f8
-EBUILD djview-4.10.6.ebuild 1977 SHA256 f2cfe4778660d5c37877c878add10aa1e064d367872974d7ff130532de9ca37d SHA512 538d5f93cf7bd1b9201ddb8fbd2eb3374137c47f8e3624dbdcf44e3b823e72e3e7d8ef041af35c52f4d36f5abb36d19c68e4dd5c24ed8ae05dd30a4cafb42609 WHIRLPOOL 7bc2ac522517b70b93501f84763c506eaae126a5e13fec09577fc817c0763c59ca5a7abb94391efa5ff17b95109b6335948ad2384ac0f45d668e6862eea3f2f8
+EBUILD djview-4.10.6.ebuild 1976 SHA256 1e221b5279f0fd482f619287452e15abab6111a3a4df290cfa76406b5e845af4 SHA512 26c1a9e264a6eb7f568a0eee89b2e1169c4ccb370a53ae9d2ea34a68084d4fd5a08a970759049a9de2d20a6b69f02b7276dce92917f594988a99a344a7ce2393 WHIRLPOOL 54a937ae8f48cd628ddf9a5a1eb72fce46fbaf1b36cf0023dc75bcb80c4968906e064d564f2de0071cac0cb4962e5714d536750f0d3e691f19639a05019a17fc
 EBUILD djview-4.10.ebuild 2027 SHA256 8fd1ca7732a3316070bc49a7c2d20293060948e707b3191f8bc91b80b438c25c SHA512 3ceea3d4e3e82acf37d6612391b9f9d38d324a3e2a2ba8f8c6e667cbe5bf43cbf40c4fc5f2c055de82f521dbe8d76e448169d531e815d061ed5f38928d93cae5 WHIRLPOOL 889ed1d4952d3357326b112ee878f466c301cdde8fdb1c7cc55b1d6115499147ab416042e83c9d6959b2566faf7d68f60667b9d3f3b7badbf2a2393f526fd4f6
 EBUILD djview-4.9.ebuild 1946 SHA256 1428584544fc2df1a55eaccc63715ea1bffbd0a865becf4c568d955da48d20ef SHA512 d9c66756fdd98c2ae8323a1c23f5f171b205e8c6dae4c6de256c15fee6bb3c870edec36b4278a8e524fff7e7984cc657d97c4e54aee890e9bac9295af674ff36 WHIRLPOOL a6e423153f655145fdde761905425c4997af6822a774817fe0be10f8e34c538d78137e0a8f177b27a947f7c96ec8397e1bff453f0ae3abb3354127c084882563
 MISC ChangeLog 2944 SHA256 b5c6ee3a693076190f6d1523bcd139b473531766262cb65706c44933f986db48 SHA512 204b34144ee1537c37c39266e57525935b9f6433d2820f841c6f507da1ef142d2440c35819d14df9364efdd0f7f4b7f76dc254e4610d4923b17164ef748e1ac3 WHIRLPOOL 49fa4a23e396b43fb07eae4b391d2258ea71166e7a768f28149bef00ffd85f21d6ee3de2dbfda15f15cfadab448b5da0548f8edc3fecfb74efdf72ebc587b876
diff --git a/app-text/djview/djview-4.10.6.ebuild b/app-text/djview/djview-4.10.6.ebuild
index 21dc4b949344..a498817ec695 100644
--- a/app-text/djview/djview-4.10.6.ebuild
+++ b/app-text/djview/djview-4.10.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 x86"
 IUSE="debug nsplugin"
 
 RDEPEND="
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 268e14656a4e..fe66e07f098e 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -23,7 +23,7 @@ EBUILD jabref-bin-3.7.ebuild 864 SHA256 0c8bb85eb692aab866229f838ba3d79a6f77b85a
 EBUILD jabref-bin-3.8.1.ebuild 951 SHA256 ef3e46804615b165fbc911ec3ca1cdd88adb97787f033e4ca246e55f038dff48 SHA512 6694b2a83bcb8830c754b5fe79284dd4936070b2ce0ae65426482fe869390d8534212b6824c39a3be1bc5755d7bc458959185e9ca483f7d2444ec0bd30b8dcdf WHIRLPOOL 439fce1e6bdc24602642679ad92b38bcc136144e1da9a34061c5d5fcaa923daf4c74eca58da1386c32e079625fcfad8e7e9777762acfa98865701bf76a5ca3dc
 EBUILD jabref-bin-3.8.2.ebuild 948 SHA256 769b68487aaf6b8ca579108b43d3e14bf275a5ecb3dc8c3177b21021c8875d6b SHA512 efb238a6968f7179e77bc8a94fdda4922a312006ecce947eb8e8ca310b6285b282377bc9bafb7461b34cc846c85e0acfefe0b6c1b0e470cb5d121396f46618c8 WHIRLPOOL 785e7031d637db2ce50f40b326f8378007ab7982b9dba1cdef7f7ad1c1a44c1b1d5aa92ca4d9f69992093952053978e7f47bd086291d4a9c2bd6e18ee4ebb6ce
 EBUILD jabref-bin-3.8.ebuild 956 SHA256 430e2a4bc90f99001d78dd7eb21128455cac12ef5b71c688648016b1ce5ba272 SHA512 fc4c01169ba38ac8beaece6f2240791eec8c361b0a72bdca2fa26262115ef8d7e5c64b69d8398c21c7ee6d41597c837da6fb1aa3aedeff18f216228bab96de1e WHIRLPOOL 8e2aec29ea93e8385ba19f04742a2cab9017091207a1e10348c8128b3d8e619ea463119417759aa056771e6ca406dbe5237777e358afc0b8c8ffd78ed6731ef5
-EBUILD jabref-bin-4.0.ebuild 1008 SHA256 e9d908d4ae24adc9fa44ab1992df9d8949e782f7893b9728702f40f0d65ef833 SHA512 198d06693560216ee0ec65c231a8df94e6af99a064b9d23b5999f896a62626e29b6dc55c479a6cb26ea85363aacff1f45614213d77c35126c499ecabd456b676 WHIRLPOOL 06e3b3fda156e9ac105d19f75bfaf9c8ca35fae683777d8d4e51792fdf94e4d1418dba749e511afd023f343e15d774cf83b8364c23886a9ad9429dcdaca68c8c
+EBUILD jabref-bin-4.0.ebuild 1237 SHA256 a2540a274de4c3edd824b8108ec788ef79bd09de071b1dfec99457f690fb2d1f SHA512 dd902f44aa68c67b7eab9696969cfdb03d49e1d11d3c6fe50171fc3044bef73884803c880618a39152e8bed0e94975f6a48b891e9a3a2afe31a54ebf54bb5c18 WHIRLPOOL 87938720f84e4ada89cadeecb80fd8efe6a6303dc720b8167e593ad27ff52c5d1be597932f70099b9bd99e07af2c82ac5b0620a4555e518fa437ce3e4972f34f
 EBUILD jabref-bin-4.9999.ebuild 1209 SHA256 b0a631edfd8751f82f0502e82357f03601b9dfc140689ab83ac488e30a5c5c96 SHA512 25b5719b5f88529cfbf700c2da655f8c203cc6548997f53bc18866bd3675c4e769168e457781824c8f2b83298c0d8f10d1b70df858cb2a437cfd9506ce555e6a WHIRLPOOL e490ee75ee5b565fcde984aa542de051aa98de3fe0071df1c927fec5a23d2523d0a45e2d3e3cc40996077770ae80101b5dd487185156cec55c36362945e11bcb
 MISC ChangeLog 6179 SHA256 2ded29d71e74422e71644639b0552a2ad2b16e5f865b917bfbcb3e39f6e4b56a SHA512 0e72d7494e5cc56699ec4dc63b3ee40c4c2aa4fd0351828b99fe1b3003e0e8326c92313154863918c38f48b02b9abfab12cb659cadacdb0bd86b380501ede9f5 WHIRLPOOL 2ab3b0307abc8e378644dfedf72c5314b9a46ef05b30460459acff798c50903dc402ae62f1307298ded3fc2d54d858014a36183cb4af5466b6a241312af000b4
 MISC ChangeLog-2015 1106 SHA256 ee587b34ef9ffa585089c57bbd8dfb4c51b50dffb590d4982a1a126ec04cfb5d SHA512 2855bd32273bdc948e20052168b52da82376a47c077a49fd6f7733e747660f690019b6b74a191c4eb5f7d77997ef66a38f8b38ee2095024c23cb5498f4c2b412 WHIRLPOOL f16c439fce25a059db2d30f4e88b70b224b5cb0faef0b35b161a54dd07dd4ce95e3b0576c54cf0258e7af85e24da791b553d8243c9bbc6924679a8e003ee7d78
diff --git a/app-text/jabref-bin/jabref-bin-4.0.ebuild b/app-text/jabref-bin/jabref-bin-4.0.ebuild
index e0c651fcf39d..05500ee88f03 100644
--- a/app-text/jabref-bin/jabref-bin-4.0.ebuild
+++ b/app-text/jabref-bin/jabref-bin-4.0.ebuild
@@ -42,4 +42,7 @@ src_install() {
 	java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
 	newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
 	make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
+	ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
+	ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
+	ewarn "Jabref 4.x is under heavy development and very unstable."
 }
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index cfcd79beae24..cef7817a3e69 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -4,7 +4,7 @@ DIST texlive-20150521-source.tar.xz 45459552 SHA256 ed9bcd7bdce899c3c27c16a8c5c3
 DIST texlive-20160523-source.tar.xz 45941100 SHA256 a8b32ca47f0a403661a09e202f4567a995beb718c18d8f81ca6d76daa1da21ed SHA512 915fa2f5e2099dd385ef81033db7aafdf09558c0c200fed0748a8a42fd61f69d3eaac9decea334e30981af739dd81061a9b1d6853c7f6d00285fe0be40e26c3e WHIRLPOOL 25d27fb7a7bdb47d40ddf951394e36546b184d71f2e09adb20698bd0f960e54841ddd0313a87510cb2ef43953eb4d9d05d30b88d25d15762dd774575c88fedbe
 DIST texlive-20170524-source.tar.xz 63483372 SHA256 0161695304e941334dc0b3b5dabcf8edf46c09b7bc33eea8229b5ead7ccfb2aa SHA512 18c18940992ab94ce22e22ccd4ad798253ea14ac2ab296a10ea5e9a8da9f33989f2e2641b42b564d1d5fb53bd371da3e68726b676d706b469016ad146cd19daa WHIRLPOOL c4edaf427f0249942b36db105a65474e833735d6e9954682fe7e15ab327b26ccafb9174bf806d0b6c629b0f2a6b55e80022af291d9a2f377b82dff4fdec42d3d
 EBUILD ttf2pk2-1.5_p20120701.ebuild 1239 SHA256 1213e531972c4b47ce734afa036eb49bc93766e17561fddfe5b669557f9cd6a3 SHA512 9355cfa4939a456457b8713612a001ac913f56717c94baeced594fc2ca774bb31515e66d3dc4c862b8c8c24bffefe9dc38b5a5d6c2b855da96d51c0fc94a6628 WHIRLPOOL 8139f08a7ddc81c23daa0fecaefcfa1fa7e7804d978b6e52ef6b1e27f9f0717f230f4ab53d76f8d87fcb647b9a86d46dd53b2491c0b1d506cb010642b39b405b
-EBUILD ttf2pk2-2.0_p20140525.ebuild 1388 SHA256 296dad7f664215bd71ae41ccba095948bd612a6afb7fd00d7d44ebc949a1e20b SHA512 9091fa12d51f2892cb8278eff5ec143af399fa17421db64ee2eed9531739f27195ab6eefe6ac7208723d0ee1adce95762f26306a0c53178d77533a2aefcaffaa WHIRLPOOL d5f8bbd46f59745dd442ec404ae82179b4459559e1bd752c5f19a8e5beb0aa13bd5791644cbc3e8c2d19b05c0fae9e05506e403f6c0fd99a5a33573fd745b540
+EBUILD ttf2pk2-2.0_p20140525.ebuild 1394 SHA256 ac8328e3757f1be34285e0ed94715ba20291af956ad0e65dcee426c1ebf67702 SHA512 b4e0c84ace795f4f1613823c6af36e4fd281e39a5c071a84613d062138241b06718cd5427f3b71df41be7cbc92e8a66f0e368a21d64fcd6e9c48cc7e114af972 WHIRLPOOL 18d0422b33b9a4f80af7e59c1d4f6d9b475f9f4c94e76bba8f9dab0a612670ddae9627ebdac8a91b8dd44b8b321e4bfe797315438b9fab92366b5dbd00b6f951
 EBUILD ttf2pk2-2.0_p20150521.ebuild 1380 SHA256 d1410d5acdae188a1bf965ec4ea219eaacac330dc7c0e3e337eb2410798b1828 SHA512 86c034a1d85d74894efb55ad7b6aca38606f8291d58d993dbe17c124e44cd71bce7b8aed5e4264e45ce4d8b43ce8e8e6108f42820d86e23448f62f7576219065 WHIRLPOOL 9534f3ec9c54493759c7fb52cf063e3c8d2c5682dc61055cc1adbece360304d1f540b5a4c3a7353fe1be976be7c5ff67c4a7a65cf3046e46837d023ce3059706
 EBUILD ttf2pk2-2.0_p20160523.ebuild 1251 SHA256 2cc838e8bc8dcbef1049f7a0c05c2c9090ea8d4e07c5f588c716e053b36c3fb0 SHA512 aa1cfe98ed451aaa6066e4815698113ea0e925b4361eb50ebb51935089f26ac438e511eb06d74dc7c7737981422718a4e4fe67b5aaa839594d617f0c488296d8 WHIRLPOOL 3f8837c372c6f73cadfb53fc32cb720cf6877933267ba62a8e5981dd84272fc9b53b1df06218553cbc0d1715f0153a88c115494c8caf55877fb82ac52098960a
 EBUILD ttf2pk2-2.0_p20170524.ebuild 1266 SHA256 4f7c89b7859bbaf912570369d260105e305c37806e1da3ad4f09f65ddde6f61f SHA512 0c17973b15b3116d628d1a300529f2926a98899454be50ff121687dbcbc3c6882178a25d7d9a7acb236f2dc29a63a445234d75e59b7d043c2a43abb661182dd1 WHIRLPOOL 56a5848f511141831af19885670e4bf557222763cc4a48948b9b1426d7d0e94ffc8fee91b7c73bd4f76ca2797efc75f3560a4cbe89fcacbb5a26b3e575f80aab
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
index c0808ea59598..bfadc797558a 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20140525.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/dev-db/m17n-db/Manifest b/dev-db/m17n-db/Manifest
index 5b00f7507c68..22ca88255663 100644
--- a/dev-db/m17n-db/Manifest
+++ b/dev-db/m17n-db/Manifest
@@ -3,7 +3,7 @@ DIST m17n-db-1.6.4.tar.gz 1390344 SHA256 530ecb1615a9a64d4caca9ffc59c0dd1c551d34
 DIST m17n-db-1.7.0.tar.gz 1939608 SHA256 a2ba9f80161433d5c06e57915a9cd51f26c6df4a8909723f952cdbb9b48508f0 SHA512 02c3cb347e9f5c840a723de9ed85be84fc9fb5f86d4963f0d1c6b669045d37d10e5efcf5ac0e0c3cb7249fb391b0dd32bd50fbc3332455aaf0b49d96fc09b2f2 WHIRLPOOL 821071ea60a947526cd92661b9246732379cc924cae0a0a21e141a0cb3e59834633bec20e0ae01a9c66529f09bf9353696f96f2dde4120b2742fdf6ed338e4f8
 EBUILD m17n-db-1.6.3.ebuild 507 SHA256 d533ef17a97415bac97d66d9b86a9e58b9ed539982be0be54b5985416110a44f SHA512 260a94b0e5fe3b506e9f4c667fa4ea065656c1308b2166e00f253761e479ccf99fad689e1ca6175b822ecb9b4b9b75179441e634d91002ca12144b3071ac6b5f WHIRLPOOL d2d0b2a6ebe98a2f7d7b89f9ce1ede12cb637e556162ed369805e4c393765b99c5d3d06ea0386f60dc10a84959826a5e66e3282cfbe84c0b2113a215e44fa8d4
 EBUILD m17n-db-1.6.4.ebuild 514 SHA256 1ca2f615f4f4a2b781e85d05466766e8fd02c5590c5ccfb796bb7466ff8e07be SHA512 96e7e70c793b1ce424bbaf62b465d9a8bcc53c0357bb4a3663a86581e0fb45926c3f13c684ec049361f0a047d2bdf70928177e984220e87dc93e3dc717a382dd WHIRLPOOL e108c343d4e1b8c111951b19550594cf19087d26afdbb9e90c9b0c55a996876a74ddbf83e0991fcc6937f213b51f65a136be6ccd3d3d3d7945f8da63b8e501a7
-EBUILD m17n-db-1.7.0.ebuild 598 SHA256 d483e2bf6ba04b94f087721be0db9212eec7b1355553c005a7121c20e79739ee SHA512 84d1c0d18f131ac8bef9d04fd745a2a47d33fe9db9e8df3dce398b6cec5e68707492689c484bbcd11385dec2e32707726cc9824cab3de2a1cb2331bde6a16e87 WHIRLPOOL 34a801ec6838c4ceeb0a148216f917c88c628e89d4c5fa301efa6f147ea020064270a8854e175dab1654c1dce6333079ab4cb4b319c4036b3fa5cc5c65eb0c59
+EBUILD m17n-db-1.7.0.ebuild 597 SHA256 18d522a4bc95e4341d4fe75e98ed571b02efbd6d225824f88e13b3cb9dba6a50 SHA512 35f34a3ffac1a5b5dfd18a2cc80c3a6a8d1864a54f40677939332c0b722f9dde1e4f311762260e6a99a4276ee72b94e20fc70c3b443d580b801d1061df7442c3 WHIRLPOOL 77e240f716c6cdb66e9b76a8eafbbcb284d2b28205e81df122dcae10c390eff695c96dc1c898611571f0f8affd4fd3ed54b3794f579c7f14c3d9211dd36be6db
 MISC ChangeLog 2683 SHA256 ebd6c23bf3f78ebe13ad1da5afac8ee0a5c49e0948b9eae1a6641a9ef661fd8c SHA512 604f1af9bdd07190fd89339cd073f51a483e29c9c9679454b820a11209876c819f6cafede313372531038b5efc44f32a9572d98cab5532ad779a6061436739e2 WHIRLPOOL 5982919ad90614ff799698282c2aba9e2f957f65034b1987a78a7bf092b7e6ab7076750697a23b5900abc4673f1d020063e7f6fce26c578e72ff6430379a2082
 MISC ChangeLog-2015 7585 SHA256 a4b55a0d559ffa34e7a483b36fb4c9592c2707b3ee48c2ff240dc3cd9f1f4aa3 SHA512 2d7e9223783594d680629e123b5f6ef209d21481e9648e1eafa1ed9fc6039631d8ad7a92fcd39334739aaaf163402e7aa782f5368d64f311ac02371dc850a44a WHIRLPOOL c40f58356cdb3dd59e0ac1997c9dd26607a795fbd8e270e90033142b60323f0e3b26bc9818040a9fff290eb88c455822b2fb905dc32030dfbf3e16642cda940a
 MISC metadata.xml 240 SHA256 4351b96b5a18595fae67161f1207f22bbf99e9a2235b95b68975cfc9f5baff54 SHA512 12aaa73d9b690de68a5c7b20e214ceb099efa87884b784eafd994f26032b44dcb66e7feac8a5b1df7f349ac05c5a198a7593dff2cc686de158cb21e4c54f38dd WHIRLPOOL d279940dd88c4b1caa478907576d5732c8376e3f99830950c6c18c63dca78c7d0ec1983660e5cbd4da0133b961ef38dc8460650cb48467298542e04005cffc2c
diff --git a/dev-db/m17n-db/m17n-db-1.7.0.ebuild b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
index ae636d4d2f5a..3fa8d57123a7 100644
--- a/dev-db/m17n-db/m17n-db-1.7.0.ebuild
+++ b/dev-db/m17n-db/m17n-db-1.7.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
 IUSE=""
 
 DEPEND="sys-devel/gettext"
diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest
index ca4690396016..f10cf6ec1623 100644
--- a/dev-db/mysql/Manifest
+++ b/dev-db/mysql/Manifest
@@ -11,8 +11,8 @@ DIST mysql-extras-20171018-1948Z.tar.bz2 313540 SHA256 6b910637f7ac2d5132154357d
 EBUILD mysql-5.5.58.ebuild 4402 SHA256 f90aaf2c42115fd18c583cc2069f7d3e8a9525dfd9633456f4d24e024620cd3f SHA512 1e1a3e4a0285cd2b51763e91dfdc95daff97d2a2739d0b5938b1f2cd7f95dad33f01b66b0919943550a4f07922b33b69462528fc5c40f501e919444d22ef9916 WHIRLPOOL c7d790a65fb55a1676bf079ed8c18c710e41958a72cb9678c88a756a3d96d6894ac3adca9933b3ad3728bbae5ebebf3979b28146b0b5ee6bd1276fc675f85611
 EBUILD mysql-5.6.36-r1.ebuild 5950 SHA256 aa2069134693657f666cbf7a100701e334a74f2acdeab5b609038d2ed79b6c57 SHA512 864b0a2be4a822855369c19a7c2879b9909caeb607181dc8e6b88617abd32c6ac93f006135a2ffc14a72f170d02a5ea9c80274e3c1cb0c00c253ca365583ae55 WHIRLPOOL b335dd3da99eb6d28a12d85ae1393aab72a9c9af67b3c8087d187fbb0b7f89cf3b69598e76c3f07e74636a0205808ce584d570bb6b9e2ed5b3dbca856876e730
 EBUILD mysql-5.6.37-r1.ebuild 6169 SHA256 4ca65730c9608696fe46ef85933ce11076410aebacb5d0868665149c0664170f SHA512 97c04c4efc40db771592b0c5835b48520b3b5c6e99084f33c43cfae2f74883b99ecab35d8bd646bfe5e18717dd398ce946695d82bb8f7431b914e7060c8603d5 WHIRLPOOL edb2d8e3f65fb1be6a2480442aa72b027cb6fdafc1a541cad3a9d654aa75b18f2939512a747d1926593a9b62b0456191bd4a54dc1346b455575dde31ab32aed3
-EBUILD mysql-5.6.38.ebuild 6233 SHA256 59e4e3d8a7529b8ad6d382045f283ff4f96b6c48940f82a0eacb57b7cce604c3 SHA512 f20d08986a7259cb402d4f6207f6a67eba1c3257507a083a0f11c14f7741235bd76a3feb17d102ead26e5dd1d36eafa4853f1163632204df72ece15e3743b0bf WHIRLPOOL 33761b4d5dbb9a7a9d36cc8d9abb02e471d2769e0b92bb2ccf199b9a373a6129bf2ef8eeb42585b279022500636df060677f1e16131fc07aa777eabe1921fcb1
+EBUILD mysql-5.6.38.ebuild 6362 SHA256 528bf9ebea455f90b01b726e142f51431c21e9eb9c913bebe38f50ed3b62a08b SHA512 8c9813ea4c8d289d7293f2ff0f991e51aeccd44bfd5f33956e99cbe8f71a94b95ebc0c86517c8796e201068f94a740c4eed8fc6bb8bc19171cbfb512ca909606 WHIRLPOOL 1337b2a3576b8076f6d19c6f21ffe240945b5fee64cf6ac93827d5151399b66970504d4025d6d830b646ad9e5f418adf2a229271481d9993f5530a4b2b65f6f9
 MISC ChangeLog 18776 SHA256 3ff64ef7497a470510146081692817768857fd4f297b98a184202f5fd06f0a47 SHA512 bfcb679245574135e7e0b7f0592771954bba01b6977ca4ffc8a37de181fb7fb60e6bd8b7c23cee0d41c4397341d282f28d43fed11eb176f12178123e0f8032e4 WHIRLPOOL c4601fb0d1ac3238f2d69a439463d66a67d843c197a55f4d9b436493e979393047b9549053fa00b46a3ed3719d72565ebad38c35ace3abab145e751212c047a8
 MISC ChangeLog-2010 108404 SHA256 93dda53b8871d9040e6aebb59f095a8debd5c0a9437e78e5e949989e209ba5cd SHA512 5f54b7c2e25d27680a9313da2450851118e34a57202d9f36f59da52834ca3b587701d93868d71bf684ddc253d49f87837c8d7e2d442f2955dfde8a701150fbe5 WHIRLPOOL 55f758942e3012aa0ae7d529c2f8b6e0d8f4d7cbde09039f16cd05f0a58fc4e3e09ccd50e366effdcaab4641300eb0f494ddbe3a35a645ced8a9d747d80e9821
 MISC ChangeLog-2015 27542 SHA256 997fb94e9984a271cfd68316c0012c16f78234b1aad328c2c5e97e2940f7dcfa SHA512 f07244cfb59f613fcaed97ad0ed135857ba995b616962b145548ecf84176666986fc9fb5e55ec543110755e73d316ee5a733cfc1ce14eb1ca2a1449adfa50859 WHIRLPOOL aed27d4cb6a7cf33d354fb559268baac8c7977dd9cdc821b12af8008c94dc22d0dedace9e33caae6bd676405a3a02628e1a8ae8d3baac46af33b95251a94c70f
-MISC metadata.xml 1654 SHA256 16592a197951904e3eb76dd8c1d3aab1017ad91bc7f00075eee29739987ba324 SHA512 18a59971c3eb563ca835c61719b67a4466abbacbbf13139acda8fd3a3197eb40d15d1b230b0514472a53c7870a3dbdc1b875c83842737fc4e91a077b2507704b WHIRLPOOL e2aa493c466978bba4b1ff6b9ecdf9d7595f2930995e1da5c535d3a863881e174524138665762213ebe4794bc057082ee88344c5b96c460c59167bd2d4e14ead
+MISC metadata.xml 1777 SHA256 f21f0c4cd84c90f568c8ce06d53fc35ce28817d5a3be185ed4196dbbb3e1aa3c SHA512 089e8752a6658ada634a019a4a77cdd70560ef001d9f7e83d38b0818253563f2819c3fd78186b6194b3dd3c34b2103ca75f7cd60d6a8a84f96041f338d771eb5 WHIRLPOOL 22777c696f8dd443872f6c5627932d89280af7c85efde3d9176602a4753f9d9b1020e87839b636a96fe190c31991b898f383f597eb3730c418f4b1d3c67ed499
diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index 8e45aa661e8f..83ee85b777f9 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -21,6 +21,7 @@ dev-db/mariadb
   <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
   <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
   <flag name="minimal">Install client programs only, no server</flag>
+  <flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
   <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="server">Build the server program</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
diff --git a/dev-db/mysql/mysql-5.6.38.ebuild b/dev-db/mysql/mysql-5.6.38.ebuild
index 050b1e092c8f..01d0263e17be 100644
--- a/dev-db/mysql/mysql-5.6.38.ebuild
+++ b/dev-db/mysql/mysql-5.6.38.ebuild
@@ -13,12 +13,12 @@ CMAKE_MAKEFILE_GENERATOR=emake
 
 inherit mysql-multilib-r1
 # only to make repoman happy. it is really set in the eclass
-IUSE="$IUSE"
+IUSE="$IUSE numa"
 
 # REMEMBER: also update eclass/mysql*.eclass before committing!
 KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
-DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
+DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )"
 RDEPEND="${RDEPEND}"
 
 MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
@@ -38,10 +38,6 @@ PATCHES=(
 # If you want to add a single patch, copy the ebuild to an overlay
 # and create your own mysql-extras tarball, looking at 000_index.txt
 
-# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
-# disable until we see what happens with it
-MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
-
 src_prepare() {
 	mysql-multilib-r1_src_prepare
 	if use libressl ; then
@@ -50,6 +46,13 @@ src_prepare() {
 	fi
 }
 
+src_configure() {
+	# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
+	# disable until we see what happens with it
+	local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 -DWITH_NUMA=$(usex numa ON OFF) )
+	mysql-multilib-r1_src_configure
+}
+
 # Official test instructions:
 # USE='server embedded extraengine perl openssl static-libs' \
 # FEATURES='test userpriv -usersandbox' \
diff --git a/dev-db/sqliteman/Manifest b/dev-db/sqliteman/Manifest
index 98fe38acf414..d010400501cd 100644
--- a/dev-db/sqliteman/Manifest
+++ b/dev-db/sqliteman/Manifest
@@ -4,7 +4,7 @@ AUX sqliteman-1.2.2-qt5.patch 11317 SHA256 5cd44c0b5e4387758b3c485365ed97f2f766b
 DIST sqliteman-1.2.2.tar.gz 1579855 SHA256 2229e627528ec02a9cf7aba3a65bef8999272fc25eb22112dc3f8ee583eb5dfb SHA512 ada8315247723c6cbb9a4c235ce427aed3fcbe6f4edaa3ee2f9c31c1729d71a4bfc874bb7ca561f2a2c9afad092e2f90c7871646eccecb3e71bcd50d1164faf4 WHIRLPOOL 73f6bee7a98e46ef6e76dca086f6cd9379f3f7c8574df70f92d21ac68def0aef548350877eda319d7bedd6b34f5f128db839ef1b2c583a7ad5565a4a78a42d6c
 EBUILD sqliteman-1.2.2-r2.ebuild 659 SHA256 e5a7d0189a76a303a23cec6b1735d3b02e4c1fc13942f4994734e0ae0788bc36 SHA512 56a3746bef61c5a750c2c7fff27dc02f1a535b9ca2ffadacf864753a49ea52444eaac22c7dc26464e07b034f0056167cdaf56d3a6b70d6d72ecde02137bcecaf WHIRLPOOL 916799ba2a35ec622ceeb02c0eb2c7cb30fbe9b7aa20d6bf0b6615f15e54a1c1bd1acd81ee1ba866d0ec3608f2ffc61a6d65480b25b2b2ffebe61e841da75c0f
 EBUILD sqliteman-1.2.2-r3.ebuild 680 SHA256 6ebd8e39aa81c95bdc65e6f03a6975d71ca82eaca9886bef91a66e8b9a8305f1 SHA512 24abd2d29b5740f05eba51b3663ae77691df586cd07f313273902445a6381d809b26a2694017aa2d6374efe5f186d7b97737c9d012ed4db9a6cb149592a85c91 WHIRLPOOL 0ac27daceb409f7e72d9104850762335903adb98d530e8ac9acf2c9edaca1a3f3622dbd74d9c1e59e80bdb49afa33acaca73d48612ff1aef8eb13ac2c356e4db
-EBUILD sqliteman-1.2.2-r4.ebuild 896 SHA256 7b18ab33b2c667d816d92039e089108f983e8d6094bb7161fe014fe60d698c85 SHA512 e4229ea3c94bbb8a741182b033aae9375d9b2aa422d049a6a13a63e1852b07d513448b0932567bcbc15bcba68b2c3bf98126c1aac80697180dafd87f5a05be6d WHIRLPOOL a712f8f90cb10737c6ae0d60eb93bf7b4f35902b1e5d73f07e8ace15342c55a44c9cbd00528cec6e15f779ad8eb157337afd5a73f219158195187236a0f75b4a
+EBUILD sqliteman-1.2.2-r4.ebuild 895 SHA256 ffff2ed1d92fe75698c0fcd98339001b7045d18e591c2ccd51e9369864c4da8b SHA512 fb1dd1ff69dd23db5fd03576869b6a7b5474d0487f3fb9fe6d6778dc6284b1834a44185f876a735fe3c12bad1a50033488a4e29544656b7d93cdd9ed083c5d07 WHIRLPOOL 7427fb72a5b56759ff4e22e10809e39d559c652e5d9ac5ab4d46a8e2d042d27d6e4c4e2cade9637d3487ef73542e9df1bfbcc8db93c3c3f972bd64c564d59d96
 MISC ChangeLog 3476 SHA256 c9ddffe6aefd0b0f18bd6f93b98bd254d7f728ad9a5f768d5d1ac3bc745ee91a SHA512 fa7ccff18dd334d20a636783b8395d95e27b46dbd401f3a5e64d9e9e90c0dcaf12ef2a8fcb858fd07565dcc97566b42e5b908f1c09d433849b048cbab9fb5d1d WHIRLPOOL b91a6800f13796d66b784266b000b990960b2fdb1c00d08fb3b44f13b49092463a504ee742d222aed4bb2957a9a5d32036f55a04f30908753aa9e0b0b4882916
 MISC ChangeLog-2015 1667 SHA256 ba16bedc2ba55ac810300de58f2f3fea81b5eef5e4a8c467323200e3c94c4290 SHA512 1199bc0c7acb74d0000105d69acf448bbac9f4e40999e3adf6a28343f3d17318e606183ac5bb5fee3667237442571aa48499c17f6e63aa1d4f69cf872fcc68d4 WHIRLPOOL 11b650bfaa1dd418ac08fea148b71a7f31db899fb7ecf34b5a9e286bc9c54d0258de98b330c29144b051aa66cb63ad58ad28971fd4d994ce39d99e1f48e005d1
 MISC metadata.xml 326 SHA256 e5809cdedbb1bf2d8c70f0df907f780c75d89412b8bb19cbf464bb7a70c681c6 SHA512 28cfd089b3652e0bc89c32cffa6bc3c6a10dc84ac786db5de65155ef2752982fd167f5a916f1738848e1bce5ed86d335f463187ad532db06e90d5ce6492f4d53 WHIRLPOOL 142f8b039fc64b663505b4f53d50a0109203cae21914c3df67e1dc9260197b43063c9550010aa5421faf35c31902f599df41aa48dbbefe3a4990d5fa9586a306
diff --git a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
index a7645ef0f775..ebe92bb1c46d 100644
--- a/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
+++ b/dev-db/sqliteman/sqliteman-1.2.2-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest
index 19e9578c95e3..a53508d7a9d8 100644
--- a/dev-lang/erlang/Manifest
+++ b/dev-lang/erlang/Manifest
@@ -2,26 +2,22 @@ AUX 18.2.1-wx3.0.patch 3849 SHA256 b0e1d2ed833feb0f308060c2a451fcd58fceb68c9c634
 AUX 50erlang-gentoo.el 134 SHA256 97e1da82cae31a554134d7370739520e4c67b2544e5a13f887651a62e710b4d4 SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473 WHIRLPOOL 6080f0f76c90f2e5f4577e8a6fc6dd046fc671078eda215c5bd33138aad61c2f2dfc585372966b65fcca24a46df0921a3fd2c4af02c68ef02f2fff443336c702
 AUX epmd.init 407 SHA256 fdd497f5bd350368286c07c291b9144a174cec0712e9622713ccb664dcb57f2a SHA512 9a9d1c0d512e31254170a601edb3a023c1f0abfa9c02656ea86cc04f38bfd4b3bffa131cef2c20ee81d3f62073036b0dcaa399736be7d413fcfa48e4001a5304 WHIRLPOOL 671f673712abbf91171006ddb12f9eb68bc0b8569f4c472a6aee0c837ac790deb4df6f04914e9a2c778fcf2b69188b793f6083aeebdf549c7dc70ea89dca4f7c
 AUX epmd.service 138 SHA256 689a50cfe05cf644f62b2308920f8ed7f602e1de94d53a67f5fd37eb0249ef17 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 WHIRLPOOL 7d4eb5c5290c8026bdc915210b2273cffd429ea1162cc0ad77f67661a2a660794b9518290c2437cb999abef8051275d6fd30b3dae8b98cf52c65f5c210d3c61b
-DIST otp_doc_html_18.3.tar.gz 34285271 SHA256 8fd6980fd05367735779a487df107ace7c53733f52fbe56de7ca7844a355676f SHA512 0ac429f67ca9ae7f235cda72eb0f4e5b0b43ae90b70c706aeea08be0ad88968677ccc80eb1ba006e90c9f024de586ffd91741d4cef4d614d1dfac51b407d2659 WHIRLPOOL 7d64c2ec433b4bc2da4c56290ad6d21b85d15f72fe9b78654955d27e65b26e1b929d0c9b7d5f60c25c1f16db8d22e36c2ad6ca2a75044707ccd1eea1197fa15d
 DIST otp_doc_html_19.1.tar.gz 34624316 SHA256 76c89aee1ac69b5107114b0065189101e3f42d53e929d8ef8f08b5c586f15930 SHA512 2c6448af0be4bf35427950aca82eac3aac7554575ba07a8ba8942c27e1eb668461fde00604c3be28fbaca8a1e28ee4861608e33a9c79bc951bb695f99b1c1ac8 WHIRLPOOL 5c344246b32f21abc5ad8403c136263a6f9f5f2664b8027ad7f574e1b7cfa9b127f7863547550114b889daba363c19936cf7a0199a0bf5b4da8ac23c02dd24d0
 DIST otp_doc_html_19.3.tar.gz 35818689 SHA256 dc3e3a82d1aba7f0deac1ddb81b7d6f8dee9a75e1d42b90c677a2b645f19a00c SHA512 a70d2c470fa1dc0594b20af73ba36ccb7702b4192960e6fc0296738175215a43450f9bf558637f7f5e40757f7a15dcf4f1ae8a88515e211cd3c0fae45c5e1858 WHIRLPOOL 468cd8b9761fbcaa8892405f451c53bf1014067022966384db96520855366afcfb09aa9ddf1390931da2288c0620b909588637c9c4501f753413752b293a9cbe
 DIST otp_doc_html_20.0.tar.gz 33948386 SHA256 1ab25110b148ce263d6e68cd5a3b912299b6066cfcd9d2fce416a4e9b7d2543a SHA512 a183943a3a2636489cfdf3e7ede8dc4233db84a271b4b8bd655b57b4abac597b797f035d77087be72e823638898d202e08c53decb565fc10f2e444dcc6da8628 WHIRLPOOL 953bf75da7f6aa46e26e4fb6f12d22834d2a41a43e5449e3bbefbe7359f67b7a0affbb0dd6dbfebdecae9294f080a69c0637741ddcf5dbcd0db488ab5a6ddd1a
 DIST otp_doc_html_20.1.tar.gz 33059931 SHA256 442c9b75a33be685a1af67414cc8758a4ef40e27cdcab9e432d4d9c6f3254dcf SHA512 c2eb6cb63f71727ada79ea14a1b8f0b7291bc1d3cdb43bf8978b7b8948d466b9492571d3a45adc96de0eebf46eee213d27c0502ee4d9963ec7c5c0d976f257d9 WHIRLPOOL f03eff4df31352534b49b2bf8d577d16467784ed14cc9c760e4156b486caef5922a32f8676346ed38b6825507395e0e871f89ad82993e3fb59015dad9ac43da7
-DIST otp_doc_man_18.3.tar.gz 1395166 SHA256 978be100e9016874921b3ad1a65ee46b7b6a1e597b8db2ec4b5ef436d4c9ecc2 SHA512 d45d72d7ee7492e081dd5fac1a4d1cea93fe5f5287900be13c92e1c1802f7ec77573eeb4d271497154b9e0723c393700f35982ceedbe29be6cb759a0ebe83325 WHIRLPOOL 03b57a87573630a2826dd5e9a597ab0bb67daa73e4b2b733982b6ce4a3cf6a32c5ad17cb3ba3fc0a29248c867b1ba303098c7f61c0cfe42636621aa8a370790f
 DIST otp_doc_man_19.1.tar.gz 1405580 SHA256 7200e9e5b3a229a6b3838046e1b3e64afc869265539d49d0e4853212f19c0c79 SHA512 4ee35feeff70419ff5500e00dc17e34fdea8be21342d41cf1e255b84a1826b51057046be543ee1052153ae8c8cd215f4720cecae7d9fe1576cbd681dcf4b2334 WHIRLPOOL e94333be9d1d9239d1dc6e9bbcc6930b148eda8d8a73e3d21896e498c331c062ea1541d8fa03a2d0dd6f21510874f5aa6062b22a3738c85d1b18a30b09fb5482
 DIST otp_doc_man_19.3.tar.gz 1410781 SHA256 f8192ffdd7367083c055695eeddf198155da43dcc221aed1d870d1e3871dd95c SHA512 675a0d2d5972660a60de17c832e630f646f942d23815427eb0dec3a5ca1c44ed8fe35a9c30f8b608dedfd10f6fb1e47e958ea6e32e296b6f6809b1844b4da9a1 WHIRLPOOL b7fb4954a46670c672eec02df8713fe68eeb4c15fa8c56e37c802f384bafeb77d88b257ebd1f8f7a0e35e3020853211b9f46ecb01fbe16c19254a3cd992c0fc1
 DIST otp_doc_man_20.0.tar.gz 1430939 SHA256 b7f1542a94a170f8791f5d80a85706f9e8838924ea65d4301032d0c0cfb845cc SHA512 8f3c9b39c5574c239fe4f8d220884667d9d8b8231e923da8caebedc2cfd4db61a3b71a45788c3d63ae4cecc11884df9143e164c544356145977010f31c388e99 WHIRLPOOL 16b1c1448cdd3a35b340f66131a41af88e679e2e5e5383f5586f4cd386462f4a306512a068bbac8020209d6f72ef2ac57db07e4075b1d48bd0dcc0b3dfd9657a
 DIST otp_doc_man_20.1.tar.gz 1334036 SHA256 05ccf82ff85316e2eb1bebf1a1741dfac1ee450ed49cf0be365f9d4fec6d7b46 SHA512 d64cb7e78f1cbc86eccfa338ebe211b4e67ada842d780cf73dac7aadab8209a845de305644b758ed23d939688146012cd5172e005fee207307d6e24c7b7d2345 WHIRLPOOL c772d8febcece3d6b3d7b4a576424aba5f33b9d5aaf5312e5bd0e44bc7350d2e562a93d62d48288cf3dd8e050b83727da624ccf267fd60fa5ac3b28166521148
-DIST otp_src_18.3.tar.gz 68292101 SHA256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 SHA512 f4a69bb14743d9f913d7060cfb6426f7c54693d07ed439506ede5160a0ba5a79a81cf08a56aaa02c68b3377cd22fed66a0fbeb216378330d7ad5c6348ed82014 WHIRLPOOL 493fe8f803194647ab0c113d8f67f5f97636321618296969d9da0396cc9b083b6deffd42638fe3e3eb0b63c4ff996fb4b2c4559c6039add94f7dad62205b815b
 DIST otp_src_19.1.tar.gz 68103074 SHA256 fed4cbbc1ee5cc8efc2b8f14c3db97bfde1de967703f5f9a95f8ab6852737e23 SHA512 bd1c243393c867c91768367613aedb40d56889add149390c81f22e022e76b716d6e9a4d5db7e6477ceb1216c26c18c962abdfd8215a87420758f5ef2063b9714 WHIRLPOOL 3422ad4ab48916f79bcfd2b4550059f88e4e55340a9eb298a9039f07f899e6430eb2fd346bf52931acc2a03e86f3fc5571e9e577fce83bd2040c6cb37fb5348f
 DIST otp_src_19.3.tar.gz 68510871 SHA256 fe4a00651db39b8542b04530a48d24b2f2e7e0b77cbe93d728c9f05325bdfe83 SHA512 6920eab6e1681a76ab44bdd0eeb9b012e601191f91ca06edf1f63ba2e261c555d6f8dddf7025b2e9c3c6459bd63ff78659010ec33967fb1952840fb451ec2de6 WHIRLPOOL ae5b65001872dc855e45a7fbadef278a373935b66819342f4d222055043e1e1ad8974356468e2b1821b36246f5cd621c06cb2e287abab290d6891ea6cd8b698a
 DIST otp_src_20.0.tar.gz 87346046 SHA256 fe80e1e14a2772901be717694bb30ac4e9a07eee0cc7a28988724cbd21476811 SHA512 f73ea74fd149392c72925ea163eafe62ed4470405c61d1c7e557c4f3c94546b4385b073d5d53017f1f5422bdf203ea346fa3d672f49bca4cceec26c51de68951 WHIRLPOOL df800cc5dd9a79a32ebb14376ced74482cbfd85bb4e6d3af7c7b70f32c7080b1c3dee08d9769fa1e296b248c05e3aebb5a3b486f7f6f6f3e1e36486fd3044b56
 DIST otp_src_20.1.tar.gz 87342296 SHA256 900d35eb563607785a8e27f4b4c03cf6c98b4596028c5d6958569ddde5d4ddbf SHA512 76b5fcfcdd501636ae8b8392e563d03ca351fce055fca3c92354fa7fe78e150701fcfbc607e09afcc13ca04d5cbba33b15ef03b77e1f4af766dd0e6b152df7a2 WHIRLPOOL 28643aa28dc960d1187f7b4b483a75e631bf29297bf5d96cc2199989ec390a4e564391fb8c518212bd9e0852703e412d13ae7f530036643394997afb25b2cd19
-EBUILD erlang-18.3.ebuild 4587 SHA256 22e50df693e8ed0466719e07c34b04a4989b8ada7eafc6d6ff069c8e0bc67947 SHA512 e66b473b6bb3b9274f6610ad30fd47b03337a805ec00afbdc5f0620fb74bc39e0a1650ea719d67ea07ffd6532beb94f6bff980570546e0f625158220876400dc WHIRLPOOL 02f14e2ebfbe67915ad3ea588b817c55e8a542aad90b5da9a78204fdcc11bb3729f15ec7a22a01d82116934b497861902c7c7507e24422d4e14fd39b24c2e805
 EBUILD erlang-19.1.ebuild 4482 SHA256 7cbae5f26cc9c4c70e2b64ffbddc02c2a323cc4b05143d254a738961655c8940 SHA512 26067ee69b78c63a40800b87fcd41f74f1b5a04fdc9e1103b2953f1c721195ec6dfb992474d442193c0673c548ed76a3e88938cc3f93bdbee9e26403164e5e60 WHIRLPOOL 19f0566c346cad486e82bed73051c5ef45f8e23f6aad0fb89ac2df89f753ee667acd87cdd54e7f228de5d3d427154734c9c36a1e43d3dc934668a3a59541ad07
 EBUILD erlang-19.3.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 EBUILD erlang-20.0.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 EBUILD erlang-20.1.ebuild 4538 SHA256 a07f6247eb51337f5f64aee67a36f008e5a727258a8796e0384550d98a1af04c SHA512 fd62d9ec729574fa29267bb846ccaa46d1f4e08852b1111eefba5fc89d2d77c9fe7be00f75f7a1d2f74bbc353b436ab313211aaa7c6ce3e9099eaa4ee275f4aa WHIRLPOOL 37b08171622e3e5eb59c751408680f4095524219d973d63645d90c0b4b5b88e37b5cfeb89b36a6fe3a0cb3fc634fdce8066f770aa3b4623fbdee5e392f9d6f1f
 MISC ChangeLog 6939 SHA256 b53b63e91b559d7d54089facf45163140f393c1eec45f68e49ea2c425dd3e392 SHA512 dcf45a4d02ef5a9705ea67ce7c843adeb5dbef927cb5a03f4143e45ec49f6f302a65ec6050a8bd4ff9850841e1984b47d082f280b06264531058f2abd20481e5 WHIRLPOOL 0106b9728d365040debe47f0237b279492ef606bcfc28aca8795c4a92a15412beacb65c31c23ebae1e307387191ccf89390b6dcc3eef8cd6656879637506554c
 MISC ChangeLog-2015 42199 SHA256 a9beab51a32c9af7307a3954d3ff27d3716ec4809ed8944df3f696110474994f SHA512 bd29ac327f61d9c50230bd83c54c38e3dbe5c520af3a4a21315459927281e99e637cdb6e9e59e167e0da6745917d93320f4e831e893c99d562773225f8ebe8db WHIRLPOOL 5a5861a5200a9c521b6feca878f760d95f12af1d49f1e4ba8a9f331e0fb308ede81f58bd0b01802abef5b697a4e42216ee0fb4aa2e6093a375a3d2df476e6b96
-MISC metadata.xml 758 SHA256 fbfd5a67e7b069b54ac80a82d9250107ad27d150ebc0f38ca4b97936dabc8807 SHA512 b430d16cc736f7a1e8ab9b08c3e79885fe860bce973908a22c5835291582431507746bb5ec3ffc7fe219380e04c5b9b2ac2602997b413548b66785c90c0b71fd WHIRLPOOL ddfdf8b93b774471a15e1770583cb1909db816bee57e886973cd6b6bd2e4852f44f49159ff5ab6fa4164b2a42ea109af48f433a020de22a1a0c574d75831dc13
+MISC metadata.xml 700 SHA256 cff7cfdac66d872af4a996d2abf28b0596b2d19778c971155ad8fa778f67ea86 SHA512 cada8e7cf719a6f0249c9f8538452d599e9ea938b2d57a9083e728c8f9d1c259871cc0f32c4f01c725692dd5e8270f0f67d84335593bdfe5ae31a54f117b1b84 WHIRLPOOL fc28fce46493e7915dee7be64e68b562a3a6d3a4452a3a7de82596be1dc52d8cd8ad82f364fa6425ea90fc0f36780d28fc23dd91a6866a7f6e53bcf2d170fe1b
diff --git a/dev-lang/erlang/erlang-18.3.ebuild b/dev-lang/erlang/erlang-18.3.ebuild
deleted file mode 100644
index 70bcb521e11b..000000000000
--- a/dev-lang/erlang/erlang-18.3.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-WX_GTK_VER="3.0"
-
-inherit autotools elisp-common eutils java-pkg-opt-2 multilib systemd versionator wxwidgets
-
-# NOTE: If you need symlinks for binaries please tell maintainers or
-# open up a bug to let it be created.
-
-DESCRIPTION="Erlang programming language, runtime environment and libraries (OTP)"
-HOMEPAGE="http://www.erlang.org/"
-SRC_URI="http://www.erlang.org/download/otp_src_${PV}.tar.gz
-	http://erlang.org/download/otp_doc_man_${PV}.tar.gz
-	doc? ( http://erlang.org/download/otp_doc_html_${PV}.tar.gz )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
-IUSE="compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets"
-
-RDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-0.9.7d:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	emacs? ( virtual/emacs )
-	java? ( >=virtual/jdk-1.2:* )
-	odbc? ( dev-db/unixODBC )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] virtual/glu )
-	sctp? ( net-misc/lksctp-tools )
-	tk? ( dev-lang/tk )"
-
-S="${WORKDIR}/otp_src_${PV}"
-
-SITEFILE=50${PN}-gentoo.el
-
-pkg_setup() {
-	if use halfword ; then
-		use amd64 || die "halfword support is limited to amd64"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/18.2.1-wx3.0.patch
-
-	use odbc || sed -i 's: odbc : :' lib/Makefile
-
-	# bug 263129, don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS = \$(DED_LDFLAGS):LDFLAGS += \$(DED_LDFLAGS):' -i "${S}"/lib/megaco/src/flex/Makefile.in
-
-	# don't ignore LDFLAGS, reported upstream
-	sed -e 's:LDFLAGS =  \$(ODBC_LIB) \$(EI_LDFLAGS):LDFLAGS += \$(ODBC_LIB) \$(EI_LDFLAGS):' -i "${S}"/lib/odbc/c_src/Makefile.in
-
-	if ! use wxwidgets; then
-		sed -i 's: wx : :' lib/Makefile
-		rm -rf lib/wx
-	fi
-
-	# Nasty workaround, reported upstream
-	cp "${S}"/lib/configure.in.src "${S}"/lib/configure.in
-
-	# bug 383697
-	sed -i '1i#define OF(x) x' erts/emulator/drivers/common/gzio.c
-
-	cd erts && mv configure.in configure.ac && eautoreconf
-}
-
-src_configure() {
-	use wxwidgets && need-wxwidgets unicode
-	use java || export JAVAC=false
-
-	econf \
-		--enable-threads \
-		$(use_enable sctp) \
-		$(use_enable systemd) \
-		$(use_enable halfword halfword-emulator) \
-		$(use_enable hipe) \
-		$(use_with ssl ssl "${EPREFIX}"/usr) \
-		$(use_enable ssl dynamic-ssl-lib) \
-		$(use_enable kpoll kernel-poll) \
-		$(use_enable smp smp-support) \
-		$(use compat-ethread && echo "--enable-ethread-pre-pentium4-compatibility") \
-		$(use x64-macos && echo "--enable-darwin-64bit")
-}
-
-src_compile() {
-	use java || export JAVAC=false
-	emake
-
-	if use emacs ; then
-		pushd lib/tools/emacs
-		elisp-compile *.el
-		popd
-	fi
-}
-
-extract_version() {
-	sed -n -e "/^$2 = \(.*\)$/s::\1:p" "${S}/$1/vsn.mk"
-}
-
-src_install() {
-	local ERL_LIBDIR=/usr/$(get_libdir)/erlang
-	local ERL_INTERFACE_VER=$(extract_version lib/erl_interface EI_VSN)
-	local ERL_ERTS_VER=$(extract_version erts VSN)
-
-	emake INSTALL_PREFIX="${D}" install
-	dodoc AUTHORS README.md
-
-	dosym "${ERL_LIBDIR}/bin/erl" /usr/bin/erl
-	dosym "${ERL_LIBDIR}/bin/erlc" /usr/bin/erlc
-	dosym "${ERL_LIBDIR}/bin/escript" /usr/bin/escript
-	dosym \
-		"${ERL_LIBDIR}/lib/erl_interface-${ERL_INTERFACE_VER}/bin/erl_call" \
-		/usr/bin/erl_call
-	dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam" /usr/bin/beam
-	use smp && dosym "${ERL_LIBDIR}/erts-${ERL_ERTS_VER}/bin/beam.smp" /usr/bin/beam.smp
-
-	## Clean up the no longer needed files
-	rm "${ED}/${ERL_LIBDIR}/Install"
-
-	for i in "${WORKDIR}"/man/man* ; do
-		dodir "${ERL_LIBDIR}/${i##${WORKDIR}}"
-	done
-	for file in "${WORKDIR}"/man/man*/*.[1-9]; do
-		# doman sucks so we can't use it
-		cp ${file} "${ED}/${ERL_LIBDIR}"/man/man${file##*.}/
-	done
-	# extend MANPATH, so the normal man command can find it
-	# see bug 189639
-	dodir /etc/env.d/
-	echo "MANPATH=\"${EPREFIX}${ERL_LIBDIR}/man\"" > "${ED}/etc/env.d/90erlang"
-
-	if use doc ; then
-		dohtml -A README,erl,hrl,c,h,kwc,info -r \
-			"${WORKDIR}"/doc "${WORKDIR}"/lib "${WORKDIR}"/erts-*
-	fi
-
-	if use emacs ; then
-		pushd "${S}"
-		elisp-install erlang lib/tools/emacs/*.{el,elc}
-		sed -e "s:/usr/share:${EPREFIX}/usr/share:g" \
-			"${FILESDIR}"/${SITEFILE} > "${T}"/${SITEFILE}
-		elisp-site-file-install "${T}"/${SITEFILE}
-		popd
-	fi
-
-	newinitd "${FILESDIR}"/epmd.init epmd
-	systemd_dounit "${FILESDIR}"/epmd.service
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-lang/erlang/metadata.xml b/dev-lang/erlang/metadata.xml
index d4a1337a2e12..9da736baffef 100644
--- a/dev-lang/erlang/metadata.xml
+++ b/dev-lang/erlang/metadata.xml
@@ -4,7 +4,6 @@
  <!-- maintainer-needed -->
  <use>
     <flag name="hipe">HIgh Performance Erlang extension</flag>
-    <flag name="halfword">Enable halfword emulator</flag>
     <flag name="kpoll">Enable kernel polling support</flag>
     <flag name="compat-ethread">Enable compatibility with pre-pentium 4 CPUs in the ethread library.</flag>
     <flag name="dirty-schedulers">Enable dirty schedulers</flag>
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index d9697c404bbb..fb45ddd2f1d1 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -23,7 +23,7 @@ DIST python-gentoo-patches-3.4.6-0.tar.xz 11728 SHA256 93e7c8487deefc36c612403fb
 DIST python-gentoo-patches-3.5.4-0.tar.xz 11704 SHA256 30c9dbcd5c11ed025b9d8dd201da84c5b9f9756f9b6ba77ccaebc6b79a91e320 SHA512 d395a87695f700598026038d6929ea5038abd7d494294037a4dfa02d5262203dbbaa6ae258a5a7f35ff5542f6266dcf69cc0b9c3df2a047cd2f6699a87e182ec WHIRLPOOL 2191dc89805c1bc11d125005a5c5dd0e5fe635eb0a3d6698bef8b55f54741edc3b3e2588bb21f5eda517963489c15296cd5fd265c8a548d78be6093698e6b002
 DIST python-gentoo-patches-3.6.2-0.tar.xz 10744 SHA256 56729f9848557c52361c71404e5583368f6a0e93b5b6c2e643b59cb079e253d9 SHA512 2aac1700c541202aa4f43bff4cb521b996d52ab350133318abaddb43f4b6e20548f37de472ace8024ef325ebf63fdfff0d43f8aa1f717d3c56f974b7aa1764e3 WHIRLPOOL 90d1f12bee812f350ca0330a97290ce0d5c5fa9ccd816441944f042ef561d9023f4b79239f6d559f38a486fea458e48bf11d33d5bd6fa605875b686a2a845bd1
 EBUILD python-2.7.12.ebuild 10750 SHA256 097322c05e8ce3e749f15eded01b7dbcc8b198995dae192d702b86ca95e488fa SHA512 31b6427107ceaa3309b29bba84819f2e1695b5911904de0138767be78a0ee7f02234d5956b1802259ebdbbc726c6ac7de0c11ffddcecd913c2607696528430db WHIRLPOOL 4a4b7420478cdc1738bc2150f3133eddb5a0ef338de33dcbcfad3f92fac354e1adb4ec12d8f32a6015c19e63d8270880a4befeab53ebccccc4714be79755cbd3
-EBUILD python-2.7.14.ebuild 10761 SHA256 ff30ecb24f5aa926d4e2ff4967a6ab7a1c52ba70e63e40612cc0f712115d2c70 SHA512 76fb1f04360dd1e481b7148dd1da0325afe38678d7188d968a3d360b35ab2b00c053e128fee9b4ccd1c919fc4f551e21b533a8ec9cce6133edbcde1d8f4b4915 WHIRLPOOL 2b1c5925056901f288caf53dc198fb32a80a11aa7309fe0edaf89304b31615e844a68999efcbad26fef0f10ca23e7892696d81aba2c00dd18b66e9da7c2dcdcf
+EBUILD python-2.7.14.ebuild 10760 SHA256 29309cb8ec741f77c628e81538e1957f5df7ab01610dfd6eabfb96970b6dde8e SHA512 73b638bb282e813737321bad8174c6ce3cd22a102212a17dfd52279eaa2cb2719ae1de793cfada3812310c48931d4bcca65e662b7400d9cfe1db7c3641327239 WHIRLPOOL 65afd5094b2c3ee926b0fdde96f32c3df7becfd370247a6e016c241eae9207cd4b23b5920827f46fb220db412f77b13e170fe780f430ef96da50c952f764749e
 EBUILD python-3.4.5.ebuild 10547 SHA256 1f15b603ba833f9687f1e16a3be17d5fa1a25ca618c82f2837631d83f43ef9d8 SHA512 7b988edc2b962476ec8f4c406fae0fdb0658725840b9ba261d5c1975da4cfe42472bb21d6386aa693cf376ac535b2f6a04187449fad22299a2f6d9a5f9fdb690 WHIRLPOOL 528ea8f037ce16a6d53425d3290a5bf33bc6e066c911370b0c069bcc1025815d0f1bfff2ccfd6353e7622eb717c375773d9f9f99898a86102a0ef3a1616d714d
 EBUILD python-3.4.6.ebuild 10560 SHA256 d21dc79dc6e288177954ff528b0b5858b712a5eb84a27bf57f2cee7a1181bac9 SHA512 f16c395689916cc3d7b840343732de2fb4dfb62b996677e12ae8b50dbf95dd0e385c86f3a5e4049964d1ab67121556f7309bfddaad15b9e346dd3e9235813528 WHIRLPOOL 9ade13d473353932d4ee96b52ee90f10bcd4937f45625b37134723261861ff7e54d7154b2ee019934a304d14a7bbe63db2707b70712c29942bbe1bb6d15b9315
 EBUILD python-3.5.4.ebuild 10617 SHA256 d2f411319d192aa7f21ab463dee34fbb617f14f2d2a3dbe845505ccf78a5dd9c SHA512 3b2a4a97b49ff5bb91864a22db922eb73aea44bb587e6f915781acecc69805a9c4bbdf01b31a66089b50acc8e6ff3b07d9f3f1959428d4d4e0ae19960b3ae1ff WHIRLPOOL bac81ca361713675b339a3b9769a9e1f9167a136a4dc5cb73bfed4042196cf4a3d4a3180f5c16816a2a13e833d97da709fce6232f37e3bdde931c32a96898e02
diff --git a/dev-lang/python/python-2.7.14.ebuild b/dev-lang/python/python-2.7.14.ebuild
index 587a661ce691..e5ae740a559e 100644
--- a/dev-lang/python/python-2.7.14.ebuild
+++ b/dev-lang/python/python-2.7.14.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
 
 LICENSE="PSF-2"
 SLOT="2.7"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
 
 # Do not add a dependency on dev-lang/python to this ebuild.
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index 2a30922ba03f..0547859458d9 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,14 +1,8 @@
 AUX check-0.9.10-AM_PATH_CHECK.patch 1287 SHA256 7da055a54dfdb5cb7f3d413d05e1561163422f72191ad52b6a5f84c1833a9177 SHA512 c8c4d667032b62ddc49dee04034a9f6007a13795540b55088df49037d0aa238e0685eaf2b57cd16e6df3ef1e3fc3714a90cf3e40a6972f8c6b164b775aa53c73 WHIRLPOOL 1b6f02cb93139f3c43bf7e61542834e71c3ef7eacb8b52945d4203591a0c43e597686c90feacc4250f734817a3f87cd50fde96b0041d321a02a90b940acb6052
-DIST check-0.10.0-github.tar.gz 257887 SHA256 38daf46cc8bf9081d63970b6ea371e8462beb5e77c03443f275cf4b10ac3a0c2 SHA512 d4a5881e07c9285a5ca4eff6f63172b19c968bab3cd5cfc06c2be54fd25ef71d63b0bd6b425c7af5cfe89d7bc3fae17e56b8648cad1db58a9972e6de1b6fd96f WHIRLPOOL f254b3cd77db9735388f482aaf0d93be24a6bbea08558632d28eeb9d0573ea73ef4d9c36b2e0571fa7c938e288d8261a51dede5bb0ccd8a2671f5788512a230a
 DIST check-0.10.0.tar.gz 769119 SHA256 f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5 WHIRLPOOL d3399a2500a4a1f6fa8865fe75af67e98a22587edd2525d144f4f403dd313cc59b7622cd77cfd885b9e3dfd737e2bef5366d28062b2975c882ffac6253b02b29
-DIST check-0.11.0-github.tar.gz 275579 SHA256 df18bb72ba31eed2e06c21dd97402174500a211645e4b3748e9e277551acc97d SHA512 829adee2a5793dda6ac88162e355268019dd82e7a8ad95f1287bd262c3a7764425fba6a8347f1aeebdad642a972043b70aa59d54c87b3c46e1b5b569290dc359 WHIRLPOOL a37225f70a27bf78e6d6d1eb27596f9778ef809aaee834d0a75de407daa160d8c98ab6aaebc98fa18dddf332a0d110faff073c62dc37f037ed7923ea6507b563
 DIST check-0.12.0-github.tar.gz 281127 SHA256 7816b4c38f6e23ff873786f18d966e552837677bfae144041e0587e7c39e04e8 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90 WHIRLPOOL b3ef728b1f442a2eafd5cc431de204a6f32d28463543693d25d49e57c53b5c062786b5eae11752515f6d5b4eff35892d483d7b54705354bcea985a58c90b2266
-DIST check-0.9.11.tar.gz 691146 SHA256 ea4e8c7ffb00bb4ffb3f59f11744a71f1cc4212c79f3083c7d9a4b0953976936 SHA512 10883709463b76f6650197db989c348d9d07ccaa2cacc0bd6bd177bbcc1e9e0d88746c2e110e620ab18c23cb5f41b95797d60d77de279af1a810a42b355b742e WHIRLPOOL 9559104a68b2f1215e9b00affb4711a69bf3e4e94e0ec894de66f0f77b5637187bb183560e29d0a889ff04d0e07f2785fc407128dee1ba74d584ce9a0ff9a3b1
 EBUILD check-0.10.0-r1.ebuild 1797 SHA256 8efdca278e0c901a6accd73f04622487ec50866f04ddc58bc8535b9e633c54fb SHA512 b178160a81d6df74c7ef10f8d4658c6e12759a2b7b416d7c7e724d83a83212b67dfebcf41b15942dc7dc6f1e5b6270463b2088825a84c6c945b8c535151f1881 WHIRLPOOL 519035816d0379722b26b25e15c2a1e50ef18d57ae718fa63482c15fa86e1f30e68411258f6b017a8c34d4d335706cc17843c64dfe1548c635953cc63969c32d
-EBUILD check-0.10.0-r2.ebuild 1683 SHA256 c850cb06502e7475295bd63e11912b46ec5c753dc3b745900d8aaa1c7bf1e584 SHA512 6e4671a3ad2a6ea6367b61ed0b935771007d12c09d1d47f95f2aaebfcf984f4823c252f8751a64df05093f87df4bbba29e0654a44e5dbd64f80a447acaa8e59b WHIRLPOOL 9ebb12d84a1500c6473fe71b2ba973d87be94dc866b8214b071c910e88a48fa47c524862670b44e7e2423062d2cc6e1692d01f6a2832c33a0dae8624c437c089
-EBUILD check-0.11.0.ebuild 1693 SHA256 0c84723c0be1ef56f334f6e7e5b10bd96b67d09a3fa3bd4e7ab983f3e6715fd1 SHA512 cbb7df0b56cb70d2f50333419fec040d49aebf08c2ed60e247d26305e66b6bae15f969faa848da0cd5c428bcb7cd68d0ee84182ddbb3424e445d71cb7ef74414 WHIRLPOOL 418b8dc03cc128d0923a3ffea1796e9b9450478c98d1c91992d6bcf63405bb59b721e3eaf3ef12a2b0b299459c8dc1ddbf51d98908cc6c7fe5c79f089b5f6ee4
 EBUILD check-0.12.0.ebuild 1690 SHA256 0d336490b3ee076b62b841c04e7f281b66a0930a0765295fe6decd21b4680f1b SHA512 781f2f097f11f462e6070c095d8366e02ecb11f5f73e8f274826192171ad715d4b7e903b71630d0b8ab1b2613c9304345703052dc72c4f83dbe2a033dab453bb WHIRLPOOL f03c189c0fa7d4b19cfe7f2ca626d6762a5b7656ea1c3dfb6a4e1c8d0f9a1c695562083e9d0def509aa7755e1b916d0386bad3d0d4f1f1065b2943a5ccfc031b
-EBUILD check-0.9.11.ebuild 1392 SHA256 f8298ab896666739b2ddd2139ffd2ee05e7d04007f94ecb8b6d389052fdb8d38 SHA512 22f33ad3999c3ce2d9279f214e15c711ec0ce01f50005d6beb5bb6662d04f114a2faa8d295ba31c173755262e10251e6b064fc3815abf299f5153fa0e84304d8 WHIRLPOOL 1bdd6565f3dc0bb7e3e9cffee025c90d155a84e466011e8205ccdc548e25c204e3bb76376397648d1fd9832b62e7440d921ca7affb7123ec8c52593556d748d3
 MISC ChangeLog 3979 SHA256 1202da3ac2cb2736da6f82a36d0b9fee00a8ee7f96879056d446d901c841465b SHA512 514910be30832ddfb3f43f0cd562093a560a2a7d883d6e7c4ae20f51ba875728eb3f75d5cbd3ebfdbd525037b7a3769574f80b4bee046218e2fe63656f036864 WHIRLPOOL 7a362d4bf332c192aa1aa7198c9b8530f65db727a77cc8c872b9ebbb0bf3de8a41b7601e9aceaea2ff358c391cd5047a3e1af8476100949a228a7d7b8a918199
 MISC ChangeLog-2015 11960 SHA256 b3e62fc21ea12728d11cad15cbba7ee0365015c94fbdbdc161929f0dfbe31069 SHA512 42263c3cd16cdee1bf65d09691d1c9b300f5c921cf184ee58d7b2313df5dd03d9070b0d84951e8d66d52b789b1d0b1755cd188694918f2ae99a4e165912fd190 WHIRLPOOL 2a8386fd20378b4acc2a5ac79bbcc479dfcbbf1286983617c1a17a0ad07824eb404058bd5c307a0447b9a100757eb73278f4843bd637b531a3db48978854241f
 MISC metadata.xml 363 SHA256 1077af075555b764c1bc2116d1256aafae1fa80ceb948e720f381aa41bddd75f SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa WHIRLPOOL ec41a0b44c37ed506bb68751a370efaf4f5df0272b2cb59cf8d6f4e4eca02a7b0e6722be55e5a56b0cc5cabfdb8cee7351e18f75294c06b575d4c0552d91a68c
diff --git a/dev-libs/check/check-0.10.0-r2.ebuild b/dev-libs/check/check-0.10.0-r2.ebuild
deleted file mode 100644
index 7bd022c8e059..000000000000
--- a/dev-libs/check/check-0.10.0-r2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit autotools autotools-multilib
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/pkgconfig"
-
-pkg_setup() {
-	# See multilib_src_test(), disable sleep()-based tests because they
-	# just take a long time doing pretty much nothing.
-	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
-}
-
-src_prepare() {
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
-		|| die 'failed to unset docdir in Makefile.am'
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-	autotools-multilib_src_configure
-}
-
-multilib_src_test() {
-	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
-	elog "entire testsuite for dev-libs/check, ensure that"
-	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
-	default_src_test
-}
-
-src_install() {
-	autotools-multilib_src_install
-	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO
-
-	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
-		die 'failed to remove COPYING files'
-}
diff --git a/dev-libs/check/check-0.11.0.ebuild b/dev-libs/check/check-0.11.0.ebuild
deleted file mode 100644
index 4a1f73cca3a6..000000000000
--- a/dev-libs/check/check-0.11.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://libcheck.github.io/check/"
-SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS ChangeLog NEWS README.md THANKS TODO )
-
-pkg_setup() {
-	# See multilib_src_test(), disable sleep()-based tests because they
-	# just take a long time doing pretty much nothing.
-	export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \
-		|| die 'failed to unset docdir in Makefile.am'
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	default
-
-	rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \
-		die 'failed to remove COPYING files'
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-}
-
-multilib_src_test() {
-	elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the"
-	elog "entire testsuite for dev-libs/check, ensure that"
-	elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS."
-	default_src_test
-}
diff --git a/dev-libs/check/check-0.9.11.ebuild b/dev-libs/check/check-0.9.11.ebuild
deleted file mode 100644
index b1e035273875..000000000000
--- a/dev-libs/check/check-0.9.11.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_PRUNE_LIBTOOL_FILES="all"
-
-inherit autotools autotools-multilib eutils
-
-DESCRIPTION="A unit test framework for C"
-HOMEPAGE="https://sourceforge.net/projects/check/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs subunit"
-
-DEPEND="subunit? ( dev-python/subunit )
-		sys-apps/texinfo
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-0.9.10-AM_PATH_CHECK.patch
-
-	sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die
-
-	# fix out-of-sourcedir build having inconsistent check.h files, for
-	# example breaks USE=subunit.
-	rm src/check.h || die
-
-	# Fix automake warnings being treated as errors, bug #420373
-	sed -i -e s/-Werror// configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-dependency-tracking
-		$(use_enable subunit)
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}
-	)
-	autotools-multilib_src_configure
-}
-
-src_install() {
-	autotools-multilib_src_install
-	dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO
-
-	rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die
-}
diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 2dc4450cbca3..d01b88565582 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,8 +1,8 @@
 AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 SHA256 4b3ba5b72796af2a442bb0a01a09d6f19a4cc1544c84f505b9c50d974262e9b4 SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a WHIRLPOOL f34e90557d6c01827c032ad9067b7d1d0072f9cd4b49d99c3d6968e30e0d2d64c5a4e405fa5ff93d483268a1ee2dd912ef4e8091ef4265ef90eed0447416646d
-AUX libmspack-0.6_alpha-fix-tests.patch 3848 SHA256 b2a1f3851d7127e446972a24e94c068026f391dbf048a942c278af1a4813bc9e SHA512 7a2374a4099744939d0422e5194f019d34bd1cadc6155112e7202ed7ebaa722e9ce90b2b3095985dd89238ea77bb26bde80f8f05e5c0097096127ce7693ec007 WHIRLPOOL e7f475bd486db5efeb5022beae267906537b54b6864c8e662180b400bac08fe632d6b7127593993e53ab35ea5cd1abbe2adf3fd521d9ca6f0b21b315dee16501
+AUX libmspack-0.6_alpha-fix-tests.patch 575 SHA256 ab1bbe6b469316c320507f1b13aee36fe06b3732949c52b8e5e0f8dd4c3cf8a1 SHA512 8c715e174d3eca76fb33c2a5eccccd4f7c4c7702320d0db9db5dec6038129f508afade126ae791191ffaaf60740a722db7a87fc76f8c00c86912a1e2e2323eda WHIRLPOOL 6ce1114568edf9b9d6dc1c40bccbff070ef7e0737059dd1b88451547dfa891b21a6c96473512c132546744947bb4ba24318c8eabbdb23e3f2660b39c375140dd
 DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
 DIST libmspack-0.6alpha.tar.gz 476992 SHA256 1edbee82accb28e679ab538f803aab7a5a569e4102ccf1715b462b1bd915f921 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d WHIRLPOOL 5c8fb600af798cb7902c8a7233515004ffc2cc440a152d4296f6827910530259648f73f6e29fd75b5190057b9cf66ad1d180c58255450dbb6b23fce548ad5c73
 EBUILD libmspack-0.5_alpha-r1.ebuild 1056 SHA256 8a72b6596b49c1983142923a489d396737bf24f8fd8ec103311aa681889d7ded SHA512 df255a8f2895b667e46acb21586f7101cbb59d9dff1575a537ce31bbaac7c1d5316ca37ea58c953c1c7854929cea6e5314d5287b915b19cbd8bc943d3f1c2182 WHIRLPOOL c0ce9ca8a6e62e50574c14ae4b2cf4d56fe405d448ae9e6fcdb82bbb3df008aea0aa0763f23b2bdc9d0ae236b8995e26e3c964508956694c84b727134137765f
 EBUILD libmspack-0.5_alpha.ebuild 1001 SHA256 e3ba99982cb2b9704552a2805b912d6c6be5bb1a74c33770609bcd0bdaf30a73 SHA512 04e51296ad4a50665ad8df5d020337c75667f7525412b08356aede88c5b79bfd102613ba5f7a7fd26adbb918a4d78e280f4977949dfcc59a492613ceba1114ed WHIRLPOOL 55f3edd5aea6e803a8c3c70c310d905a8a76e314ad2ecbfce453d8438435512e2b5cdb04d9dcbdff54b9d59915b77e0018d46cc1a9e3fdd4a49f3ef902a8c9f0
-EBUILD libmspack-0.6_alpha.ebuild 1052 SHA256 d1a122b76a5c9990c7049f341dfb89d8ffa4c789f53afdc003406fad8f2284a0 SHA512 ca61e5186f0c5a181a72a58a0e6144a32e01bc320704cadc8fa1a0cd86877fee4dce45e43fd8840cbaba941fcd3039b4806890fc1e212c1ed50dc67a55610f0c WHIRLPOOL c2425336ba490a16c79028f94148ec3fd5ffeed8db8b23d3201c3c0d545fc39945ad484d85589872d5f5e9dbf8acd5e9eb482b181d5041cdfa12619c41a6b1dd
-MISC metadata.xml 269 SHA256 b0e50e7006e04a696bc946ae45550e2bb2d59f449f22ca6a2eade72adb0a927f SHA512 753992cc0fe22a630515becd9f12d80c9929c104521232d87da5fb369c1e3d2a86080d1d54ed1483b54f368882a7a3854a151c7779c5a3ce2aabb06b6a840c2a WHIRLPOOL e9ced1f41b584ec2f6653cbc62c86391fd9306e5f79347bc9d6e82956a7d069177ff5c2e5fc471a4097984889b22fdad936210b3bcd0682327c6aaafb11877b3
+EBUILD libmspack-0.6_alpha.ebuild 1148 SHA256 5dfe0b59bba854aad077a549153ae04968e775a2686d0153f049362e9e891acc SHA512 e5883f3560891d8e243e165e241b13b7fe78717c3ac72afdc71db4391451dfa301e1c96365e0c5a570a77b9a210b5c4e999a65e4c1611b16570fb66d8dfead1f WHIRLPOOL ab96863331cdb7fd454bae82f1c7aa6c94209234f0b3f6bc18fa14237d41c95708e8faf7b4eca5b2d6b9ee584165b938157c25a85e1497774bf71c64727b335f
+MISC metadata.xml 355 SHA256 6e600062e09e00628cc91144a45b3f44757838f3f8ce751a43ff0805b1f1ad9f SHA512 08390d344d23931d0c418eb18e0db2dbaba1f9942fac4984786fab7fa15045a9ccded1acc98d8ff4fdb4a2d5d83cb68383818745cb06b1b743489a2efaeb69d1 WHIRLPOOL f394a499be502f540310c9bbcfd7f6666d8f0e730b2e4c57e0ee15fc99f793e94fa6eeb4140b47b6903db93d8538f3e0cf4e66336fe0a10d0a1883e295f62e1c
diff --git a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
index 2f010d87a376..22b0461ae7e4 100644
--- a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
+++ b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
@@ -1,36 +1,7 @@
-From deb65056f436a4ce06946c4dde270f533e3cab4d Mon Sep 17 00:00:00 2001
-From: Stuart Caie <kyzer@cabextract.org.uk>
-Date: Mon, 16 Oct 2017 13:59:05 +0100
-Subject: [PATCH] Fix cabd_test.c test and msdecompile_md5 script
-
----
- libmspack/ChangeLog            | 10 +++++++++
- libmspack/test/cabd_test.c     |  3 ++-
- libmspack/test/msdecompile_md5 | 47 +++++++++++++++++++++---------------------
- 3 files changed, 36 insertions(+), 24 deletions(-)
-
-diff --git a/libmspack/ChangeLog b/libmspack/ChangeLog
-index 6861b19..4aef85f 100644
---- a/libmspack/ChangeLog
-+++ b/libmspack/ChangeLog
-@@ -1,3 +1,13 @@
-+2017-10-16  Stuart Caie <kyzer@cabextract.org.uk>
-+
-+	* test/cabd_test.c: update the short string tests to expect not only
-+	MSPACK_ERR_DATAFORMAT but also MSPACK_ERR_READ, because of the recent
-+	change to cabd_read_string(). Thanks to maitreyee43 for spotting this.
-+
-+	* test/msdecompile_md5: update the setup instructions for this script,
-+	and also change the script so it works with current Wine. Again, thanks
-+	to maitreyee43 for trying to use it and finding it not working.
-+
- 2017-08-13  Stuart Caie <kyzer@cabextract.org.uk>
- 
- 	* src/chmextract.c: support MinGW one-arg mkdir(). Thanks to AntumDeluge
 diff --git a/libmspack/test/cabd_test.c b/libmspack/test/cabd_test.c
 index 5e8851c..abed65c 100644
---- a/libmspack/test/cabd_test.c
-+++ b/libmspack/test/cabd_test.c
+--- a/test/cabd_test.c
++++ b/test/cabd_test.c
 @@ -186,7 +186,8 @@ void cabd_open_test_05() {
    for (i = 0; i < (sizeof(str_files)/sizeof(char *)); i++) {
      cab = cabd->open(cabd, str_files[i]);
@@ -41,56 +12,3 @@ index 5e8851c..abed65c 100644
    }
  
    /* lack of data blocks should NOT be a problem for merely reading */
-diff --git a/libmspack/test/msdecompile_md5 b/libmspack/test/msdecompile_md5
-index a1d3b4b..9efbfac 100755
---- a/libmspack/test/msdecompile_md5
-+++ b/libmspack/test/msdecompile_md5
-@@ -1,24 +1,25 @@
--#!/usr/bin/perl -w
--# put hh.exe, hhctrl.ocx and itss.dll into this directory
--# for this script to work. You can get them by downloading
--# the HTML Help Workshop from Microsoft and then doing:
--#   $ cabextract -F 'hh*' htmlhelp.exe
--#   $ cabextract -F itircl.dll hhupd.exe
--#   $ cabextract -F itss.dll hhupd.exe
--#   $ cp -a itircl.dll ~/.wine/drive_c/windows/system32/
--#   $ cp -a itss.dll ~/.wine/drive_c/windows/system32/
--#   $ wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itircl.dll'
--#   $ wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itss.dll'
-+#!/bin/sh
-+# This script needs the following setup to work:
-+# - hh.exe and hhctrl.ocx copied to Wine's system32
-+# - itss.dll and itircl.dll installed as Wine DLLs
-+#
-+# Download the HTML Help Workshop (htmlhelp.exe) from Microsoft:
-+#
-+#   https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
-+#
-+# and then run these commands:
-+#
-+#   cabextract htmlhelp.exe -F hhupd.exe
-+#   cabextract hhupd.exe -F hh.exe
-+#   cabextract hhupd.exe -F hhctrl.ocx
-+#   cabextract hhupd.exe -F itircl.dll
-+#   cabextract hhupd.exe -F itss.dll
-+#   mv hh.exe hhctrl.ocx itircl.dll itss.dll ~/.wine/drive_c/windows/system32/
-+#   wine regsvr32 /s 'c:\windows\system32\itircl.dll'
-+#   wine regsvr32 /s 'c:\windows\system32\itss.dll'
- 
--use strict;
--use File::Temp qw(tempdir);
--
--die "Usage: $0 <file.chm>\n" unless @ARGV == 1;
--my $hh = $0; $hh =~ s{[^/]+$}{hh.exe};
--my $dir = tempdir("./.tempXXXX", CLEANUP => 1);
--
--$ENV{LANG} = 'C';
--$ENV{WINEDLLOVERRIDES}='hhctrl.ocx,itss=n';
--print "*** $ARGV[0]\n";
--system("wine $hh -decompile $dir $ARGV[0] 1>&2 && " .
--       "cd $dir && find * -type f -print0 | xargs -0 md5sum");
-+dir=`mktemp -d`
-+echo "*** $1"
-+LANG=C WINEDLLOVERRIDES='hhctrl.ocx=n' wine hh -decompile $dir "$1"
-+cd $dir && find * -type f -exec md5sum {} +
-+rm -rf $dir
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index 6a40351178f2..63c273dced26 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -15,10 +15,12 @@ SRC_URI="https://www.cabextract.org.uk/libmspack/libmspack-${MY_PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="debug doc static-libs"
+IUSE="debug doc static-libs utils"
 
 DEPEND=""
-RDEPEND=""
+RDEPEND="
+	utils? ( !app-arch/mscompress )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-fix-tests.patch"
@@ -47,4 +49,7 @@ multilib_src_install_all() {
 	if use doc; then
 		rm "${ED}"/usr/share/doc/"${PF}"/html/{Makefile*,Doxyfile*} || die
 	fi
+	if ! use utils; then
+		rm "${ED}"/usr/bin/* || die
+	fi
 }
diff --git a/dev-libs/libmspack/metadata.xml b/dev-libs/libmspack/metadata.xml
index ea4e7c21a844..1e5806295c83 100644
--- a/dev-libs/libmspack/metadata.xml
+++ b/dev-libs/libmspack/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer type="person">
-        <email>reavertm@gentoo.org</email>
-        <name>Maciej Mrozowski</name>
-    </maintainer>
+	<maintainer type="person">
+		<email>reavertm@gentoo.org</email>
+		<name>Maciej Mrozowski</name>
+	</maintainer>
+	<use>
+		<flag name="utils">Enables building cabrip, chmextract, msexpand and oabextract</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-libs/m17n-lib/Manifest b/dev-libs/m17n-lib/Manifest
index f6ebacdabb4a..9da7720ab3a9 100644
--- a/dev-libs/m17n-lib/Manifest
+++ b/dev-libs/m17n-lib/Manifest
@@ -10,7 +10,7 @@ DIST m17n-lib-1.7.0.tar.gz 1063169 SHA256 8eb853e1e0c86a70a09871f3264f950e5d62bb
 EBUILD m17n-lib-1.5.2.ebuild 1353 SHA256 1cb703d5b5fd0915bd1242a66ea0cb8132ea160159ed4265486d469d6cef7517 SHA512 0d78a72cad467a2c392f1a61b21c37feb7f5f2c13e7530c395dcf8975764c5286eadf20bc2b070af54df0a3c072e439a9ddba3a032c86fbaafa9d8d6f6dab815 WHIRLPOOL 2378e0eb2cb2a7e43f6d30d298d174350cabb66721cde24e682d07e277c31ef9c2b9854b01c4a92b7e06f759e90ce0ca50496cc99b75a993d49d6486b4bda3c0
 EBUILD m17n-lib-1.6.3.ebuild 1243 SHA256 ddf7c9ebea5447fdc8807e3bdf7d6c6527a17ec10798617b3af35ccfed7f71b1 SHA512 fd406846f8b9fbb807d52284b5a0b2414aa77291fd3ce164cc8ed7b1ad1134c1fb701116db1052d209358bd308139ce0f348f291e97aeead3e18bbb4ccb5c907 WHIRLPOOL c478db1366b5e2f342bebe76f6a32ad2ca78672b024a0e9c35232a51e0a61ccb542b4d003e3f9c5035e37fd7f83e168496cf34ee3c82d2c9a6ad95b4ddd0a771
 EBUILD m17n-lib-1.6.4.ebuild 1857 SHA256 dc655f8722d8c3205e3002415411214dc114723503e70916f9b178aa86993a2f SHA512 dc39e2a31c78633892e99721fdd99c14ac5c04413a39f9982c38b300f7baa393e9054712ba0c03e43231f772f6648a4814f2491c17c5c505daa54110385e43d1 WHIRLPOOL 87523707fd9858e72e8b5dda1d1ca6dc346baabd5668add99dd49bf77b4c04c7dfa671fa573f9b39a52ae8a06ad7f274a0528ff8a30e925b51e5c4516ce574ee
-EBUILD m17n-lib-1.7.0.ebuild 1759 SHA256 bd178bbcac07c934290d0d516b268fb659e833cc76278396097f9da98ba7f4be SHA512 165572d8389f8b70e99514596035236f1c23312cca0ff98cb6b5f62c348f1aa4b48c26006d2f531fecca26bc3f7d433c2cbf9d5eb6e4b1e6bdb42c77d876b8b2 WHIRLPOOL 556edd6b081bd2b8bcd6a5b8a057d451bc200917d6c40496253f707dde8263d337a3d12550d2437f4a0f1ef711d71a2685e287b4facd114621a27a802c7d0f68
+EBUILD m17n-lib-1.7.0.ebuild 1758 SHA256 b57a71a3a290d837527a89a35d9f7441bb63b839d741575efc49de8327e34c1c SHA512 3a3c361a3f41ddc63d90f03ba380556f9d8d2c84487700605f661206e89aa24fbc5382e24052ba5d1feaa29ebe2dc0824a2ab52213dac59a41c91d77127c2f2f WHIRLPOOL befc349272f4da5bb7fab0fc8840a73582a0e816b777e2cdf159e3896d93e306c3c1b2c9a9428a4aae378dc65934e782555bf5fe74e4f5d48641eb75c3d63ff1
 MISC ChangeLog 3387 SHA256 ae7965ed07a33dd431f919d1f0521de3c31a736329b37ac5613b82825087f54e SHA512 017b06441caac2e2003038dfd5a67ce8f9f31e32731dea330cd9eb31cc2a0cbee95c34ab952e0dbb9de4a88acfa6e8dd052bb88bc0e26c2caf531e13fb294d7f WHIRLPOOL 977f04914e4600cacc398ceb8caa3c05c217fb20ccb1db99eeeb3e836a478f2ce2a6d1d06a817d83ca286c091769b6c8b685ad273f8bb1a7b750422b443e01f5
 MISC ChangeLog-2015 8232 SHA256 7613efc07cec4fc6949d29eb4d037c14e5f816bbe44144a5cb32c2616f3190bc SHA512 902a015a49fbe6b61be5a2f7b845d37d7d3eb45d6b5fb66a7926495fe83981503adfdba34a57853c69ffe5486a6b90c1c7d66a4df2870ca75332a614595ebbba WHIRLPOOL 7d79e0d97d826e2c19692176aec1d9e42d127b61c21317e36986d37a832156e0aba231e632a8bfe1c730df3d4f7f9a9c08a0a011d2f4147cbb5848d771b331b9
 MISC metadata.xml 873 SHA256 3bc9fbc3db6b479c3b8ad0fc1730be58b8a9d68aba1a5e95691f386c34af92e5 SHA512 e0318084f83ee510dee477bb9b6396a81dfe4afbdc407daecc49d51c037217002686af4db286e4bcd6a158061ca0a77822f3853f25f12db5a384a3fafdd38291 WHIRLPOOL 3a41db62f5e9070d4b23893ebf1c38984f932b42010aa4a8745450cd1ca9929dd0dd37da607d3c9a93a8dec2570c739a823efb8da38b3a3c48c71f10fc0e568e
diff --git a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
index b43b6b4fd1a4..bcf0b1620c5f 100644
--- a/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
+++ b/dev-libs/m17n-lib/m17n-lib-1.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X anthy athena bidi fontconfig gd libotf libxml2 spell xft"
 
 RDEPEND="~dev-db/m17n-db-${PV}
diff --git a/dev-libs/oniguruma/Manifest b/dev-libs/oniguruma/Manifest
index 2f4b83ed9f7b..d163bdfc9e2d 100644
--- a/dev-libs/oniguruma/Manifest
+++ b/dev-libs/oniguruma/Manifest
@@ -14,7 +14,7 @@ DIST onig-6.6.1.tar.gz 943490 SHA256 8f9731f9e48666236a1678e2b4ead69be682eefba39
 EBUILD oniguruma-5.9.5.ebuild 1129 SHA256 fe48f2becf821d0d60f91ce82a8f72260b44fd38cce6dd526e40999a89adaab7 SHA512 0889defa5f3a79337e4bd353f49d19a88870fc4657acddb88b47cc49bd2d54e64e7a10afb393a8e2b93cf196d7ff140d9117c61c7ba0551d0903bcd13703bb6b WHIRLPOOL ad4cfd96d4a9babae36ab975cf2facad5b9f240fbd67ec16ac75897b76647b5c8833a7f87e0c934115b01b6afc568985fe471d37d2f15cc7236dc6175ed7ac0f
 EBUILD oniguruma-5.9.6_p1-r1.ebuild 1379 SHA256 a484fd0dab3622ff12e0d68dc6913ac81292ba1f386970937f7da7f4856518f2 SHA512 6817357097456c702b5488cee375135e54bed44360a2edf0dbad9b2712c8c824b4f5433b73cfc8dcf460075fd95a6a396916a79032de4a69d633c856bd52fbea WHIRLPOOL fa4c0019b4692de04933e002586220cb7c3b1244d4f817fd41f503b3f09b0bb7224d3b88076802bdc4abf06e9390d24b8f9abb24e35206eeaa55da6b21c418e7
 EBUILD oniguruma-6.4.0.ebuild 1167 SHA256 1e05d4de551c9657f3a51ae130602408c256921dede9f5f6f52a69d14c70f1ed SHA512 684194ee689ad9fb79fb2c933f8eb64e8dfa20c79da0c76907cc6b913391f2e4bbd42793a4d11204c66d87651c349f71c75c4169f2ad87808b9f43b6a14b63c1 WHIRLPOOL cbb7c9eae2d7cd5d621e84d95d957b7c978554105ae15d225fb2ce2bfdcb7ed56e6adf2ec255c1730286379152f57d8ea20244cbfa8276af5925ba00e2f24811
-EBUILD oniguruma-6.6.1.ebuild 1131 SHA256 b88fa7a58444a7c3b010d876ef3ed0a5ae6a626d70b3619865720b9074318517 SHA512 3470a7a34c892e0246f3c3b07b409a7a894235cfb31cc4b92dd101540e550e1ccf656e8dd1950a533a45219fcfafd29ac274137ad333b565f531829f4e67f06d WHIRLPOOL 4e4e8d006e60d9665caa7e43bd4547a141981034eda734f157292a9d79f80cc382229c1913a68efe723baa98bb08d4bc81093f2151e55b475842dd8b0894cc54
+EBUILD oniguruma-6.6.1.ebuild 1129 SHA256 826f31635aa1f38bd285efb8d691b76ad3d828f8b0aa34a0300118e71ff8d172 SHA512 55dcc88d877358307d8d678ba430e3a24f175d5542c3787bc6e75ff3a6ee390dda221473d173b13bf3c04ffb49dc69d8cbba877c786ffedad0dc7fc3d0017f55 WHIRLPOOL 2f390b811d144a4ea580c3ef1cf4162f9e24a83c4955f7ffd0941e580aa944e4df50c28519640151ff62f2c529e0cd7032678caa36876d491646ad59617f7785
 MISC ChangeLog 3480 SHA256 017a5b8fa1c2c3efbff36f8fc86700c40dd5f6c4a5cd3111279c460f762140db SHA512 5340377126666c789a2e2445bced19c8348aca7a862da341bd950b737545824e836a567a70f0e99aa7765964eada43980ec761fc16d8868067f2ddd2beb24529 WHIRLPOOL 1f3f3aa4fd8af3724f25c24ec7a371c63b49f85b4965185d6a11a075369a50cdd5970dff0fca833ab618b178dd7bc57f9ad85e4514fbc7336a1f313d34cf4971
 MISC ChangeLog-2015 9089 SHA256 ff4e22531be2af0b4732475ca1e23fef670ee4982fa0d519d1272b98c05fffd3 SHA512 6ab9ec86d19b1644073fa2cc50414f2984c6e51f0658be44f5b2b0172a6f8cdb98aefbfa650621c03d992df3cca4c430489fc8058aa58a40332399ccadb4eb63 WHIRLPOOL 54e80067dd972b53205940d26676d010743507b7269b7470a48878b64a0975e8522551984a0eb56fe7f6bd9f344b4c597a6ae1921374b39527d53e83872f1b71
 MISC metadata.xml 898 SHA256 1dea20487ad239dacee930e91229ad7e1b49bf75597c52567cd1f670cff966f5 SHA512 d9736125e403f64018466a0fd53e19e86552254bfba410d38b7d9d485c50b74a55757de54fee90cdbaf21f6a535b5d765e38019e5fc3adbe5cb1fcf88ab71a2a WHIRLPOOL 130834b5e6ea1a6cfdc30b8e3c0cd81c9cd4bec586ee6ee1a84574e8ddff32bfb490fca959f2dfd44fd90acb5367c1d01cfd3c41f567452b8efeb0c23a197304
diff --git a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
index 02df1a2e2b46..a19a0cf234f2 100644
--- a/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
+++ b/dev-libs/oniguruma/oniguruma-6.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/kkos/${PN}/releases/download/v${PV}/${MY_P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0/4"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="combination-explosion-check crnl-as-line-terminator static-libs"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 723fc3343939..3035c07a3071 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -29,7 +29,7 @@ EBUILD openssl-0.9.8z_p8.ebuild 4997 SHA256 68825bbb48e4862340690badf5f4fdffb671
 EBUILD openssl-1.0.2k.ebuild 8334 SHA256 81be072ce297e7426353f5fc5e1021b464aab6c08317ab0798b3f2f3511e25b9 SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb WHIRLPOOL 8b5445b07d05613e3003348c5518d1fdd5fdce4415739b0cfbd3589f5a2801747dcbd5bad2c034cc28b6f8bb73916aeeec4d3d3c591462d024147f494180f2b5
 EBUILD openssl-1.0.2l-r1.ebuild 9930 SHA256 78d0509140e5187d636f21320a6bf125d4a1a03d797bf545c7741d31d7ea7864 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23 WHIRLPOOL 5765b2ac767c04ccfd1ceb7e5998513aab7e18a80e77124eec63f729f054fc479318612a567b6a8141afabc9e4bdc65101b0811bc25f266960580465e0de0513
 EBUILD openssl-1.0.2l.ebuild 8338 SHA256 072d91bb6cdf1e356a450d995e1a43026f6a86800a601b853f17ab7da1f17c44 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d WHIRLPOOL bfaedc69471ef1ef1496c2f87de036b29496d903967a66f6a13154aca7b4ecb85eb7abd668dd4652bccee7a8bb6a1a0ab9d5492b19db8ed0e9360f7fbf67b775
-EBUILD openssl-1.0.2m.ebuild 8348 SHA256 fa413bd745a65c33e60394aae1b48ce3ebf26e63e5096debdd9c13d9f1be5077 SHA512 78ba7ffd4565ec9ff8962c4f58bbfab3417da0216b4f766d0c0e7fb5222c28346693d4fef8ad2b4f251f1d31c7c99a7c6baf0429b64b12579fe436f208e8070c WHIRLPOOL a3c3c5b1b583523031ec023934de20eaf6df4b7da2491e822bd85e22c676e8f93045c772cb6c22ff8d50aab1ae2d4a09de5985c0bfa30af8fd46bff622381937
+EBUILD openssl-1.0.2m.ebuild 8346 SHA256 b5196e00b3fa4323fc5eb5d764c712764f322ec165401a9452c26f6409357a31 SHA512 8d97084d044eb5bbc347003d46fcd7658bafa9538eae67c9fffb2e4a0ceabba1fc386c797f32509234b8fe0740424b0554eda5b27ffaa4c6ea4f42199393fa3c WHIRLPOOL 509d637955a160124c6cdeacbdeae1bfcbe2ed198fff6b3fb3c5eca86af3828c22919814f1e9e0cc647bec3541ae21d22a92ae450b4896b649dda4c3d73338e8
 EBUILD openssl-1.1.0f-r1.ebuild 8960 SHA256 59b50a19926a7cef6c0d366e40c4e2ee36cf9f8349c3a5be511f974ad1d7036c SHA512 5d7c628faa89d56a58f5d732f30d495743e6cfa94962e036042f396902aeb71d6e997a2ee2db904f7e04e21a6c2d75e879fdb172f74f28d51b0e2569d532d33e WHIRLPOOL ca550601ac03f73ac41e1c10b882b93c3b351a65fddfc6febcee3e5a3a3b545e04cb38bfb3fca8a8b3d32cc36149933772cba764b731141f1a8f4c5a832aa934
 EBUILD openssl-1.1.0f.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
 EBUILD openssl-1.1.0g.ebuild 7419 SHA256 553325ec8be13740869ef1416fb62654c7ec6ea1755a55f2eec81db6797d0950 SHA512 30d243d3d3e13571c8b55f9b13abc8b39ad0e719bd482b54d22ee7cb01217e8288cf2594dca1511bd5bd3945acf4e2963a16d3a172c59c11af93008a7a8874b2 WHIRLPOOL 1248a75677f564b74c2f0e575994fe00a8421c12b6a420a5782c3c3646eeb249dc391cc5b3838ee5d5040a9b0d0a4ec281a3af79a1392aefb9455607a21656c5
diff --git a/dev-libs/openssl/openssl-1.0.2m.ebuild b/dev-libs/openssl/openssl-1.0.2m.ebuild
index e47810140be8..9514ee98812f 100644
--- a/dev-libs/openssl/openssl-1.0.2m.ebuild
+++ b/dev-libs/openssl/openssl-1.0.2m.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz"
 
 LICENSE="openssl"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib"
 RESTRICT="!bindist? ( bindist )"
 
diff --git a/dev-libs/zthread/Manifest b/dev-libs/zthread/Manifest
index b1d6c76a8835..055c3710ea69 100644
--- a/dev-libs/zthread/Manifest
+++ b/dev-libs/zthread/Manifest
@@ -7,7 +7,7 @@ AUX zthread-2.3.2-no-fpermissive-r1.diff 2008 SHA256 d7fa1ef2d7c5c75860d4f38745f
 AUX zthread-2.3.2-no-fpermissive.diff 2010 SHA256 f1f37cffbff4c3dd825ff482b80686672902b817529519851f1b554d50ce29d3 SHA512 95f89cad5f531bb5374ae1e300080977defb69bf304221188204f3cbfbf4e23a1445cbe4174e279453a005ab410925b0111ce56ffac4aaf8656b50483a9f1a8d WHIRLPOOL 2ff99434d56f9c7a31ff98657f13f23245a3a5fdd11a5c65c045e82eed94b80029ef1b41b30bc3c88d4a28c1de2b4ea8c2c3c660e79b6af738274bef93eab364
 DIST ZThread-2.3.2.tar.gz 412527 SHA256 950908b7473ac10abb046bd1d75acb5934344e302db38c2225b7a90bd1eda854 SHA512 e17e12746d16f32f6f1dc8ec041795f3c05a541c015b9579252599b51de9f97dc780946e6e83b41ca78d1af892455e6f00169a089f6e1a7c3196d6a4f49a7f7b WHIRLPOOL c5ceca4639b26a86936ff49e781737b9b7e59abcd0ececa5a0799b01460a23c88c18c84027dcdbf16cd5c98549dfceba3a4d30a71c0052f8ffdbe0a824e2c254
 EBUILD zthread-2.3.2-r3.ebuild 1461 SHA256 ec1db4baee921f16b6d5b6982fc51b5cacac8dc7ff7493d19d48c2d3daee9ce8 SHA512 0001e221cf7368c9f6ec9174a6792f53e4bd7174244e4eaaaa6d81cd95a260afaef647a58fccaa60e0be20aa3ccdc2a9d30cfe8483f0e40e6ffd5f7de06378b0 WHIRLPOOL 00f62338f7e52ead46e454c5e9b489028224ebfef853e0baadc0147fc8b18a172de54268e19533233ef8f5bb7a1b40591bf0145376d1f18d949cc8286dcbae26
-EBUILD zthread-2.3.2-r4.ebuild 1404 SHA256 10ee775d3522ed0e2ebab989cb5480f00352c7e7591f601ae72d49357518756c SHA512 eb69852c9ee5d14f525b3201fb99c7cacd28538c17c88c042757e20967440d4db3e484b9f80e286c0a6032328d8096f4b12d1cc44761c1775441224c28012913 WHIRLPOOL 22edad5065b63668d175af824dcc04d3c118e9bbb7dd097defbd6e619843eab8d9672339f534f13ac21603efdcab9b43b2bde32936177563a61c9afa988ac448
+EBUILD zthread-2.3.2-r4.ebuild 1402 SHA256 e477cc5eaff7cdc87a627ad4cc7417a04709b1198e10100878ee925edf89289c SHA512 2451e61155ca7b57f6e058677326a0829b5d63bd24949238de4f3824e1c33240b4ad55a20f4f08256fbb7c13c157c22ecccee78bdcb8862b9faae37c76bd16f8 WHIRLPOOL 52f2ba0cd2c2024e2f11af2758e505bb370ca711357d52cd80470475fb6e7aa0b8674d949d6dc4e567b7cf99c5ba71d180cdbb3635bba22f2e57e5e56d73008d
 MISC ChangeLog 3226 SHA256 d5915a5bedcf9b990e1379c8222124a75f1aa9e2f3db4156e57bc8a87c14e65c SHA512 cde125ab210c5745ea5ba4c706e5574196cdccb7261253c8caab2056572d12cf15b4cb61f6108a3a9acbe3b64fdcf6c13807e672182f417760ab3eb578fa596b WHIRLPOOL ff9aa4de83c97865a8ccaa89b6c8fa7789f23c7f91af4ebb774cdec1ddb15281120d1ec90a18314e41d472b6d0da60ab6148b39e1ad2fdb0a5b5f640100f5344
 MISC ChangeLog-2015 5897 SHA256 e4da5a1ecc0aed3a55bd26f150a22db8a6e9fc2c559e2b6e01c4835c5b53d979 SHA512 339a109d1d89ad83de913c9bfa27f7198c67fa6434a295bd01c65e54ed3d816fa26008247eb5dff843e1cc38c3b49e4170a2896c6a100f99e76d0f7b27494a0e WHIRLPOOL 05f109e36e70e16af6b1961c32f2c3533de9bd84b80b0c3c0740113f6f85881ea9fdec74fe8ec49f17cec311658b05c80644a2d09730c4b740758def833cf41d
 MISC metadata.xml 326 SHA256 210c8d16f72efbe69a7bc2954b22d48d4156610695762609f56a00a6d6269096 SHA512 b01487803f5222c80e0bec2b0acf7bc85a30c7314642ae8e178274b4872a17986ca88ef324700a732b1afb573b74eee64c2e1bf95c08e8fddeee5910969f2230 WHIRLPOOL 868f905de7f37b162a44695e01f15ce8f23f2a512f6431597bbf7b77fe9c839d64398550fe3ca3223ad4d16a40fa4a6dc9dddb9bcc0ad61c2efce3d3cbdec7f6
diff --git a/dev-libs/zthread/zthread-2.3.2-r4.ebuild b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
index aeb476d946f0..6f31d0242103 100644
--- a/dev-libs/zthread/zthread-2.3.2-r4.ebuild
+++ b/dev-libs/zthread/zthread-2.3.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/zthread/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~sparc x86"
 IUSE="debug doc kernel_linux static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/dev-perl/Lab-VXI11/Lab-VXI11-0.20.0.ebuild b/dev-perl/Lab-VXI11/Lab-VXI11-0.20.0.ebuild
new file mode 100644
index 000000000000..6eca7c194229
--- /dev/null
+++ b/dev-perl/Lab-VXI11/Lab-VXI11-0.20.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_VERSION=0.02
+DIST_AUTHOR=AMBA
+KEYWORDS="~amd64 ~x86"
+inherit perl-module
+
+DESCRIPTION="Perl interface to the VXI-11 Test&Measurement backend"
+
+SLOT="0"
+
+RDEPEND=""
+DEPEND="
+	${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+"
diff --git a/dev-perl/Lab-VXI11/Manifest b/dev-perl/Lab-VXI11/Manifest
new file mode 100644
index 000000000000..1059188981e3
--- /dev/null
+++ b/dev-perl/Lab-VXI11/Manifest
@@ -0,0 +1,3 @@
+DIST Lab-VXI11-0.02.tar.gz 59626 SHA256 7d1405500a1380e979aadb8e399f957073192cd2451285584f44085e3524323d SHA512 73ee82df15b2cece5f93ad23dd5ed4cc343fcfbdacea5b3cf38f8e0c97ee6b02dcc9b3858838d36cca743077d77c0505a5f763c0f31312e2a6cbadd4c78cd356 WHIRLPOOL c5872b0e5dbd1d6328082a2fd08b341e4368419a538d8fbf2afde48795e2a15fc7d211645a8faf2bfa7119c5cf5cd19e435f7467db779e988e8093bd9d32b6d6
+EBUILD Lab-VXI11-0.20.0.ebuild 341 SHA256 9d28c345f19ad3ad0ee7f5fbe42688543832c7ec1c4a2f09689f2f347a7c603a SHA512 00b8c92a7c5192198824e1e002e83cc7199ca2db185583660d5cd30d7e65e516268be9a798d99d422af1dda8bfec760d42f63d3be06cb19001e839d34f6baa21 WHIRLPOOL a8961870f117edcdebdebd490e5701148b09a4c17df0668b17b6fda20c4bc129332b2c8d43ae4b86158d0af45268d5fa7aa8ce05860d52cc782fbb7f6510ea09
+MISC metadata.xml 380 SHA256 9f772c0b21f7c7880970432f8fd6598e64601e801b9d86dad9a82e7b91fb3a14 SHA512 6d769e95dd726bdffb02318b577e7c46a445592d3b750d19823d874ecb6f6cc1fc7a31e44800addd9ea1ff120b04049733195019f878a8997e047dfed3f771bd WHIRLPOOL 4e141cf8d669f31c5415683cfd2aabe47e1127e88f3f414d1bf6f1d9e15f8d839bbbde728bcec7d286ff8391c3b68d5bb5afbd318e7ac2bd94409ad76b94c319
diff --git a/dev-perl/Lab-VXI11/metadata.xml b/dev-perl/Lab-VXI11/metadata.xml
new file mode 100644
index 000000000000..e10a656f860c
--- /dev/null
+++ b/dev-perl/Lab-VXI11/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/Regexp-Common/Manifest b/dev-perl/Regexp-Common/Manifest
index 6ab212dd20aa..4c613424e52f 100644
--- a/dev-perl/Regexp-Common/Manifest
+++ b/dev-perl/Regexp-Common/Manifest
@@ -7,6 +7,6 @@ EBUILD Regexp-Common-2013031301.0.0.ebuild 438 SHA256 76eeb4ca7782ef49f9326be004
 EBUILD Regexp-Common-2016020301.0.0.ebuild 469 SHA256 6aa119270476b43de32890422bc149814d084464f16932ba842030998958c4b8 SHA512 624d505c6769b7e81d7c7d28d78e377502d1357aa2557a404647970e377be460d5ed41f1cb26ad4b7cc5bb87fb7e99ee65d3440eaf63543f18d8c4db5eacd681 WHIRLPOOL ad808526b852be810d1eaf0f69136698aa50f4962fbf704ef8bce36d0d3c9a767047d4d971aef1bf6babd5a2458cfa8806b699abf84879f1308ff2bd04b9dd0f
 EBUILD Regexp-Common-2016060801.0.0.ebuild 484 SHA256 5f1defc1c7d3b11b10e0195c666fa97fa4862bc3986b7cfb6b0a7dad22ac48ac SHA512 ddce5b22c51b6beb56c40e101af7aed09803e0e6da2a2f332d309eab1fcf62c97a0c7085356a8ebde397ca6db9d8422183cbd6b25f5820f8b5b43e0d81c4b574 WHIRLPOOL 113b40ae346f99a9cc2fb1fbf5b8e6a43d0c78904f6cdf57c17dd14e5366c30039a767cb8fc958146ef3debec7fc4c52231dae7db9c905eda16f0576839fb221
 EBUILD Regexp-Common-2017040401.0.0.ebuild 484 SHA256 5f1defc1c7d3b11b10e0195c666fa97fa4862bc3986b7cfb6b0a7dad22ac48ac SHA512 ddce5b22c51b6beb56c40e101af7aed09803e0e6da2a2f332d309eab1fcf62c97a0c7085356a8ebde397ca6db9d8422183cbd6b25f5820f8b5b43e0d81c4b574 WHIRLPOOL 113b40ae346f99a9cc2fb1fbf5b8e6a43d0c78904f6cdf57c17dd14e5366c30039a767cb8fc958146ef3debec7fc4c52231dae7db9c905eda16f0576839fb221
-EBUILD Regexp-Common-2017060201.0.0.ebuild 478 SHA256 50cbf383dc279881cc3b936456c6f062e520d79023fd1a8a99bd1af2c5efc294 SHA512 3f85546c934f99d3d42c02e642c65daa9af02e46cbaeec18ef83cb5ff8430f00f1c97f9e068b0ef74b68310ec786c03733e18e8f07e24cfadcb95bd403c08ca5 WHIRLPOOL 2668f7be3e1b1243d27e8afc2a95b6666f358cdc6369dc643e22ece9d3590576f4b279d4f4bef75864bb4a45084e54bd39ea53c0a2edd04b204f1b0a44678d3f
+EBUILD Regexp-Common-2017060201.0.0.ebuild 477 SHA256 27ccb738bb84bdf653328d88fc6a730b408666d43aad751e7ea7956322580ef9 SHA512 bbad0183755c1e87117408932e1fe7dd0668364d7b59a23e5613d197722267d3c6b1f3addcb14b8dae24db7a425619708db7b56a083fb1912457002e5315563e WHIRLPOOL 982126c39570929773e085b7fd0db465277639a3b2d6d217912bcde4158b22ebe70553624dbd766fda8cc9533272f918446e708928b85bd3f63a7a204809d749
 MISC ChangeLog 678 SHA256 89844368251d4f99636db245ff8b71f654a474c40ca39aa1f0b76953294b379d SHA512 02ab5a060d4770195fa044e888c64413aef5b214ec363d360802184161c42d2b20a5d906b7e658db10395070e966fe13ba19baccedda7e2cff136e29852c7d39 WHIRLPOOL fd704e4a5955c6824b280314610ace0a90cb83df286b3781678b66e2e2b54817f528fb39fbcd91723622306ebb499436880faf625fbcb279c795c33725b03c59
 MISC metadata.xml 2809 SHA256 3e4a7598bcc36a74ff6fe8dc1c4ece9fa297538a56ed80eec772fbb476ac060c SHA512 40e6c4784ef1a59367aa1d74b317b0a8f17127a0dd8cd52acf0e122e43f150db39a884b866cb022eb398b4545121a6cb1e2364c3670569f714c9abcfbd752d45 WHIRLPOOL fc3b24c96b1f9c7a9abe03a000bd6a86853436e80562afe31b62a5c829d6a87784f352d4a2cad9ddbe9e9e25a509af6d07efdb40fb1d1a618013e7a58f024329
diff --git a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
index 4d181da63cd1..5c9156549523 100644
--- a/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
+++ b/dev-perl/Regexp-Common/Regexp-Common-2017060201.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="|| ( Artistic Artistic-2 MIT BSD )"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/Test-Regexp/Manifest b/dev-perl/Test-Regexp/Manifest
index f4a495d28392..82f742dca031 100644
--- a/dev-perl/Test-Regexp/Manifest
+++ b/dev-perl/Test-Regexp/Manifest
@@ -1,3 +1,3 @@
 DIST Test-Regexp-2017040101.tar.gz 18904 SHA256 35cb41df5c5017835b89b853d5a44e25e6da973b450e1edca51bba70e7041e54 SHA512 70595642f8f5cadd4cec73587af8b4e9ce793c37fdf02773d357b84ee8181750f5ae7fbfbc9a35ca3392f5af074ef5b5a1626547cc7a0c3f48439d4a24bdc0b8 WHIRLPOOL 842e09bf6f4422474f73a833c90a4df28441fc4a474ce9ac3dd7fcbcd90ff97ed883d15c00ebedf3f9c0c970bfde6f2ebe4bde783ad025a306b68fa17f88f3f7
-EBUILD Test-Regexp-2017040101.0.0.ebuild 646 SHA256 c494f1a11ca6df9728bb42284099878ccc90be7ce5b6a04426f557025a6dcf85 SHA512 50571acf2965d3535e5636bc626204f3aa75425766b1997c68a5b4379458f3e03c91c3001375af115c320f4e9c12d0f16b29db36966179dbd786d9a4b6073297 WHIRLPOOL 45afec8f425e8a58d35a64fe8c4e33d531ac47841d2bb8dc0df9260326c3a0c418b9a7492e1cf5f8ddacefdfe5f0cf9b3599c95d9a6ff92082c5107a40b4dd83
+EBUILD Test-Regexp-2017040101.0.0.ebuild 645 SHA256 bed9e0392c3590a894b64021448ee5b00fe96de00927f6b48cc189994aefc2a1 SHA512 a4fb411955ec931a45d996be22d4ac0a4eaf6c6851275939bb6aecf5bb0def8463e786baad4732a24695742b04453139e577a25268d5a46f04c652968b94bce2 WHIRLPOOL c06053e647ca8aec3f5341cd5a070d0d0f2e07bf3030d683ce0bd5a089f1a13f98d6eb057ac6fcb00c6842e684afcb2cb00ef3ded3d1dfd47cb2f0b2ad0ee049
 MISC metadata.xml 522 SHA256 88fc365e3f7f4f8d5e9779cd3e6e9e6b6426ff4b74941ac6ca7d5217b7c8f061 SHA512 682a64fb6143e063cac226042e4fc122dee37c4bb7ac043f2bc3791ec593f79e8c60934c9d789bd43a6738bfdb1340812c2ea4ee084891e35695987c28e654aa WHIRLPOOL db2b52c101492c7849c199f58363b2ee93b16de4a99d6d2a5a74fef5a96c048d47a68f49451dc6413c04880e88667b2fa4c435d8dccd49abccd9882ae0449d59
diff --git a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
index 35dd52938da2..6141673886ce 100644
--- a/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
+++ b/dev-perl/Test-Regexp/Test-Regexp-2017040101.0.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Provide commonly requested regular expressions"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-perl/USB-LibUSB/Manifest b/dev-perl/USB-LibUSB/Manifest
new file mode 100644
index 000000000000..825b79e5d858
--- /dev/null
+++ b/dev-perl/USB-LibUSB/Manifest
@@ -0,0 +1,3 @@
+DIST USB-LibUSB-0.05.tar.gz 65014 SHA256 103511531daa45ad03c9cf4d17df17ec708eccee5b448a14b97ae73f416cb4b6 SHA512 9c7c3f645c7bc9353df5878d44e562aaebcecdffdc5f192d1e50249983bb9afbc5adecb3aa530a9f4e81a09ad39382f0a2d75637462568c8214d66f6c9176230 WHIRLPOOL 2f3573a3376accf079c6ee709acd19816eaf2bebe823470fd8d9d40ea9ef2d634cbaee9827c8740f56a06f37c12a9e2765693231b33d4ba6afbc7cac85972d8b
+EBUILD USB-LibUSB-0.50.0.ebuild 468 SHA256 d249b9a15054678d87de45cd0529f0ca90039ccbfdc53c4814ab1561f2d93552 SHA512 861eab6943ff410d0069c2223f89731caf84ca8d5b7cbffcd4d55f7017bf6803feed0b8ffdcb64227a1f60c5cdb9ff9e49e99a91c40c2f4694b2a3ee2ea31701 WHIRLPOOL a93bf76cdc50e75ed9d0158d8e9e654167cbc9c5b3c8d8c05ca811c6e999b2e1379835cd50468127ca4bc3950167c20374c7adff73c188bf9ac5aa8bcc33b6dd
+MISC metadata.xml 380 SHA256 9f772c0b21f7c7880970432f8fd6598e64601e801b9d86dad9a82e7b91fb3a14 SHA512 6d769e95dd726bdffb02318b577e7c46a445592d3b750d19823d874ecb6f6cc1fc7a31e44800addd9ea1ff120b04049733195019f878a8997e047dfed3f771bd WHIRLPOOL 4e141cf8d669f31c5415683cfd2aabe47e1127e88f3f414d1bf6f1d9e15f8d839bbbde728bcec7d286ff8391c3b68d5bb5afbd318e7ac2bd94409ad76b94c319
diff --git a/dev-perl/USB-LibUSB/USB-LibUSB-0.50.0.ebuild b/dev-perl/USB-LibUSB/USB-LibUSB-0.50.0.ebuild
new file mode 100644
index 000000000000..8392f8db2d95
--- /dev/null
+++ b/dev-perl/USB-LibUSB/USB-LibUSB-0.50.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_VERSION=0.05
+DIST_AUTHOR=AMBA
+KEYWORDS="~amd64 ~x86"
+inherit perl-module
+
+DESCRIPTION="Perl interface to the libusb-1.0 API"
+
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	virtual/libusb:1
+	virtual/perl-Carp
+	virtual/perl-Exporter
+	dev-perl/Moo
+	virtual/perl-XSLoader
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? ( virtual/perl-Test-Simple )
+"
diff --git a/dev-perl/USB-LibUSB/metadata.xml b/dev-perl/USB-LibUSB/metadata.xml
new file mode 100644
index 000000000000..e10a656f860c
--- /dev/null
+++ b/dev-perl/USB-LibUSB/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-perl/USB-TMC/Manifest b/dev-perl/USB-TMC/Manifest
new file mode 100644
index 000000000000..92363331305e
--- /dev/null
+++ b/dev-perl/USB-TMC/Manifest
@@ -0,0 +1,3 @@
+DIST USB-TMC-0.005.tar.gz 14897 SHA256 d7aa03efc15c58a320e04fc4beb156a4d18262583a43a242427cc39f76f34064 SHA512 25646376dcabab92c4abf82e22649dcea3659762b17860b09280d314deeb373b32fae962d284d9d3eadcd5c2d07da1285f873dd3408c0c6425cafb3082c07575 WHIRLPOOL 824eda406277f0e7123e98879c0e7dd36c7f2ff0b8ed5595dba6c13616df163e16400d165502c3bd016f79020c77782f3e9a74c18fb1272e8a8b5384e189b7ec
+EBUILD USB-TMC-0.5.0.ebuild 542 SHA256 a19290553cde399944f8f6208ab6223e2fc8154f17e23ff914aca613fa90ea33 SHA512 63413115da76e77c5b65404cee70bd6ca3de76f5428a908bbed6e5dd5cc7fe2c1f69f8be5ee942a4b8ceeef0455a34333e1ca142d9a236ff3417d3f7d956a867 WHIRLPOOL 1a365e183fbee1e63e88d45ec93e5e1154b37ca694c0624866d1e75884b08ee0ca1d22a2a2a926e52540ff4ad557dabe74dc3197ecdc7873f0fd966e68c8b319
+MISC metadata.xml 380 SHA256 9f772c0b21f7c7880970432f8fd6598e64601e801b9d86dad9a82e7b91fb3a14 SHA512 6d769e95dd726bdffb02318b577e7c46a445592d3b750d19823d874ecb6f6cc1fc7a31e44800addd9ea1ff120b04049733195019f878a8997e047dfed3f771bd WHIRLPOOL 4e141cf8d669f31c5415683cfd2aabe47e1127e88f3f414d1bf6f1d9e15f8d839bbbde728bcec7d286ff8391c3b68d5bb5afbd318e7ac2bd94409ad76b94c319
diff --git a/dev-perl/USB-TMC/USB-TMC-0.5.0.ebuild b/dev-perl/USB-TMC/USB-TMC-0.5.0.ebuild
new file mode 100644
index 000000000000..0d028ca5ac00
--- /dev/null
+++ b/dev-perl/USB-TMC/USB-TMC-0.5.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_VERSION=0.005
+DIST_AUTHOR=AMBA
+KEYWORDS="~amd64 ~x86"
+inherit perl-module
+
+DESCRIPTION="Perl interface to the USB Test & Measurement (USBTMC) backend"
+
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	virtual/perl-Carp
+	virtual/perl-Data-Dumper
+	dev-perl/Moose
+	dev-perl/MooseX-Params-Validate
+	dev-perl/USB-LibUSB
+"
+DEPEND="${RDEPEND}
+	virtual/perl-ExtUtils-MakeMaker
+	test? (
+		virtual/perl-Module-Load
+		virtual/perl-Test-Simple
+	)
+"
diff --git a/dev-perl/USB-TMC/metadata.xml b/dev-perl/USB-TMC/metadata.xml
new file mode 100644
index 000000000000..e10a656f860c
--- /dev/null
+++ b/dev-perl/USB-TMC/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index dbbfe5bd1c2d..8a9a345136e9 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,7 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 SHA256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc WHIRLPOOL 96261f2c2c38458891afad057716bdfee05f74e9f15a8b8ce2eab4445b8c56256cbcb33326631ac1f3624e2c998d490f5e057c348b3a3eb44a9260c938beda61
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
-EBUILD qscintilla-python-2.10.1.ebuild 2010 SHA256 ca945f5b9d93ef7a6435f7b30c49b029ea188000f18cab70aa11009e66093bef SHA512 cb7c980d799950a82b183fbb8d9bf97fa2b25299ff33fe169832c1f2c24a1fb6d9618c5e8991de96f4fcec015667b9522bcc8504e0515f1a42072c4605f4082b WHIRLPOOL 919bdef98fd9a7ea93504b269704419ce6e99b99505ccf5026175e1161397cb7953821b70cf5b4bf26b49c1fc79e5ca8c123f9f128c646f77ae8c212e85bd9ae
+EBUILD qscintilla-python-2.10.1.ebuild 2009 SHA256 e617dd930958dc41cd6756969690935e995906d9dea69662abfec1efbfe5182a SHA512 484429fba716b797321836e25c8cab3e2c503af1e1dcde7cede601a385f930714e1abed28de797922caac8f37c5d4db74754b36f587ded7f9984be212554b217 WHIRLPOOL de1f15741a550e6cbc8312934253f8646f4988f7cb022e8d0b77970a235e392ece81d9ea4e706338150a3c11fbe775b81ea6af980f7824c3a069f8f203310fca
 EBUILD qscintilla-python-2.9.2-r1.ebuild 1486 SHA256 221fd6bf46fc651d78697c0749328df376d3a64e265270b82bbaf7086f10f398 SHA512 f51fe63953aacd8a8652ccd11dbf5a4875ee9c826b70ca2a751d77777570e2993ddb5bd58570db3d617e51b5d97722df7ee3c9be656bb6f343e997ada9cb5e64 WHIRLPOOL 3a062ba5e21dcac3c9ba41a7c124b072b3cb78177ea9cd5c5e5f80b5173c2aeee447a0730d8ce62a9fb057698fd7f53c2509a7a7432d7d8c39f72b44896518a5
 EBUILD qscintilla-python-2.9.4-r1.ebuild 1772 SHA256 2f06475354a779482882b5a454ca35a4b6e87af9a614376118d73cbd7f888a4b SHA512 7e171629e9f4e52c49a9254f8ab54dd4d27088b19adb5a59c78de4b47646d1cb2149272f5d34e992ce35b40291e7fc7f7c598942e4f13a1aeab3bf8616861698 WHIRLPOOL d51876de703181df2e5dd09bfebf39a7119f37c0e75e8cd674f057e9489ae0cc32d636261a85cd98ca413af0e2bf0a6d1c1faa3689bcfff087e458dfc2daed5b
 MISC ChangeLog 4331 SHA256 299e9fb37d9733ff48a9cd13e087fb962ae1afdb0d742b6f2842e2ac5076590f SHA512 db72b669de88184af4c10893459716edbf7aa357825c838d22f8bcffecd48321b2aea0a29df796edd3847adc2dda43046f315ad225f85452411dca4c61332bdb WHIRLPOOL 3ce85eea261005cce24ccdec913c14aa1dc2fc85f97ceaa6829e2edd44e8235b1c70c63686d5481b23c7ea7bdca10d7b88b181b7677a74bb167e6736950949e1
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild
index de393e595d81..d1fb97c65ed8 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.10.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="debug +qt4 qt5"
 
 REQUIRED_USE="
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index e38f266f92a5..0dfa26d6bb70 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -11,7 +11,7 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 SHA256 edcdf549d94d98aff08e201dcb3ca25bc3628a37b1309e320d5f556b6b66557e SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f WHIRLPOOL de5ff1380b3fd9cbcca741d212ac516e3f8a31366219605730cf5525a04e4efc9965a9b3cf8e99f50a2912bc7add83f61e7f90a85e176ad2830e4c1422b5d682
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 SHA256 7fe2bb468955f633c71b3ddd3c269e68a2c4137a4e5b8dd12dcdb34cbc6d609b SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7 WHIRLPOOL aed0b8aac590fad17b4f9067b46097e81d9991307b296428a9592d66a7c11967ee3e9a50b1d05afdeb7503470e658b016ec5af5c71e71059bd4c0d391b845f95
 EBUILD qtcore-4.8.7-r2.ebuild 2865 SHA256 2af381f8700d70c589255e8144512a2c248fb9736a968a7b722bb1a0365d8b02 SHA512 2ff2b7002e29a154fa4f8977484f5af595dc96a38c6b4cf034b637e1237ce40d270ceaa3b220172d119a0ce61f4b10cda9bb3beb477bf376668bc88c56c0e463 WHIRLPOOL f4468c5ff7793048b4901edd6893701d364c36b40e35c367d052989762778721251e0f62e56d88544f1e2d8f2bc3d489999bf9ae83c988e2e83bd576b782fb77
-EBUILD qtcore-4.8.7-r3.ebuild 2869 SHA256 27d723d4f20f37763cca746715c612b3bd330ec40fc42a2c31cd1277d1b0fb86 SHA512 321e5d22ee29e240b4a713c2bf7d0df27c3b797bdd6a9c2cd329c0677708c079bcec787df2062123efac41aa45fdf20cb794d32e469079aa7a64354c7f203006 WHIRLPOOL e2f24764af386b4c49d97c47c7d3ef12729e8a149883ce117685c764528e8d6baf61d2d11a08394ef240732c36ee1f13cde87928031db7f89f5023ce6d4911a3
+EBUILD qtcore-4.8.7-r3.ebuild 2867 SHA256 34101de6d535ae7b8927c97d266f81c2c98dcd8c7719eaf97ccaf5d7d897b3a6 SHA512 fc8578acff7a45b4cf51912f2cf6e54a3ed89778f0f66d122b92302e7c17eabe06e92a3baa3e36683df86b1c949b1555d8b7b2fcdf04be82082f0fd9ad7a6c78 WHIRLPOOL 5e2fdba4b81729a884416007a7169ccef1763f9cd2623818f1824b148d50dd19860dbd80f921cdd7ac0828e548b6bfccf9b167b82dd17ea3290087a694e9d690
 EBUILD qtcore-5.7.1-r3.ebuild 896 SHA256 5e5147a1845598ad8ca5dd3adc0a48e0f75c2a83ba4ed55f4ea688005babf53d SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158 WHIRLPOOL 142ea4799f6d8d9795f2f63b3acf7c38bb6c2b879e03589df1cc4ee5f1adb8146054a66f92cef22adfeaf7ed72f213cab4fdea5f98f58c3661476a95599c13f2
 EBUILD qtcore-5.9.2.ebuild 1389 SHA256 2a348b867a9f2698d76dfbc29fe88f869a7376498c4a329d76da7891ec4a7b03 SHA512 b51328052f28e8cb5f48ae59834553fb995099245a0e6b3390fa0006b89620a889c45b36baf5f028ef1111b87597380c940c6df0a69a14aac07ca6824d795fc0 WHIRLPOOL 62325390101aeeb78c53da2113be3b461558f062fabfbc676d480927bcd98941f36ff69b98de52fd0a3586cfc802e1c6c35a13f5ffe1f7ffb3aad6f9ac01c34c
 MISC ChangeLog 9693 SHA256 f4aca4d960a27efc5b05da84e8bb5e12114d1298585c1781667b9609448ef945 SHA512 95ffb29b0a99815353e2ed5fb9d4588b563aa0c291daad187b48c4d1875836bf107dd95bc0b373754c33ca6208491b89066038969f63a736551122721d823a1c WHIRLPOOL c4a321c22421fe056e69a33a157cb5f74c1be70efb0d3eaa560076e945653fc7bae4468a8867892ee9e3ce7ce4697730881dec9a3be2b45f4fd866b0c3b19f6e
diff --git a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
index ea5ea94ee351..84b3ee7f9c61 100644
--- a/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
+++ b/dev-qt/qtcore/qtcore-4.8.7-r3.ebuild
@@ -7,7 +7,7 @@ inherit qt4-build-multilib
 DESCRIPTION="Cross-platform application development framework"
 
 if [[ ${QT4_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd"
 fi
 
 IUSE="+glib iconv icu libressl qt3support ssl"
diff --git a/dev-qt/qtdeclarative/Manifest b/dev-qt/qtdeclarative/Manifest
index 5c28f823a6fd..a562cd0be8ee 100644
--- a/dev-qt/qtdeclarative/Manifest
+++ b/dev-qt/qtdeclarative/Manifest
@@ -3,7 +3,7 @@ DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe
 DIST qtdeclarative-opensource-src-5.7.1.tar.xz 18976920 SHA256 fd13dd3059d20694a857ed30ee56a2ade908c0cb93246f9804a65f7a2d775d56 SHA512 8c56099a13103f4831a7ceb29223722c1f8efb0e9a87a4c1fdf0b55a3c5b4cedfdac6e06960ea5d03df4184b3d1c6bc3f21bdcdbd2400591143930aa8e32a2ab WHIRLPOOL 36fdf7de44aaef1b5f6a6b7719705422cc4593da1a79e156a797bc86389f96b0bd5658b00ebc7177ecb2e5e17c3beead4205ccb7fb0d0eb2ec8679c5a58ae6fa
 DIST qtdeclarative-opensource-src-5.9.2.tar.xz 21435732 SHA256 0d40fd4de9c73b9173d8308c0dc37952bf5c747d87ff221962dd2f848d820b08 SHA512 49b8b50932b73ea39da14ac3425044193dfd64eabceadba379aa01cf2fc141177f9870c387caf1cf93ce09e8b197828a54b8d9fcefc4d9cdf400a6c6dd9a9e90 WHIRLPOOL 64b9f7d8c1c7930c3695d7cf24c2f6d61556fd9fb69347e04b5c47c8542fbefce385a436e7c68b0a3ee355c301ea8f5c9316256fbc0ac540a4c2e46acdd9012c
 EBUILD qtdeclarative-4.8.7.ebuild 1493 SHA256 e73031c19506f8d72d260d1e81c623daea8fe39d2ec457dd2b84324cfd9e7898 SHA512 b01c643b5d27f41e862260743be6701464ed145063ebb6642f5887b648b2f6e8c92c960d81e221a46c8aa7abc9461588953756390f080a7c6a02c53011338ca1 WHIRLPOOL a0832a8f2bd9a9f0512815ceb5ab9d2154c52c66ded070064388036aa787a4a12f0732f7065afcc1fa128ad4ed07b4ab900294c201fb71f3c57d3a3407fcb22b
-EBUILD qtdeclarative-5.7.1-r1.ebuild 1603 SHA256 b3d896a4d1ae7bb76ac7ea457bc7c58830f4005984da3150a7eff57c6e06e7cf SHA512 a6bbecdf2e505a3ce906f6a84881747655ad44b122439ad7e95a9a61537f9a4360a271b3a8d74288aa498ddf3174b5e7f842f1e64d0c9eb29f9042896cd3add2 WHIRLPOOL a1b5f6cac8bff04681e831df1ce5e09ea0a36801fb31183f2b99edc2e96af520dd4d7e453fe753b68a7dbfd52f1d351c1d5ebc9562186d1773aff63ac7f9dba5
+EBUILD qtdeclarative-5.7.1-r1.ebuild 1602 SHA256 4831748d60b4e9b6cd04289abd7e00f733ba3691566d92a7ebdf2cf6a66bb8f7 SHA512 a384efbd9de82e2bb9e95e7f3509765cc3be5e5d4fcdab906fa57db2713a8f5f215b0f3b4ca09438db17c9c7097e80ede9d678fa0f89eb9cb11f2c93c3dcb375 WHIRLPOOL a6f733a526890d9820f9302393a331408a71c6782d312af5b0d56ace437c5c35a230eb09f913b08a643510b49f042a6af80fe4f5d9d80e3386d8055a4945f9f4
 EBUILD qtdeclarative-5.7.1.ebuild 1327 SHA256 7698e5beb203cd86095cac30ce6db015819adde0bf6eef6ae143de2d847e5184 SHA512 64f80c5f910c30dd09967e2b3dabfb21a4d7b4fb109bdc6512ded41ab6922f3a4034bb4567a7efd065ddd28eb2ca8a9763c283e82829d26e3e44600aa9880942 WHIRLPOOL b3ac40bcbb85375f2ca4fccb4781360eac694d86884876eb20dce946b330001e4a0381e528b2172761ceca9b711255fa3ebc8270fe983ffc5ddfd70d5f2f7987
 EBUILD qtdeclarative-5.9.2.ebuild 1313 SHA256 7186360234d5e3dee430fca782e09af3cc70de7b2fb813d0cc09257a65c4fa2b SHA512 c50d3a2fb7888b99e68d9d1ea379e923d3162a5c736db0bfc9f5c836f89f9f6d0da00859b8ac41a09f1499c339d6e3ed5fa7ca63d282633dc3d167bdf17c4190 WHIRLPOOL 9b01ccfc9af77cb5441fa23015d3e821a05b4cf29322699de142c5b088f431611a61bf1a1ff92eb483a2c6b02a23726770619caeeea0063faa23e50cda4025a2
 MISC ChangeLog 8724 SHA256 27f43aff241f22dff7849c15195398ac8a39176a5410e22751407e1fbb4c82a5 SHA512 6b10be21f2aae4a7262a56a0acf86a807794ca7b03db1e1be00b90124211740f85ec0455ebd85445c252fe50342a5fc6c4aedb41935ef976ee87204c1b8ab7a1 WHIRLPOOL e0bed2d44e927503d0910d8607888e4dc3dabf9dd4bb1f067a1a7a7e231aaefcb3de275ae118f35007e545ae5bc15ebf03416c7b22feb04fccbca48a0b83e347
diff --git a/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild b/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild
index fae6450312cd..3fa85027d187 100644
--- a/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild
+++ b/dev-qt/qtdeclarative/qtdeclarative-5.7.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit flag-o-matic python-any-r1 qt5-build
 DESCRIPTION="The QML and Quick modules for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 fi
 
 IUSE="gles2 +jit localstorage +widgets xml"
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 3abfa60a00cf..b8d9a201d85c 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -3,10 +3,12 @@ DIST i18n-0.6.11.gem 61440 SHA256 b37dda25b30484f2674a851e24ae098a38564a61c976fa
 DIST i18n-0.7.0.tar.gz 57647 SHA256 8a9ea123661e5da978ecffadc8d1b7ea50ba2d8e9de1455d61e7848cc6c2c855 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14 WHIRLPOOL 0f16ab5f06ae7ec75eefbec985d183dac5a2cd572d6c70fc3de8616bec8834e210a5660a74657ae3397017962253350e6bd926c0d2c9509400ceadc5b365fa9d
 DIST i18n-0.8.6.tar.gz 59657 SHA256 cf032a810f5320b7f518ca2fe6fc778a5a59360049e0b150513d5af681ac410e SHA512 fe55729b5d9d2af7112d030c020257a98e7504aa554f691a759f5abe48058949442296ec154060d4a3243cefe0d6d420417f3aa8c857e3616de9bc996decc8cb WHIRLPOOL b113c1b3c47c900ff0a490994033c2dc40d7f2046f102dde6e10d980fd00de4c9dee9f65279e64fcc9f7d0b5746897122719f68e27e28c3cc93177c69268e30a
 DIST i18n-0.9.0.tar.gz 60524 SHA256 9136723a1479e30625b0197319cbf0c2386ec4cbc43676eebeb93d35aa6d092e SHA512 9be199e3cf78879bafa11f80425e5ede710b5df180a81b89aafa56fe74dc9adc209ef021d5e8d4cae8d03478dc19388279316fbcfac366c0d682d41c5727e978 WHIRLPOOL e816e8af9e7b2ba033d20a3f621246371031c7d661a888770f961b5d086eb96a421681e380b2a354ec436e980331279236f1c782c7060d9dbfddf87ef534ec8a
+DIST i18n-0.9.1.tar.gz 60359 SHA256 c38cb998df3add22af0c1647ef3ead4f2d71d72a2275109efc8c62663f09bb22 SHA512 9726dea0b5aff12e6ddf499ddd5dea0853d345241b1ff19d6f97106a3f5f592b3336d2afddcd0717d15ed04c8098a8f9ea2870f1388353e073f78add2f0a77a5 WHIRLPOOL a7362faa0a6fce99b0e96baf5e6ddbe8c107ed7278a572912d86686d5b1930ede0b6b4357911fbd1383c0b54657b88999c51cfab5c6dd636290908acee7f87dd
 EBUILD i18n-0.6.11-r1.ebuild 1325 SHA256 3f8648d2e772a1d14597c0524c5e47cf992a3d09e94f6a1ab0027473c1bc5575 SHA512 0497dbca374d5afd9e7064335457fca6fdc8daf2d20bc550bc04603748f3818e9d44799ac510004afc304ecfc1774053d8928d9352da62e5d4197081791010fc WHIRLPOOL 00fad1c260e867533f247143aa08420b78bff18acf2cf587b76f5e1727075495abc46c144934eeb49ca296d43a94274270c71e718dd3020d09422f728881b1b8
 EBUILD i18n-0.7.0-r2.ebuild 1514 SHA256 2e315e5597ae1c3cb301e70b4f10256532fda80505d14d37e547845078ce9cc3 SHA512 fe0eaaeda79550bd120e08fc6adf0a17d6e437e2682578dbd7dad08145e4188b37ea7f0a590d27a3548fc6b2e2989210957e39b94fe2f570234f5d7c06bfeff8 WHIRLPOOL 698af26ec61efadc4695a87516450b26464d73e5cd5c72cd185e774883e796a2a4cf4ee13fed1b4d6576552efd257401fc4eecb34d754c513de3e6b4177f3683
 EBUILD i18n-0.8.6.ebuild 1350 SHA256 d7ddd319e2cb940d36482a9a0ccb870a33abcf5db4049a04d31cd66c3bf2d666 SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37 WHIRLPOOL ac0411ad34a4f33f822e320655a47c3aae8e7f40eb42cf206eab569fff87a5a834dc62419d81aa5152c6585c81620c811c7bf79ad06095633674853fe0c77110
 EBUILD i18n-0.9.0.ebuild 1394 SHA256 2d7b09527e8b73a722cc330b2ce90208732491bbefe33d3ed18a56bdb8ba23c9 SHA512 22ff3a7d472c7a5c2f6917ae61d556c354fad4086163acdb73a765cb48eda312efb49b2627891f86b1a9cb6e3f049a295ab32f1a0566f8bcf0b46775a5fb837d WHIRLPOOL ab724d9f3b255ce30c87d82d81cf67cafeefbc18cc86b1e03da6230d69e73a3a5c2e0d9295958b679e6977e63135f11e6a4666f4de73e8c21eee721c4c83aaa6
+EBUILD i18n-0.9.1.ebuild 1394 SHA256 2d7b09527e8b73a722cc330b2ce90208732491bbefe33d3ed18a56bdb8ba23c9 SHA512 22ff3a7d472c7a5c2f6917ae61d556c354fad4086163acdb73a765cb48eda312efb49b2627891f86b1a9cb6e3f049a295ab32f1a0566f8bcf0b46775a5fb837d WHIRLPOOL ab724d9f3b255ce30c87d82d81cf67cafeefbc18cc86b1e03da6230d69e73a3a5c2e0d9295958b679e6977e63135f11e6a4666f4de73e8c21eee721c4c83aaa6
 MISC ChangeLog 3882 SHA256 6f0759b048281039880c71c6a4397a47f508ec0491915a3d41317b4dd8447615 SHA512 36ff26f251b426fb83343916cc3585b3838908a5256ecc61751b0a2f89ada1a4b0c02f4073473ede6e7ce1e556bab3b4519db0dcd88a78d4456c47ed82f7c454 WHIRLPOOL 1b4848a082b37e596a249e232eb68432226855d11889bc2f9d831c0f39cb0d9da363ede0779b8e41bb24cf8c3b6aca3945068978a8ff898b5a1d19e2fc536cd8
 MISC ChangeLog-2015 9475 SHA256 10cf2ce9e011489259b52876e0949a20599682f19777d0ef459e825d5b300901 SHA512 f5a103f6a0458fcff3d6eccc0ed38b174e1cb4666b2753bbc057e42d90af6d76c1985035061ff8287b13dcbea0f5c154031b7ff4d0b06853807066d791351711 WHIRLPOOL 6243d1648d9045466e1f9061438a5e190320d1c824c92fd66980af41fc058be39ad3107419123f16d5635e100926171b8bd627716f8aa7db82663714721088ef
 MISC metadata.xml 340 SHA256 50139611a981dafa1d64ccfb5d1bce1c5a5ae6209047a19635a98adad10696cc SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64 WHIRLPOOL 9e5c2266b9e6f00f42d846eb8ea1cf31e6302ab252e1c3aa7c1e347fefece2bb08ff0423afb9673f9a59c7da68970b9060be42cfe4a67d63982ecd6e73845d3f
diff --git a/dev-ruby/i18n/i18n-0.9.1.ebuild b/dev-ruby/i18n/i18n-0.9.1.ebuild
new file mode 100644
index 000000000000..fd42d43ee0c1
--- /dev/null
+++ b/dev-ruby/i18n/i18n-0.9.1.ebuild
@@ -0,0 +1,53 @@
+# 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_TEST="test"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Add Internationalization support to your Ruby application"
+HOMEPAGE="http://rails-i18n.org/"
+SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activesupport-4.2
+	dev-ruby/bundler
+	>=dev-ruby/mocha-0.13
+	dev-ruby/test_declarative )"
+
+all_ruby_prepare() {
+	rm -f gemfiles/*.lock || die
+}
+
+each_ruby_test() {
+	case ${RUBY} in
+		*ruby22|*ruby23|*ruby24)
+			versions="4.2 5.0 5.1"
+			;;
+		*)
+			versions="4.2"
+			;;
+	esac
+
+	for version in ${versions} ; do
+		if has_version "dev-ruby/activesupport:${version}" ; then
+			einfo "Running tests with activesupport ${version}"
+			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
+		fi
+	done
+}
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 9739026fea8d..f1768085f05b 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,7 +1,7 @@
 DIST mail-2.6.6-git.tar.gz 964019 SHA256 4553ded4ff62bc63f00e9e0702e9b0c47103605e18750657d4db26993faf5410 SHA512 ab97384724bd40603af0a90ab52d8694132dda38837fa77704d857418bfa707244b69f9325405d38231a03f4ad5f213f2f66dee2d89ea72e6df543d3cb2eadfb WHIRLPOOL 537358a63234a73a1afadaf71ecfbefd301c5058b1c1f36b430b5493e9ee451196c141b03765174d79037b7bd052223f570d14e579050d8bd17853cc3e259640
 DIST mail-2.7.0-git.tar.gz 620982 SHA256 401c8ab8e033584f699370246f515e5dfb80ecf63f5c59b07acbdcc44102f9a4 SHA512 13cc4ba3a49ff9ae74691da0fcba41064b3d5af4fbe34c6e83563a6da069fe006707460534f9ee5b0c613039cdf207044272944bc04eeffc5f8834332554ac63 WHIRLPOOL d10f188e175b9d7b2bc892932176d8638a688ddf530cc8bd31b2b34e3607ceeaaf225b9c7999370d0654246d0ac102c88f3ea2f97893293e340aa3f23d9dacf1
 EBUILD mail-2.6.6.ebuild 974 SHA256 5205cf82d47c804493e17a88e9d405fae00f31d6ee8a2ae518a698b5d826f916 SHA512 cdcb1ea5c86c84020a286cc66ee4f6ba508cc6bab23a807f11b33bf83797363658eba66e5ac31c762b8980f8ebd73d6b857408c614a79ca0c29c7d22d004ecd7 WHIRLPOOL 950830a6cc99281af2c4e7708ddb77787d551134f65baa97d55b9f0a9d25f79786b8626ecefc6624e3307b7fa6e49a81b084576ed18cca30ed916fc0ece42f94
-EBUILD mail-2.7.0.ebuild 776 SHA256 bf505b8459d2e3e6f5aad324fbaa0f50bcf49fb81a88b0f3ea88351e4ff089f8 SHA512 2ed0fbe6b002f368eabc2e6cc774f2b7c9ef58fe96f227d0f90c19fbfe427d0a7801dd85e11ebfdf9530780d2d0c119d86d48fe71d3a19e212ba992a2c4a81f3 WHIRLPOOL 7b4b10f2c320dcdb0de5c577377dd6a4a4bdb8ee230b572616ae7779e3f40edf9bad055eaaed7ea493bb448748f199f4fa857cee6651a993cccf9dac0ff68b21
+EBUILD mail-2.7.0.ebuild 781 SHA256 ac1a05beae10edf6e2897a45b0d8fc7ffb37225d6b2a88a49102bea142c4bf64 SHA512 8f8f87d2e20e4859b58309aa49f7d1794ea4c385202d43de19a0be33bebb61af6f66e72e9cc4642ef91b99e963bb73bdda06f332f5bd0120b0aa262e91daee4c WHIRLPOOL a7cbb5afbccf618f35ca3d3931d5059e427db72950d3b1c4196db6c53d8ea0bcc3ea81f8b2646527538f26d7cedab17fffa6c4f5a73a92937761a8c606ee16b2
 MISC ChangeLog 3367 SHA256 5fbb76168aa068206af152fb509346edffd24690562a9c38e74749e5296342d2 SHA512 067b3870496a9bf3f1058c116ff348e8a22e19d341ca5895eb6d75b0d5dbb61e4939a5a0e9c5f60c1a8ddc0297d042aa8c73ee819d9c91d59dea629e4e756476 WHIRLPOOL dd8ea278710aa5dcb359b6f8353c27c795c3cb1dcb8eb7f328d1d4e779fca376311dd950a4b518f315bb7552abb8908d726fdcea3b5d83a5ea41903e81b4ced7
 MISC ChangeLog-2015 5493 SHA256 7be771187fa0d48be7f12729b66f9ed65dc60cf91d8818aaa566bc592f3e9036 SHA512 098432c6788f865f661307e8ef53ac39ea4214513f26ac1b0d4e3864df76fe23bd8a1b66be8ae47f64708b29f4029d0634dbcbdf8a465588947930df354b9fef WHIRLPOOL c50b9fc7b9c1743a1aa0b1a1588a21aa0200023053acb01e458533ca86f252265bac595138c79768860558816e89c766d51f508611d0ad6ff4fc04e32f807c54
 MISC metadata.xml 336 SHA256 263973014e3fd7623e638cd816a51fa1e99e155436e6288660c7a35deefd2838 SHA512 0952e9c85bcf07cc1adc299d0812259156410f487f2b10a77a29f7871128fa35595b605579f85b0868179f60b978585ed27cdc069608094f7fe186b5e15ae1b1 WHIRLPOOL 50ba40a00e0bc5f7a7fb1a25d3e3e0023e6c566b01fd3543eb93a74b8c79423271133ccc89face69330c850ce0eaf0e90a32ae608bede3e8b3a89a93b0ee3db0
diff --git a/dev-ruby/mail/mail-2.7.0.ebuild b/dev-ruby/mail/mail-2.7.0.ebuild
index 37eef9d35b8a..a8302ca72f4a 100644
--- a/dev-ruby/mail/mail-2.7.0.ebuild
+++ b/dev-ruby/mail/mail-2.7.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index 47c76c5bb289..9025619b4cbb 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,3 +1,3 @@
 DIST mini_mime-0.1.4.tar.gz 31171 SHA256 20b9b9a2ca1661e237d523fb39f37a22aaabfe4d57bce980a8ecbede8663b6e0 SHA512 7895ac02fd0cb376241cf6e769428c1587bd4b9a777a6f44cfa6496ddded34c78a253fd9146de883b108a67c02e8cdfba3af1997ba11f6775469c2ac55999157 WHIRLPOOL b7510c8dd8704d59d1043801b0a104dfb86ab0b64e1d404499a6b07f675751140a47f2954bf9c03b4296832ec72d720554e64946514f021f6d74eb0eb4340f1e
-EBUILD mini_mime-0.1.4.ebuild 661 SHA256 6ea0025c7632e6e929a94e04868fcb8cb8354e995ca42fa11f108e5e691153f8 SHA512 0586fd5652c94af0e1bd8cc9e15c4b2705d3d7f17922b7e208ef6b7db1960de58c323507ac0667110ece62f63d963561448a105f91ff23eff6cccbf5310785cd WHIRLPOOL de78262d0fc43b0eab8dca56acb42abe71c6a2803e7edad7c0d0e88b9b170fcd4efe4bf5efc616972260743c4e18a92138d8c6c6bd33584677c39c1c3d9093a6
+EBUILD mini_mime-0.1.4.ebuild 666 SHA256 893c36262ab2d955779f7f249d3bcd5349780dae3c45e47c6f6ce3d89a81124c SHA512 6a642e79078c9b0d4eeca7deea60741ecc8e87c80e24c1f6b1f411d79adede526743feaca4d926b60646ddbbb873ed7d813e47ccb317c18982e5774d308fcf24 WHIRLPOOL 756f344a9fb910fb96e11dc641ce6a582e070349ee932dfb534449b38e8bcadc0fce0917d4a789862ef28018bba106a11d6c31dabd4044227462648bde1a3aff
 MISC metadata.xml 345 SHA256 4dc2d3e8d53350bf95d8b996262c96b3dd49f7901e6a44fb13b31ba567b60ad8 SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43 WHIRLPOOL b1db4728458e11b1c8a8b19bb7804956b66d174132e8021e068b378603f1bf88596d411454886c6a368eed77b7cd7e93340cc9bff538dca43178aa3601ecc27a
diff --git a/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild b/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild
index c4335096ed6f..0b95e1269bdf 100644
--- a/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
new file mode 100644
index 000000000000..1424a8cc957f
--- /dev/null
+++ b/dev-util/goland/Manifest
@@ -0,0 +1,3 @@
+DIST goland-173.3531.21.tar.gz 213040527 SHA256 5738129cb5ab81428cf6fa0ec18e97221b1303d966e679e575a0ac8e669170cd SHA512 db2deb4e52fb4135e3fb27c63a181c34acddf61dd2bedf81e50144a85b3e9bcb1a7490532b6841815e2b888c660aa26bc8c3176f83bb30bcf20ec568cdfeb65b WHIRLPOOL 51502c1d35a582601378a6ed403c4c84d36418a340f00479180143a1eddcae05832242f9bb075ebb63c906c5f0385a5ef53a32b4d2975669a8b54266b9778e8c
+EBUILD goland-173.3531.21.ebuild 1040 SHA256 1b465b0ac140a4a11f9a702bfca9de927bcec78cc4250c212ba00e07ec28fb8f SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97 WHIRLPOOL 0382040b962041a64e5b6703b3412d63c7152ee0b0c68b7711c46cf8ec32bef3309364115ef6cf4cf13b44cd40f71b82241b194653c680025ce29099f643814f
+MISC metadata.xml 245 SHA256 6fedd876236c2f1fe2687e73628381650ebecef9734f88f6d483bec5bf475a7f SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4 WHIRLPOOL 4957affde63b54e118270c40ce12683872777b41ec1a798f7b03807a99917148279d392f71cbcf95ec4e5d586ee5fc0400aea77d9e46083873a441a4907ba13d
diff --git a/dev-util/goland/goland-173.3531.21.ebuild b/dev-util/goland/goland-173.3531.21.ebuild
new file mode 100644
index 000000000000..3698daaba68c
--- /dev/null
+++ b/dev-util/goland/goland-173.3531.21.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${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/goland/metadata.xml b/dev-util/goland/metadata.xml
new file mode 100644
index 000000000000..97df2a00971b
--- /dev/null
+++ b/dev-util/goland/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 86a9a4b5588b..ad13c288351a 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,12 +1,12 @@
 AUX README.gentoo 169 SHA256 3bcfb4f4909ec42cbaba2645b5c88d111f47b7d5e800a8aeadf3130091fd8bab SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2 WHIRLPOOL f0de5cc2a1955e210655ee10d305bcfaf6a4a7b6dba46e17eece981d50bb461e9bd5bde772462a5849ebf59e54357bcfe42a5322c614bc75c1f96202654aa605
 DIST pycharm-community-2016.3.2.tar.gz 215633678 SHA256 e1092d3692118f9097e4182edfccc76159160353b7d7379cada3249b9e2d4f39 SHA512 64f8fd908c2165e4534f77596e6f9a86e72a04390432a0c1206d8a5cfde8a54067d5747a6f1f2a5ba5bb168e311d5f432939c87a15f871330ce2c2e42c9bfc8a WHIRLPOOL 92320d3f96b76148bba1e0ead93578cde6890119fa963e1390b7da2ea570d4b99e6bebdffe6167e283d534073b06cd063c2d9e70c0100436afc6b6d0fd264eda
 DIST pycharm-community-2017.1.5.tar.gz 195342869 SHA256 1a0bbf0d881527e08aad7a5adaa3ad44e8754c3eb2c3a8ed5ab113491549679b SHA512 1eac6062a1b92782e50425e053ec326965eaff6bf36ec3cf6d4e9fcdc1fe1a8baaf4d16131a38fc506c55c384943aaea51cf5f4c9d8d2e36080b7342ef1af21c WHIRLPOOL 1a655bcaa78b4a6607601229455e822cc56341c70132363a57cb9f6597f9f31ce007426a70284467cfe2c1a082972883746957e67dc678b5d379956f46a6c3cf
-DIST pycharm-community-2017.2.1.tar.gz 200410040 SHA256 4a7e5ab8c89be6ac3b6da649003260d1ed86b1dd41b7e9aa1d3873cacd7d6bd1 SHA512 734cbe66b38970a6f0c7e14d25f73143074d75034f6a29907c33998c3f83142f18f0016350916577db4497356594f144c7499f73c6a2e53e80374b3bf387f4f3 WHIRLPOOL 7dc075e2ce63dabb5eaca9a2b390d5930330ad39964b0d9e3d6ab935c141c1627696fd8f72bc862c3e684c9a454f9e3c21dd630673f01ff0909dd4c0cf01a3c8
 DIST pycharm-community-2017.2.3.tar.gz 200478376 SHA256 e8562938c2ede32a1c1036391942190144cd9f0927bd49b6b3ddf5f7a01c33aa SHA512 502b056f15367c0aaed2a2b001b218f2f7e48d65b313d7560f3b77a0337a2502628ee502cb730eb2f8c6c853460988760e10601b98d43936603afa80beb1065e WHIRLPOOL 4096a3afcf86ae17e8021783c55264625e80a87034eaf6b0612fd622f88d52d24d7c27388be0c7f9a78b21333762fcf0531bd8f17b5cd4b2849cee5298d2f831
+DIST pycharm-community-2017.2.4.tar.gz 200392450 SHA256 a72045c348981640a12fb9739e04d4985163248006150d4fd3b3c09d34216ea4 SHA512 4c98c026e36d8dd7ba0bd2ccdcffb1301d0cb79b111d032d85e0875f55d8e8a708cc1d1f319baad93f308169a1ca2aad608b940b71810907e0929bb790af15f9 WHIRLPOOL a520ec02cf93c5f177f4b4876fd0e51493d1e1abbcf91a9d1af588b4649aa646b53bef80a719d2851441b70af994023cb127db174f2526065ea1f1adf3014a5f
 EBUILD pycharm-community-2016.3.2-r1.ebuild 931 SHA256 43e97e1cd0c1a43d81d46ad6671add25dd6292a776ef2b1fc4b1e5f89c8bc6a2 SHA512 a5a79043917ac8fd8fcf3e55d52d3e22707473dd044393a99d90cd00636c5fc4c3dc4125a9c89fa3b71a1c73877e8ce7549ebaaef17c456a14c7c8a16d6009a7 WHIRLPOOL 0e67c42a09bd83180e38acfd58b99677421a616a68fde7867d661b756030bb6697ce04b6d8d8568752eba21e2739ae2c79f95125e62a507984812f02f7c71cbc
 EBUILD pycharm-community-2017.1.5.ebuild 938 SHA256 0eac4ab4d2e3ae841ccf5cb1af524ce2a3d747507ed607cd6e5b66a252216413 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332 WHIRLPOOL d0dd7d47dba42bff534fc27892c947ba93fde286511f5eeb1811fdd50b913e9aaa43d0d3f4e728896ecf6dbbfb69aa2aaa46c336786add6b0028f162b025c582
-EBUILD pycharm-community-2017.2.1.ebuild 938 SHA256 0eac4ab4d2e3ae841ccf5cb1af524ce2a3d747507ed607cd6e5b66a252216413 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332 WHIRLPOOL d0dd7d47dba42bff534fc27892c947ba93fde286511f5eeb1811fdd50b913e9aaa43d0d3f4e728896ecf6dbbfb69aa2aaa46c336786add6b0028f162b025c582
 EBUILD pycharm-community-2017.2.3.ebuild 938 SHA256 0eac4ab4d2e3ae841ccf5cb1af524ce2a3d747507ed607cd6e5b66a252216413 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332 WHIRLPOOL d0dd7d47dba42bff534fc27892c947ba93fde286511f5eeb1811fdd50b913e9aaa43d0d3f4e728896ecf6dbbfb69aa2aaa46c336786add6b0028f162b025c582
+EBUILD pycharm-community-2017.2.4.ebuild 938 SHA256 0eac4ab4d2e3ae841ccf5cb1af524ce2a3d747507ed607cd6e5b66a252216413 SHA512 7240f33cacfcd6420f986cc5b4218fa1bdc881cbb5dacdab7aab8ae1b643dac21ff5edd59a7043f21fcf113105ee485f170fd85cc61e51055e3abc08c748f332 WHIRLPOOL d0dd7d47dba42bff534fc27892c947ba93fde286511f5eeb1811fdd50b913e9aaa43d0d3f4e728896ecf6dbbfb69aa2aaa46c336786add6b0028f162b025c582
 MISC ChangeLog 6592 SHA256 97dc91aad9390c028dca7ed85d68e19fd8260ba0a0c558db9ff662a9e6cf86a4 SHA512 bbb9dd6c1f8f6d9d14c4d38e5599ecc747a176b5566b3f6950c441693415b87d60d1dbf26f515c0c023046868405ce5310daca35271a1fcc42b74803a289fe69 WHIRLPOOL fc728869fa849eeb92e0f62195895f059c3db2cbcc52fd20746303baabbd1f294a44dfa9f90a2c17fd09b42132c5ebed6b1a61151d92a944f71e7dfc56a20998
 MISC ChangeLog-2015 1510 SHA256 75d1e0701206066a4da5eaf713561b637bd4fb03003a7d2a544b24224ff04ce3 SHA512 58f11b893302578a4badcfdd4885f7adaa73aa5fedca4edd9e102049b9ce1ab2e4f1be1565a7c3f2f96be1bfe7a4833388caf7fbf2ad56417748d87905779295 WHIRLPOOL 298fd47601c7d4869cf77cad31f484639c78c589f6b8a127e714ab8cae1bfaa72bd596ba6c738e6e38779dfa4e3265b7f641b6f545657e03620d7f223b68eaa3
 MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/dev-util/pycharm-community/pycharm-community-2017.2.1.ebuild b/dev-util/pycharm-community/pycharm-community-2017.2.4.ebuild
index 6bcb19218d4c..6bcb19218d4c 100644
--- a/dev-util/pycharm-community/pycharm-community-2017.2.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2017.2.4.ebuild
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 3422252e47eb..b07eaf7a03e3 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -2,9 +2,11 @@ AUX README.gentoo 169 SHA256 3bcfb4f4909ec42cbaba2645b5c88d111f47b7d5e800a8aeadf
 DIST pycharm-professional-2016.3.2.tar.gz 283150795 SHA256 c36413a56a8a1d046c84a2c32bab8aaba132551305a5db0845a6c7ed1dc0d4db SHA512 a189ae38a70874709b0e0243dc6a1dd14aa2b5199e8cf33a0f8c85dd0606e35ddb9d0f954ec9252da7a098cbe184bfa6bf69e43b7c8475c5c3776312f89395f7 WHIRLPOOL d8350fb6d1b4712f0082bca41b9ecf2f190bc5c95a72677efc9321abe7a9f5687c05f3554c7e7022e18e7d747f1a628acde8738012eb7e354d1801e374acbc53
 DIST pycharm-professional-2017.1.5.tar.gz 269726667 SHA256 52519dfd0e913b5ccb8767155cd4d1fd413967d5010e8474cdc9a1fa688016ce SHA512 5ba5c2893587afef3b2a5f0b7a5d4395665fd8e75764f9d8c7e1c41170af0c0457f0f27953adceb74a24c8f2260cabc65ba54918bdd38271e1aba014a5428bc8 WHIRLPOOL 0eaee27ef5ed2b3a4a2c5da3211aeed596d15de928c6a4c8a80abfaa03383e167d40e2633900f26e9795720692242a1f12afd880912e57f8b83fa378ffbd85fa
 DIST pycharm-professional-2017.2.3.tar.gz 273776254 SHA256 3e6f1cd48c08363353b2d2777a581cb60bebd6c538b325767c11d02395376945 SHA512 1233b4b272017856e90125e3439f1057f22852749d101532e1b57d51c382d017fa15442307120d49a77a150c863e33fa53e799f2c77ff6d56312381a82fd51fd WHIRLPOOL 52336480fc7dee194ba707adf529814d040519d8a6433ea381a37592adfab765c4f8533360d39d97d7ed169b1255ce2a225a4430f875eb86fdefb8306b83314d
+DIST pycharm-professional-2017.2.4.tar.gz 273678656 SHA256 713ed26396f67762cb225917416d633bc8d4f35e20656fd289e74c2791be3658 SHA512 60693e48a3c28bc7108e84b9beeba073ae2ebad53dc5bf792bf42abb474ebeb4d6b7fd73211cb3152a7afdc632384903900a041df6b3dc8f73a8ba623415fb8d WHIRLPOOL 7d50d2272a935ebd96ab6e48f33dd38720d7c0c66738922af3574020bb92fc021e877c50e459fe1088909fed09ecd79597d6005daddfb4b2e39df8bf510f257b
 EBUILD pycharm-professional-2016.3.2.ebuild 1092 SHA256 9b9fc76b1e93f53ebdc1f471aa78c0f7d527823ed813624fe441ac26a05d213d SHA512 3338054b9cedc55f4b79a39e672857265e703106ef6a6d28f7beaf3e92d9ecf8fdb79b44057c2faf32bb789c448f718111c17b1d0b69a977c712748238c2a09c WHIRLPOOL b2367fd7f2cd2904aa0a29a5bf33419548d3ea2e2824016e4f94648eaf3a03c1843334e7743efe71474ea6c49561b07dbf65ad07c4bf1cda968ada427743bd3e
 EBUILD pycharm-professional-2017.1.5.ebuild 1099 SHA256 11781ef83227bb7d0b78f05dcfa122689405ca6cc2f71bd15d30fc98ab3ee482 SHA512 260a5662d26f25eafd8d74231de60447f4adcc3b066eb7f316ef94485a061afb8f890ef078a540a1b02bfcab1b74a7cbdf05db3087d15ef0c77faaa7acefb4f0 WHIRLPOOL 13d1ffdaf3742c714726aa069733e4b00b4dd79a6837582051c29cdf6078f9180b5d3029b3ef1f19bea34b4301428847daa87d3c8253a0413e7bac1d013079f3
 EBUILD pycharm-professional-2017.2.3.ebuild 1099 SHA256 11781ef83227bb7d0b78f05dcfa122689405ca6cc2f71bd15d30fc98ab3ee482 SHA512 260a5662d26f25eafd8d74231de60447f4adcc3b066eb7f316ef94485a061afb8f890ef078a540a1b02bfcab1b74a7cbdf05db3087d15ef0c77faaa7acefb4f0 WHIRLPOOL 13d1ffdaf3742c714726aa069733e4b00b4dd79a6837582051c29cdf6078f9180b5d3029b3ef1f19bea34b4301428847daa87d3c8253a0413e7bac1d013079f3
+EBUILD pycharm-professional-2017.2.4.ebuild 1099 SHA256 11781ef83227bb7d0b78f05dcfa122689405ca6cc2f71bd15d30fc98ab3ee482 SHA512 260a5662d26f25eafd8d74231de60447f4adcc3b066eb7f316ef94485a061afb8f890ef078a540a1b02bfcab1b74a7cbdf05db3087d15ef0c77faaa7acefb4f0 WHIRLPOOL 13d1ffdaf3742c714726aa069733e4b00b4dd79a6837582051c29cdf6078f9180b5d3029b3ef1f19bea34b4301428847daa87d3c8253a0413e7bac1d013079f3
 MISC ChangeLog 7894 SHA256 052b012bfa99313705176597f626f50b4450f68d0255291e612c01583508f239 SHA512 49a79a3879c528d99039c7ddf59c7a0a12943cb0604141ec234e5fb3e258a757ccef3b73a3ba63bef3384ee267eac6ecf82971e8071c5af8fac4c247f77fc185 WHIRLPOOL 17a00c6aff24f67c62df3a9192e98b50bf3deb5ec1fde1992b979d8bc2111dd8ba0f2e31926ac48eba5c867a0e187673cf39541e96fa8cda97255b896b46f57a
 MISC ChangeLog-2015 1543 SHA256 34d9ff265cf5674128d7c7fef5d0f0baebed31949e98a1783e7f98622607faec SHA512 d6fc92af3d20b9028bf57c581a8275ffb0b3d3a55bb070b4f6301ab851007159430d2e6a41016c7c38240457a90a6be34888d9c1672be5921ac0ffe2808d5b8a WHIRLPOOL 019b03f1564f4f2f90f57b112028370d4420f7c1a5d0d911ede5d1c98edcdb10bdcdc346c3c63715982b9f9f8f6cd0dcd61ad9cf86aa67745173b01e151613c4
 MISC metadata.xml 237 SHA256 ffb571839c57797d282263369646d2bba2662601a45f7bb3251bb97f716554a6 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f WHIRLPOOL 60d6da846c983457e038ea5ba3c0bf48f939c9586610985a14cac9772fd1d45d781a643abc16482f232f3028e44fe99fe1a382deaebf6589602fc244a4460e3f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2017.2.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2017.2.4.ebuild
new file mode 100644
index 000000000000..b8731d8db528
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2017.2.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils readme.gentoo-r1
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+DEPEND=""
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon "bin/${MY_PN}.png" ${PN}.png
+	make_desktop_entry ${PN} "${PN}" "${PN}"
+
+	readme.gentoo_create_doc
+}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index e901bdfeecb8..38413feac882 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -3,7 +3,7 @@ DIST systemtap-2.9.tar.gz 3258026 SHA256 04f2c607512f4867f345a3d173940e1023441c5
 DIST systemtap-3.1.tar.gz 4885480 SHA256 a7b679877502db9b3ac9dfb658c05b49f77e29d42ad2eb36105b62bf2d32f676 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d WHIRLPOOL ebb6c085c74747e54434c4ca6b6cf840bc3268dfb66cf95cd7a51553c73b75f4b34ab76ea715163986b601e5ffbaa8340a88dfa5cc203537856c30a3d88fa5c4
 EBUILD systemtap-2.4-r1.ebuild 1999 SHA256 e036dc241ba8779ebf27d0fd21dac609a466931d37b8741a532b07db7e521136 SHA512 930ff6b23986fa9c6ddaa5655db7fd7eb3dbe4e0e1039d14aeedc1993aa89eda63029e50768413c1182793c209a55c41fefac9ea03a673108e142d92f45491d1 WHIRLPOOL 5b4cf502cdfaf6fe13e8da1e69072d1e545820a2e6fc1b5a0c544c7f4501442950325f4b2d8c4c5e846a787630813608ef5462f9c4ad40dc995b68f01cc9012c
 EBUILD systemtap-2.9.ebuild 2029 SHA256 7e227ab12188ea134f435871faa79e98e7e2dd0b59fe4fcfb00474b48599db99 SHA512 e85f7c8f9bdf73b54f11090850e2a401f7ed0978a80281e9b1b6a126dea14f0dc117c71a63e1cd48fec96008812b47b40aa375fd5eae31bd04777666c7955b06 WHIRLPOOL d5861dfcd84548beff94ce6dc8e0124b6258224883634ff058e15f76d1c326ec59563324ca4fb959f964dde1b6e8d87f7bc6dead54a05fab96f7483e6f315b4c
-EBUILD systemtap-3.1-r1.ebuild 2108 SHA256 3321e3a43f422976c5c4396432c89cd3ca50354ba3aeb7f507b74f68b9071169 SHA512 18465f7c508cb0bd7517ae7c3fb852f232b81dc453428b660260907a28c9165caa2e79533e5854b906e24d883370a6c84f966b329fb1bbfffa79d0ced0eb0518 WHIRLPOOL 93d44688dc4f633e01e9da46c5e0f0f1d5871f30aea28048c9565fd3aa1875fcc14164420b8e666c66a89324a4dec2ebb986cdf0ed298689bda6bde9bb4050e1
+EBUILD systemtap-3.1-r1.ebuild 2106 SHA256 bbc6c016231aab7000fd8e5384e2fc6604e2ad516135fe993bbf4133138d65ba SHA512 74a60c0917c2e77fa71f09f25e7d76f2bdc75032945fb76a3e76eae854aeefe872a8d78ac7bcf5230fd95eae7fefc97e00dde40e93271907baf0a3ac9d0eb5fe WHIRLPOOL 89f4864384a44cb4580bfe554f18f9f7917babf69b6acf8b84da9b7272699903907259f79ddc67710e6a38b0708dbdcef43599975a3e3fa3a1c9e53256d2cd76
 EBUILD systemtap-3.1.ebuild 2025 SHA256 f9f8c5e5256023182a9c4133728ff881f3b71e93c83cd92e02a2184c270a309d SHA512 eaf7f9e37a7ea1ad61b4193f20414c500f662a61bb19d799b60d84722dc7dffbfecb112326e9cb23fd14e26b4a6d9bc46f1f6431736b8e7f63f4c772ac103893 WHIRLPOOL b3208f7e9f5bf3d5fd70b4acebb0d9919cb2a417367d91c43ef608827516237e686e2541d8d772f43ca566d98ccabbe92aa5fc793719fa1b9b95dc26a93a5e10
 MISC ChangeLog 2897 SHA256 9f126d03a53fc3e6ee4f1b2564fd12afbb5562e0a4ea532c94e977dbf1704a9f SHA512 1ff92e3ab4904c650618a708255eb87d07a60650f9f587d5b1b582465037cc88b9e4fcaa46f5b8cd9689ba7efbe2ec01acec021580e0a273e3db0d67d4725fd4 WHIRLPOOL 55526412784dfb2d328b33e41f06ee657a31f7e2ba947a62fea51415356360e7f300160f3bb99676e011503fb7beacc163980fb132f4dabe593dace786e8a542
 MISC ChangeLog-2015 20184 SHA256 959e517e7b3fe2cfb593f1d9181aacdfbb1ddacbfc972f80f1312f71db215751 SHA512 3dc443727de960e7a94365e886d94303b2801d51b491d9b602c2b536280789662c8c67f2834d3531aafbb13b16f3102d6584074cf477b8ed27761d8a62d4f344 WHIRLPOOL e82a32819f5e23419694d0ad2c707e81460a7e781c501b61d8e4b5f5468ff87baafcb3a7dac53b4b5b5c543c82eca9c734438a04860e32ab78a2af79f21a1b4d
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index 6d292bdb3a0e..cd13a9e21c2e 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index b7e636a6262e..000632b9cd6c 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -2,10 +2,15 @@ AUX org-netbeans-modules-profiler-kit.xml 480 SHA256 f2b7ef384e71241dd91a49825b6
 AUX org-netbeans-modules-profiler-nbimpl.xml 486 SHA256 86d7dd0bb435f9fe97a54ab1dff2d6f5a2cc8413add1ac78c9abed9600e0de5f SHA512 608089dfe84c19542ebabf484b4ba4ac0c0fd9be62d0e86f1a46f5b99cc00e702236618037aa5afa9d2f866af8b360fc4cfe9683998616e96964595068e73f4a WHIRLPOOL e8913740280b7a5f73082789d55f48b4d1a970f24074981771e116404a5028ab679e55faa7636502935442be171e0a231cf78f659d28c6bd3473195e83af9be0
 AUX org-netbeans-modules-profiler-options.xml 488 SHA256 fdef7c3e062df1cfddff844c11b0763190a92f863a9d308de240b67a42ea110a SHA512 00012a71334794b5b454f7de1ddecd2dd5ea90f11c8a4fdade520d0128d4cd27af13f5dc707b00231c68bf302189f06eaf2addc9cdfe403773421497ae4f1dcd WHIRLPOOL 028d335379785361e582016f8279914d2baf00c037f15c7e9e3094e19c1c53a6242669cd990c914437fe0447cbd12773fa67047671d704bebce58abdd3ee518a
 AUX org-netbeans-modules-profiler-oql-language.xml 498 SHA256 dec11f45e21b886b98841e058e7dfa2be8d34cec1309e8401d334f7f23471738 SHA512 95962ba87c85c7f0ae9378eab7b29d377e3e4cd5173e65f428f26d0c2e9d35d69f140877d1fbb77dbdca4ca0473d8beeae48674101412c9b41e0be832895f4b2 WHIRLPOOL 445fd2ab096125512f7ab0599cf7b1a3938ddba9bb5570596d1fb9e307e8ad1fbdcd905dea808bf7447c696f0973a5aa239cb6666f73977f62718ac8bd716517
+AUX visualvm-r1.conf 786 SHA256 a024c926b7d9136e86065614c2772c57963a84eb0afbdc1f6d81b26297b8ebfa SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397 WHIRLPOOL e484fc1383ec2cac390f670605bee5583e187eab5ad5482f8848d4450fa4689d4c6242ec49339d79fe32063626cd9bbab484debaa44c2b58081fa7a123a23949
+AUX visualvm-r1.sh 424 SHA256 0e8eda79c2478bf58d7f6cca5d6fe4eadca96697212615a348c97bcc01b38df5 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7 WHIRLPOOL 31b198715d7d5750cfce99ecea0e13279b9e54284cd9b34421b7840e072b7cd5c2456bf1cf03146a0356518cbd2b47823652b0072dc0311af7e9f09f25dd518e
 AUX visualvm.conf 383 SHA256 8ee4e0cb4a69cd0db8f581bef42ae8504ba14323dfe163f7c275e9f821d1a3ae SHA512 a5537c7ff8e3821ea435cb6236eac6d0f8941d16541f14862cf5ad15fc2d3621cd50aa296dd316f54f7137196981163b211fe984d21a38ababfce05d575203ff WHIRLPOOL f53de8d9401fbeb86ffb23825da5d228dee2ff1a6b158a74190a6bc37ec24d36d819d65242d0d7b1e0732baadc98766740b33381bc93eb1a9210051b48a9f849
 AUX visualvm.sh 730 SHA256 3828b835d52d7c3a8d452b4cca0273559318bdd66c8a1e6e3fa27354ec06d6f6 SHA512 5f8ba3cbb1c74c9807c016fff5ce31abeb15275df68c710acfb2d0e5f9ecf7e9c5c6aa85c865350bc8225caa278117cda8d6005e28759cc327baf0d14546b95b WHIRLPOOL 85d6857376ccb4ec84391cc4ae9c259911a60060d23753217f6bb26f8fee53bbdd3324bc014bcd030a558080ebc9949b3c5123b7516cd979c75a73aba2d27e92
+DIST nb802_visualvm_02102016.zip 23257637 SHA256 9f5cfe0d8c4f7a01c7b7df0f04e7c12f860b8e2efa9136dcfa105e00b90b873b SHA512 e33dba0cdfb509e9351fac343a4fbec07d3a893b6f484d0aeab972aefe41b061422dba8695003c6ca33db52d5be2f4ce218ea4fc7129f67dbd48c991c35349b5 WHIRLPOOL 7012d24b74bc92221ce257357bb3f69dfc360422512e6f3ada164f5bd5b76f4056a5a6f2308c87da891d2a1a561d1c15ae734e63e015635ec78bc7eb20ed96fa
+DIST visualvm-1.3.9.tar.gz 3622508 SHA256 92006824ba3b79ad86d543a81a5cdbcdf1cc8f6243a613c252eb1416287ff82f SHA512 884c04952dbb418de1bcd68b584f9053f03bd72ed6a9327d9f80897eee4f338a71343836efdd7a8172377552ab1f11d34c75c8804dd31da3fb67ee83c6edbf74 WHIRLPOOL b74b4e5f6c9967664d7150fd9411b0121ea3990e112f23ea75a4e2266c9cfd27003273315dd7845156e69ddea9da05f265c3b3c151059723f8ad4f5e755000c6
 DIST visualvm_138-src.tar.gz 1052176 SHA256 e34cd0425d74055e03394c572735067d3b98095ed5c04268707b52f1dc7c6144 SHA512 f418fcd3316f793c6fc77c6bcdf1e53dc543f7de2ee638f3d500a4de61505246fd07829b25cdf988836f515b72c59c71a2a4fecbb569910e9203e5b490e837a1 WHIRLPOOL c2d83fd92687d07d2f240d4a6c1f150471041e0e0ab1c13f7cd1804a98d3565ed1df29c5124002ced0c403fec98b5464f8ad113cc76ae264d95413c81c4dc129
 EBUILD visualvm-1.3.8-r1.ebuild 1801 SHA256 430d3eb62f58d9aba67fc46fecd0fa95bbb9dd5acc2d8fad13cb36ee2e7dc4d9 SHA512 68b0dd605e34df43883caa8476913cf77f804141e0d90b2cbd68827fe152984296b6895f2520ee14b81a4ad01d35eaa6af4c7eae3b126b3bb12f7dd747778dc3 WHIRLPOOL 56f22c4d1d1e7fe65267ea3c6f5af73776f07aa0ed438af8a96ff3fa840e743e7b63d266acb0115d890a0dbab0a2c5d7c918ee9b7561992e5397350535b0b2cf
+EBUILD visualvm-1.3.9.ebuild 1448 SHA256 dd36064f16196b8645decc558d9deb791d48ff6986b1f9083e7d95893c301b7a SHA512 53f14fe6f1ceb34d9a1b0c3da20baa510f115c99b479603a2af36510b20826d6e23f71b7102288ea0a4f817c8ad0e4511bc9c2d427b2324e9eeed9106395d6fe WHIRLPOOL 1c6aeb0597de87f47c71297bf6d9cca26ff9ec89ce46f72cf2437525109f49ad4db5e0adb3598841fa42ad24b0c53c661f320f5fc694499ff92713143f797f74
 MISC ChangeLog 2950 SHA256 9b5c0dd533ce296b0bfa4f1ea2ae5df7bd3f65c71cb4341ef91a6b51d1785ae4 SHA512 bc1cd08ad0b17a63f8727c9d6987aa6c981b9ff631e58614809c4d46635bbac691f058f8ad7acb49fa99087d06e6a852c0cf67e9186cf6c89b01ec9107279573 WHIRLPOOL 1787ce34ab59e9509c7c8afd1f23e06b151e8a0b6b97b43984d06aeb56306121a9eb3b2e759eacc299aeabe81643a9e66ca47c3c4a7641d3a0955cc13dbd4a23
 MISC ChangeLog-2015 2106 SHA256 cd9d0b9eebe63b3dd597a4a000c396c0975d129be3a492740bb7c017e66124aa SHA512 4c7428777f2f257866aa253a160c062d9f368b0831076b9f8804f81ee93e0f6dd98f572fde056ce2093807fdce805132ebda1268d703ce14e188fdf06ff4ad9c WHIRLPOOL 83081cbbfa408fdf21b4dce0a6d92dd4cc08c4e668b529cca3c77d4f33d1c6698bd06bef670e9f6c001d0412e510ee34aadbdfb2e3fc9dfb9b80184cc89d9f67
-MISC metadata.xml 346 SHA256 f90f6f8211893f5ce8dbf54c4ba4d8dae856449e6e61245667202a7148ef643b SHA512 bef5b6d65ed86015b369e396c706b70f885407890e72fb177d170761d9c04a6dfc843d59999a9076ca64f3c281cb25b604213f31c67cec5e7cc47389e99429b9 WHIRLPOOL 0e3020788df31c25ab4303ef911557435cc648a41c946b884146d06a4b039f2be7900d685c0291129d11a93fe83b7020739ff387dca7fcb1d622ea92ae92ccdb
+MISC metadata.xml 452 SHA256 3b662ecec2e75e2b4a24324ba91216f22cc5f221fa97598ee4bb9e12193492d9 SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739 WHIRLPOOL f7471334f54117edab74a0c8b68147de4c7d0480afbaa344514fc6ceef34bc079c1c98e392256f4ca77762175e399c9c3a69db36bdbc86753121c3f09d88a382
diff --git a/dev-util/visualvm/files/visualvm-r1.conf b/dev-util/visualvm/files/visualvm-r1.conf
new file mode 100644
index 000000000000..fce7cfece13f
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm-r1.conf
@@ -0,0 +1,9 @@
+# Default user directory
+visualvm_default_userdir="${HOME}/.visualvm"
+visualvm_default_cachedir="${HOME}/.cache/visualvm"
+
+# Default runtime options
+visualvm_default_options="-J-client -J-Xms24m -J-Xmx256m -J-Dnetbeans.accept_license_class=com.sun.tools.visualvm.modules.startup.AcceptLicense -J-Dsun.jvmstat.perdata.syncWaitMs=10000 -J-Dsun.java2d.noddraw=true -J-Dsun.java2d.d3d=false -J--add-exports=java.desktop/sun.awt=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor.event=ALL-UNNAMED -J--add-exports=jdk.jvmstat/sun.jvmstat.monitor=ALL-UNNAMED -J--add-exports=java.desktop/sun.swing=ALL-UNNAMED -J--add-exports=jdk.attach/sun.tools.attach=ALL-UNNAMED -J--add-modules=java.activation -J-XX:+IgnoreUnrecognizedVMOptions"
+
+# JDK home
+visualvm_jdkhome="$(java-config -O)"
diff --git a/dev-util/visualvm/files/visualvm-r1.sh b/dev-util/visualvm/files/visualvm-r1.sh
new file mode 100644
index 000000000000..dd6956da0697
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm-r1.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+# source the configuration file
+. /etc/visualvm/visualvm.conf
+
+# launch visualvm
+exec sh /usr/share/visualvm/platform/lib/nbexec \
+	--branding visualvm \
+	--jdkhome "${visualvm_jdkhome}" \
+	--userdir "${visualvm_default_userdir}" \
+	--cachedir "${visualvm_default_cachedir}" \
+	--clusters /usr/share/visualvm/cluster:/usr/share/visualvm/platform:/usr/share/visualvm/profiler \
+	${visualvm_default_options} "${@}"
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
index 9ef97ae66fd0..619755c9c84e 100644
--- a/dev-util/visualvm/metadata.xml
+++ b/dev-util/visualvm/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>java@gentoo.org</email>
-	<name>Java</name>
-</maintainer>
-<longdescription>The IcedTea project provides a harness to build the source code from VisualVM.</longdescription>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+	<longdescription>VisualVM is a visual tool integrating commandline JDK tools and lightweight profiling capabilities.</longdescription>
+	<upstream>
+		<remote-id type="github">oracle/visualvm</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/visualvm/visualvm-1.3.9.ebuild b/dev-util/visualvm/visualvm-1.3.9.ebuild
new file mode 100644
index 000000000000..7fe5e09f1733
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+NBV=802
+NBT=02102016
+NBZ=nb${NBV}_${PN}_${NBT}.zip
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
+HOMEPAGE="https://visualvm.github.io/"
+SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+
+RDEPEND=">=virtual/jre-1.7"
+DEPEND=">=virtual/jdk-1.7
+	app-arch/unzip"
+
+S=${WORKDIR}/${P}/${PN}
+EANT_BUILD_TARGET=build
+INSTALL_DIR=/usr/share/${PN}
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	unpack ${NBZ}
+}
+
+src_prepare() {
+	default
+
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+	   netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
+		 -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+}
+
+src_install() {
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{platform,profiler}
+
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
+
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
+
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
+}
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 522bb915e691..d9e5af38f1d6 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,11 +1,9 @@
-DIST Image-ExifTool-10.61.tar.gz 4270638 SHA256 a8f2b535c070f17ae6113bc1dd2e9db5a663621f1726b45f57511e374b5190eb SHA512 2d528045f24501985c326a9abf58dc1e77b9ecbef4253e1fcb456fa3c76cbe0a6ff6c6b42fc0095401bf15ac2ad90e02ae4b22cac43aae740b2d5d484c3b85c5 WHIRLPOOL 3623dbdda5a2742f7ba1268814b4a0374dd24802237a278760d5da734d21c6c40352a6bc250831bc0d9b4eae02d353a5539a1d90aa87a76e1943a97d44e3a175
-DIST Image-ExifTool-10.62.tar.gz 4274693 SHA256 6e8ff002e3c1253e2a4d77b4dd57f69c92599b0a1b48a94531bafb20b427f52e SHA512 3dce72f7c181eba94513924e3d914a6947ae74789064c96339010929b94bd44a35b5fafeaa5700b511ca4a3a498776a5b5d7c0dd5d459dabb57462a0ae9b32a1 WHIRLPOOL 780cc905ca1fccba418183df635d160a7460608d23e780cf3f95de0dccda80efac5b541d8682341dfc7c22c7755c7a394a26a5c05b9238e47d12c1ce83d706cd
 DIST Image-ExifTool-10.63.tar.gz 4277554 SHA256 84d63972e9172cd18fce54fef862f0d818c91c29a79c95689557be31747b9fde SHA512 84b62b73c3df22e69fddb6c5513461a2fa6086dd3bb8c3747fb495803771d307c664393e655b7892666ba74e51332558e353e64a620c55ecba86011b1a3b5675 WHIRLPOOL 300fe1984d3d5ecc014b4676c18a82c08bfc1d3b90ececf41b50911d3cc7073a5b53484abf2ff29993b3e3db7ef7820e3a2afd2e1789e8d363e69096346fe93c
 DIST Image-ExifTool-10.64.tar.gz 4278747 SHA256 1632a684fa93bc1051f3ffab9cf9453c2b5e29173afd8b91b1044e4def8c42c9 SHA512 e0823c51521e5e300a2ad23734d8174da1d5f963fe9fe44c72dc1b2d9835bba8a5c940c748f17ce576be495e919685342f2c6932afa94019efd3fd2d47b852eb WHIRLPOOL 0acb37fa6e93e2a22df2e67ccdb9abef3b3a1f03fcc26945cf742f5d71b83c92fce48673962ae900da5434b8f1320f9b14ac39fe3d787dd2368100afe4acc731
-EBUILD exiftool-10.61.ebuild 532 SHA256 78959a4d602d821b8496778393f6d5e3333d854875f23528b0c08cd90a5e79a2 SHA512 7bce562b0f55fa1792996a7992e0a7edc211437ba9515c8cf5fd3bed776de1ee1ac1cca452e68c48625b469f2dec05658ac6cc3f572e877ec2c2b28d29507255 WHIRLPOOL e645a129f87b5be4f13a7fe4423406a0ee071fe751222be5af88bd586ca396033b6af6a10372013f796f7012c7fb31d6ba88328b3eb12efd8d44bb789dc6288c
-EBUILD exiftool-10.62.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
-EBUILD exiftool-10.63.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
+DIST Image-ExifTool-10.65.tar.gz 4290148 SHA256 206a03c3ca8f25ad3b8f25290d934c19da350c8cbafae9de2a6db074bc5c42ad SHA512 857081033563540fc991e7e1a910ecee6c530d1c200a250ca7ec2644c2b57c57b6f1d660c2f33109ed6c385f04a81aff57985a38d783235159b5c8c530740413 WHIRLPOOL d8f7532ecfb018416cdfb1f02187f39cac8f842216f997b0d7ff5d3629529a9d87cb4f0a72e5308995404483c968a71a8df05fff5dce038f34f8b8a6ee273caf
+EBUILD exiftool-10.63.ebuild 532 SHA256 78959a4d602d821b8496778393f6d5e3333d854875f23528b0c08cd90a5e79a2 SHA512 7bce562b0f55fa1792996a7992e0a7edc211437ba9515c8cf5fd3bed776de1ee1ac1cca452e68c48625b469f2dec05658ac6cc3f572e877ec2c2b28d29507255 WHIRLPOOL e645a129f87b5be4f13a7fe4423406a0ee071fe751222be5af88bd586ca396033b6af6a10372013f796f7012c7fb31d6ba88328b3eb12efd8d44bb789dc6288c
 EBUILD exiftool-10.64.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
+EBUILD exiftool-10.65.ebuild 536 SHA256 7a5ff736fee3337b75f1eef8191c15d6a1b937b6ad7ab914a682af26b2c137b7 SHA512 39ad2668ecb03ab6fcacce0b7d0d51d2abf45847c964900ae49ca74c65b57d20f2006b73ca19eedb49eaa92cd9fa01d04c4835dbf3fa52083df566e44f58e86b WHIRLPOOL d7a307f476775b85ab1b7ad833042a1e55d1db6f62d5b2ff9ea0d076176a2b7046672b72c90e05c18d0050b6b4ab723637a3ebbb2cdb5014a46bbcd0eb618658
 MISC ChangeLog 8276 SHA256 a9a90786aae602763bbd782a5a959eb98953f6f6f4ab42c4e54cde5ce995a261 SHA512 2e19dfe347911a4f160d9b9bd1ebf2731396ffc8546d302a78b2c9041ceb92e9994ce09e58187b1b042fac596498c8d65747161e60e591abe1f6045876a47154 WHIRLPOOL 90c5ca53472453b72f303f4bf45f990321bd4923daa1d0d91c4ec287f7312789699416b4f768dd5e9f5ecabb06fe39d2b86d3c65fcd472e404828a5360761135
 MISC ChangeLog-2015 21462 SHA256 6e383b131d092c798a8705c06687fb1d4ab6b8343d775366814f5709e3a3b42d SHA512 c48d7c80bc283e061b10ec73ecbd0a2218ef034b9cc7095376dafe12df8cf634e44c2391f15b093ca852e2071fec7acd0187c2d2e809c90ab99f08321e32eeba WHIRLPOOL 5469c93d15acd8ae441354ef227da7708d88c4a65c0677bb9ace69c9eeff410b5c5e271cc1267b6f5f1a776a83ad1c72e8bc4b3afdca2a6bed8b29ff5c5a8454
 MISC metadata.xml 10159 SHA256 c01f25e3812847ed36085150466c33f271d064680a5085afec6bc7926f1a918d SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484 WHIRLPOOL 7afd890fccf7845f4b3168c41c672d6fe72d7687b44c1618bf52dbc224438e784589970d292588b34cefacb1e07641a8a137817373256875abe5fd3e08707171
diff --git a/media-libs/exiftool/exiftool-10.61.ebuild b/media-libs/exiftool/exiftool-10.61.ebuild
deleted file mode 100644
index a92d9f73adec..000000000000
--- a/media-libs/exiftool/exiftool-10.61.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DIST_NAME=Image-ExifTool
-inherit perl-module
-
-DESCRIPTION="Read and write meta information in image, audio and video files"
-HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
-SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
-IUSE="doc"
-
-SRC_TEST="do"
-
-src_install() {
-	perl-module_src_install
-	use doc && dodoc -r html/
-}
diff --git a/media-libs/exiftool/exiftool-10.63.ebuild b/media-libs/exiftool/exiftool-10.63.ebuild
index 22e52f948459..a92d9f73adec 100644
--- a/media-libs/exiftool/exiftool-10.63.ebuild
+++ b/media-libs/exiftool/exiftool-10.63.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
 SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x64-macos"
 IUSE="doc"
 
 SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-10.62.ebuild b/media-libs/exiftool/exiftool-10.65.ebuild
index 22e52f948459..22e52f948459 100644
--- a/media-libs/exiftool/exiftool-10.62.ebuild
+++ b/media-libs/exiftool/exiftool-10.65.ebuild
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index 51764acb9364..006be24a4c4e 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -2,7 +2,7 @@ AUX libgphoto2-2.5.10-jpeg.patch 3229 SHA256 5bb661c0f4956932c8c0205e5f106a0aac4
 DIST libgphoto2-2.5.12.tar.bz2 6974928 SHA256 b9bb28990fde45ac385e4851a07dbad2e1250404b535b0a3a3b898bb431e4e2e SHA512 aa47e9be64579e0691f58b775ca4d80f3ed65763e6d832cba9fd28603ba2dce4c9b5b3291f38dad399b69393d325896f67f2bde622062ca38b9b138f48f12336 WHIRLPOOL b690d5b55a7dc11cdd04e694e4ec4a44c0b3801c3e778610c32b414fd7e6e89f1ef49ac1c9b5f36a57d35afbb94c08e4e4f8cb9663c4106658eaaeaea1ddf5bd
 DIST libgphoto2-2.5.14.tar.bz2 6992238 SHA256 d3ce70686fb87d6791b9adcbb6e5693bfbe1cfef9661c23c75eb8a699ec4e274 SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 WHIRLPOOL 45a8cb9380f96da0fb680be95db3c028c07d7cc5f66126609f7a6539a5b5fd7e4edb45d00c43cb9c491e026311cd6161666280eb93ea784538c90297fbc1cc9c
 EBUILD libgphoto2-2.5.12.ebuild 6180 SHA256 ae6be57b1a0f742de8fcb796c22c8c021e56e659d07f87efd13b6e6b48edbd18 SHA512 f93d213bfbc4e4a61fe7aea4a63e5c3d3d5e59a0c5c262463bf6b4f36687f47ec3082ab7554a2e56f286ff7b4393a52dafeb29feecf8d6e6a9c12430e4c2f583 WHIRLPOOL 75a5a5fe19a7972287398ea7cce92e4c0c1a538cb5000f8f44151c1c7d2274506d8b2d23e43435f58502a8da5dc0377041c9f75e6bd49b89af5f0658b7b325e7
-EBUILD libgphoto2-2.5.14.ebuild 6280 SHA256 a5ce1ae04db6515a6583301cd1a9b308c33ca301cf929796da8cf889100f73f9 SHA512 32f8cd70a0c1b0e7e10159dde452e19078ce7e4f99f5663e0ebbaa89e80b84ba185dcb2930794957130910b6244411237e1ec29cd0023c6ea9bf240e1c8dedd5 WHIRLPOOL dcbc1f374398d46075e840c729482c88a437c6a70ce028eb9e440f417d4e596d1509731d064d722202028c4c74b9174bfc10c0df272d0d4f7845c040a071ed99
+EBUILD libgphoto2-2.5.14.ebuild 6279 SHA256 dbacf1c06ecc50b38cbd848415f69b3932f937a83559aa3da756e1b37cfa2b8c SHA512 3d47d59b5772b72c1e4231cf7522491c16883cd4c6ff5ee789a2be09756e31174155e4b05d044fe706036bc547d03eaa59a53f61173f36cd4b80d62702ac119c WHIRLPOOL eaf622d93840aebf9bdeebbdd90bc5ffdd2fd4724cf190e010632aa32ab1ef828a33acdeece03347136955dc8a243b702353304a20c6cdceeb9e3ec04788581b
 MISC ChangeLog 6886 SHA256 45a3751db9b40a23e36945565ece8e9cd60be8f0b581681cb9fda43f1304a376 SHA512 027cef9bab94be877fbb38d11a2ce700232d8e7bf22ec0c958cbd91b339db6f1745bcc2987b92604562b9dc19cba4d694e1e5c7e250902ce78433d44f79c6c64 WHIRLPOOL 10649a261dd4b65393f5b032adc9a6140335550876c717cf12ee5b482030a93388e71edce4c0cefb1332a62b1cc854860651342e9976bf91c1ec179883c49d6d
 MISC ChangeLog-2015 45252 SHA256 d6ac5af90c263c4380722889f201ef21c12dd7e4ee18d6f7429fa623afd37421 SHA512 ff4d88756d8113d2e251810a2c8630116ba5b474837a8c2bb23c1f9a9424982b660508b6c74b3a9034e5916b3ebe54fd7b94ba38eb3ddcc0e777e0f8bb5e5ad1 WHIRLPOOL 5d5bacd539ceebf412e1db13d85d56ce38e2f2307b8211baa54db4745c685b2b904087d3d9ebf8c7b3f8fbb5a619fe919990686e3545d2289c8c7df73908788e
 MISC metadata.xml 520 SHA256 604907467a908596bcbffd2eb1daff70570b1ba6667d8c4c9b6d4d5e262dd07a SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0 WHIRLPOOL 68d8ac8eb045b9f4e384dc3fb6629de2b9e651395038a500e71062cc0aceb31377df92bb78ba29a1fa425884d3ded0ce4c6cc7c0ea59825e98663a81f1f390c6
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
index 60fa584c9468..97304944e869 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # FIXME: should we also bump for libgphoto2_port.so soname version?
 SLOT="0/6" # libgphoto2.so soname version
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples exif gd jpeg nls serial"
 
 # By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index b358d98ecfab..1869da9d8e16 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,8 @@
 AUX libmediainfo-0.7.63-pkgconfig.patch 291 SHA256 c2ed16098bf4c8c22fbb3a8294ff1934568916623738c62be6fdb44a1bbf6fa1 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb WHIRLPOOL 3857055a02659881072d40eeddaaf2db554d41768d3f4ef82566d03f1ff3dada65910b9622eb812dbd020b79176fa8abfd1b2b9276b51c3c1ecd9a16f36f6ef3
 DIST libmediainfo_0.7.99.tar.xz 1603656 SHA256 ec9a8f2e081eefda05ddb841a3ffc838bf6ef8aedaf40f47fdbd19fd739fd688 SHA512 a0ceaf142604a98e9415ecfeda29d7c3d57ac755903630c2a5b2782d3bb24a101c46c93c68858dce99299da6375e03b846b5973274168ca8c42315b82a0cfdc0 WHIRLPOOL 06f197dc2292a90b92c5862f48d02df74d770d7e218f9e978e0d6ff081ce8a7970bab9c00ed6d01fdae0dc0868b031c20447abd6046efb6b6f1c6a60f81a9ac1
+DIST libmediainfo_17.10.tar.xz 1606920 SHA256 60b018fcd8acd249c5316670bdf1c85abc166fb9c340e84da834b1332a59a102 SHA512 3fe8b7c97c9b916376c090c89f7b5afb732d002d5d112370b977c83d9bea2911ec7cc249fa7df6f4b100600cc2354d6a8832339cf0d3b45262730a477c07fd4d WHIRLPOOL fa9a532a1ea49954c45eef80ea0cf5fe1c3e30ca4746b5a138aa396750c1b2f7bd4cbd4f7d7d44cb7027148baf41743e78462f7d6f448a0a357c09e7cfd39df2
 EBUILD libmediainfo-0.7.99.ebuild 1834 SHA256 d6e7a9b7ff5bae36f20fe76abe808b171cc894c05c3932153338c2a2b91a7579 SHA512 92148a20107c2729c2a0e9ac29b3ba708717ed34c5fe64abbeee01ef4adf716af0d4fafbd687e3d4e3e169bf0a05b44525967ab737ade546a26fa78845c2b27e WHIRLPOOL 166c94d28a7947aceebb2dd43e15fb1d3a2638a357ccc723530490babf625c59e6e80acf20c3459c19e7850017ed6ce09e3aa6788d5ac700797459014d3569ac
+EBUILD libmediainfo-17.10.ebuild 1836 SHA256 eef15fdac52979ec457bfb1e05ef37461c874c754a3c3c1551f79cdc97410fba SHA512 10cf52d6df0e23d28be0ee4c6d3eff0a3ba8f0ee7f6e5ba7d92ddab90deca01c3bc72081ff9c7d5f9799601d5d213a591dc95a4671fd472104f58c6d915edd97 WHIRLPOOL f52938226b97eb233ea464506d998472b93976a3da3f1086add21ffe08aaf1d93d2b23961748df122cfc7f8e472d67e0b7fa550575f896a18b94cacb8cc8a687
 MISC ChangeLog 5635 SHA256 e4c3ce2951e67209ddbd1161939a87c2190bcaef9bf5965474051dbf5ab596f9 SHA512 8738a07741f540cd3c000050fc7934bdacb687c7ff00c5c942aa185c98220cea8b06bf13df8620719f17def78abb0585eed149a82fbe1471ceb136fcf4c55f5b WHIRLPOOL 80d4087bc2db5737388683e8d959e08f5f94c6aa80feb06408275f455ca2d1ed70d2add7d6c9add2f0e1c3ce53682f2661adf566a29a6c2b642ecff702b75ce7
 MISC ChangeLog-2015 12605 SHA256 14d85167b54b78d328bdc4fbe3d74216eeb88f2ec5b0e00a3578083e0e7ddc48 SHA512 b52ea003f493cbe732a542c95f78a09256a6f7419e4559254dba117ccd962c02bbfb1d8efc33b4706d56628311bd50fcd8ac68b01fc73e6f5c2b0e1e864e1edb WHIRLPOOL 4b04336e66d5a490d5a4e9f8d91ab2e0231a346e0b3a07061e6f601efd0664877b1b61fd50d07649f8fe58395415259b984c9b1d045c551c8d7a623fcfd74edb
 MISC metadata.xml 346 SHA256 f5fd43de9a1f007dff370433644ed72c60ac399b4904fcd8a2c276faa2c88c2f SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93 WHIRLPOOL e7f61f85b0413503848e76912f404d4e82f42b79b8d77d81511da78608bfe021f8f942d97cdf9138684d4b2cd841a4b92c80c6939cb65a7cc3816eac33bddb4c
diff --git a/media-libs/libmediainfo/libmediainfo-17.10.ebuild b/media-libs/libmediainfo/libmediainfo-17.10.ebuild
new file mode 100644
index 000000000000..7be3ed1e7919
--- /dev/null
+++ b/media-libs/libmediainfo/libmediainfo-17.10.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools ltprune flag-o-matic
+
+MY_PN="MediaInfo"
+DESCRIPTION="MediaInfo libraries"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl doc mms static-libs"
+
+RDEPEND="sys-libs/zlib
+	dev-libs/tinyxml2:=
+	>=media-libs/libzen-0.4.37[static-libs=]
+	curl? ( net-misc/curl )
+	mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+# tests try to fetch data from online sources
+RESTRICT="test"
+
+S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
+
+src_prepare() {
+	eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
+	eapply_user
+
+	sed -i 's:-O2::' configure.ac || die
+	append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--with-libtinyxml2 \
+		$(use_with curl libcurl) \
+		$(use_with mms libmms) \
+		$(use_enable static-libs static) \
+		$(use_enable static-libs staticlibs)
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
+		doxygen Doxyfile || die
+	fi
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
+	fi
+
+	default
+
+	edos2unix ${PN}.pc #414545
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+
+	for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
+		insinto /usr/include/${MY_PN}/${x}
+		doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
+	done
+
+	insinto /usr/include/${MY_PN}DLL
+	doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
+
+	dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
+
+	prune_libtool_files
+}
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index 4ecd7c267b5e..13a9ba209eb4 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -7,6 +7,7 @@ DIST flrig-1.3.32.tar.gz 681254 SHA256 42562921e65d53320bb79fe2e17f2a70d4b443f06
 DIST flrig-1.3.33.tar.gz 687422 SHA256 45cca58986342e1d01791ae4a5bfe88638af38656d4d470c63ad8b910f933986 SHA512 a82c46c58ea26ce8d2707a42a96ba66ce1852b666fb362d334c8328fae1a93200be7a345536a3c65f3261d8b271a163d42c41f56d861c830d1439cd921c41527 WHIRLPOOL efa43c01510c095d0e68dc352fa04822115327a4ee5520b8bc522e2e852036a49918af4a73e1a2809842e077fc0ac66fce0d42016e7785d55328f6f60d694103
 DIST flrig-1.3.34.tar.gz 691775 SHA256 6a6311c2cf3d533f0ac10d7e6b8c6b9ef71c6ce98a7baa2e5c8aeb7e5f91f96f SHA512 4d276bff8386c0d3ae4273477ff4ac9be32d7423f5b93a2806e693e2ef4966a50b28f08e3aab9340056a00fa1ae29b34f7443ae7a95eee2e4405be3600ac182d WHIRLPOOL f3e867bbcbd96873a5da1f56d079c2fba9313deb3a632043d36072618f429dfad5a04807db94057bd5fca7322a5f0ffd7697a8b77c31158e61402fdc9b6fa6ec
 DIST flrig-1.3.35.tar.gz 692055 SHA256 4f193902aa743ff06720aafb34b5fe3a5b1e3b0dc91db8e9368313895c1ff989 SHA512 b20e027cc89b0867f89a34da41e42768777b00802332c0dac2009649231845d7b7d149b329be3349087cef6a76f1a829fc7de49343e637efe34b54eb462c60d2 WHIRLPOOL 43376b804c93e2d6cd3c98b0162f70c59f1690e4ee109dd8ae04167c183ab58b9f9bf83840efe46ea7c9211b4d99f858938c3370205359ba25d71ffd9a942759
+DIST flrig-1.3.36.tar.gz 692799 SHA256 19705e9f5280cb15fae94c94596c1bdfd6c90eea08d1036821406fc848ecf4a3 SHA512 8d8797ed09d9314eb4fa2100056b2f9f84cdb104a516a30b36c6341c05d09c5868cd3b9b256c967bed5514ac3362be28b46aca8f9af871f9261904bc12d6401e WHIRLPOOL 15ad00930f856e6c7d0bf567a8101f01c83b5fb150296f640a4841c6d2b656a1a5c7a48f9f1621298cc65079672e6be94e997dec84066309e17174e248eb6ae2
 EBUILD flrig-1.3.27.ebuild 624 SHA256 825857e2024b51e1bb2f640a44a26bc3b63ff66e81af1a6fe10e3d172eca1fe3 SHA512 3f896c6421a005fabae7db40559b5ce5276d8b40de6a95deb7b9d8f00f1dbd437ed0dd49b034d51ab55c96efce41103651c65c632a51c90cfd1c1f978aeac337 WHIRLPOOL 3ba6f0ead898008a32f56f553aa9163f4be7954cfa0ab9e1bd2537f6203e3b41304f3aa48a10d15d6718664a5f8c3d4f4887efd2fdf6e6ed913ff3e10b1460b7
 EBUILD flrig-1.3.28.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 EBUILD flrig-1.3.30.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
@@ -15,6 +16,7 @@ EBUILD flrig-1.3.32.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177d
 EBUILD flrig-1.3.33.ebuild 625 SHA256 daa8bb7799a88a359b11103925ed9374b702bd1251649809a87b1febc9f559b8 SHA512 59ef8acf3d6101b54a05d832463eb1b100d6486f3c2a5fa2392fafc96abc32f228c4cb6655914a2111cc5ca67e3bb9e76916fde0edb183fa635794a64a89bca9 WHIRLPOOL 325c8078c7f0c24df22e152f33c74419cfeb3663aada351b00d09574dd32e3b471ffd05d9397afcd0eb5c642dc6372a3ef324384e68aa234c66c9a0f33d35348
 EBUILD flrig-1.3.34.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 EBUILD flrig-1.3.35.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
+EBUILD flrig-1.3.36.ebuild 626 SHA256 ecf9a757e7c9f6bca428129ca8ea353f5dae78177dcafffc1aa06e320a49a34f SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d WHIRLPOOL b78a93576042a239406fdaed767616ab18a26f6c33f6bebe3472b141bc191b1635d2048b830cc323768901c2ed91f4ad48fa7f20fab91fd2cd16239a7b60d387
 MISC ChangeLog 4108 SHA256 bc3c290281e78ff70c406249a6ea577f3e7d90db1a5374984ac0736fe632b290 SHA512 3a5cdecd79909a729f2eb8995dac0beef719964cfd428b9f12af068e996bc5b738659431b9673ae5cf757db58b3ee72716e0544579fa2604775d66aadbc000f2 WHIRLPOOL 7e3a2e9da2d4401604f77c23995bedaa57e68a85b9ed5861f79e5a4566e815a337d58de68f3789fc13fad2e3af7807849668266af3100e04002806df590e8980
 MISC ChangeLog-2015 5718 SHA256 1bb3b830ac0782a53f53b28144f156ac638fae070cfad919a6d510a4dde2c631 SHA512 36268f9af90e7e79816a8a00a30b645b7429c874f07dd629dba0df6a732ce7df031a8e24a79d1c849b16cd1eaa7d65f6a8a93b131d034670fa04dbefdcd6093f WHIRLPOOL 3bf3da9610aea532a12fab81642ea9282545f33ed456b70ee71b7b98c8cdd5d52253a82c578c536f65bb31dd8e1401ffa5f44bec5d5959ec91d03c7f58683d0b
 MISC metadata.xml 325 SHA256 d90d79b3408436d25b05493d0f370abfbec279a64f26da4fbe6e0ee6ce4ab2b9 SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43 WHIRLPOOL d638db5564b3a7b358e4d1bbc46b289717f9d737793e403d4f76810ea7e3d2c1e4666e6ce9dc42f99bfb665050213e2e85800cd3a7ac6a6dc854770cd38e3b71
diff --git a/media-radio/flrig/flrig-1.3.36.ebuild b/media-radio/flrig/flrig-1.3.36.ebuild
new file mode 100644
index 000000000000..55065b05abc0
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.36.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bashism.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 8f48af515641..0cfac24f5d24 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -1,10 +1,8 @@
 AUX abcmidi-2016.05.05-docs.patch 614 SHA256 acd4b11d1023ce3cb9c2fa950c0b943bf9f1eb6fed5c5233c2de322917f03c43 SHA512 c06436cab7dbc4eb4bf8595e561402428bd1d45be653fa652841c3378e4b78f246ae5c862addf7bffbcb21d994f11151d464837f20915e91eef31d4f66618213 WHIRLPOOL a56e86fa197a6b9bbed3d674ad2da633fdc927ba7e63c22bb07d0addee008b3793ed856bc6bce135fd88335a193522b9e8d58580b4d801ff6d453359a789579d
-DIST abcMIDI-2017.10.11.zip 554492 SHA256 c421bfe41f9fcb8d19b101e6c0e2057505416c7c4f30689184a8ca3fea2e1234 SHA512 e0287426be71ec098fa9207f2b4be2ec47fc930fd853dc7f78683d5ff50842862678a42424d4f2cd850bb560170352231f3506ad75a43b89080c1c4a025bf1f7 WHIRLPOOL f1243c9460492c75b4b3da34ac3255b98d3f922dbc4f89d25562939bf31544586b09ea5c10c821684206e93cf27609a8b90ca79c922e646b90fd3f5e22a1e43c
-DIST abcMIDI-2017.10.18.zip 554639 SHA256 a3299db678dfb1699226950f9711d330fcfd83c9689e26a7337affe2120b6986 SHA512 b2d559c31761bb500b9b7f1578f147cf9255eb302bdd3cea8bd1e846b09f30c95eb86b20941b13f1e97ddebba40d048155913a34fddfff0126738c7b2becedd8 WHIRLPOOL 8b3a5ad6bfa3d495c795cdc329183acc3d084dc12c14a3b877f2a809dbb8942283c176b58d6734bd85bc7b2a25eaa71391e928db5ab8be240afbf2d71df193e3
 DIST abcMIDI-2017.10.23.zip 555824 SHA256 cf7d8ad12ce387be68200a002557dca6a19f662e7dc24e7d1c872f566e9b0c27 SHA512 d4377b833f9b62d430f98345ca6c0864406db89a0a5590f8756685d247a80c209b6311345d4409c3aee98c3a3f2c14154745c5a8afdb87f586c900efbea1a5eb WHIRLPOOL efe304fa1ed6c434b722c16ce8917ea651e191ecfe528b573799c8a59b2794114b34e358a094825c996a1deb50a80c4a4fe38d579ebf57f472b27f32e8571590
-EBUILD abcmidi-2017.10.11.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
-EBUILD abcmidi-2017.10.18.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
+DIST abcMIDI-2017.11.01.zip 556057 SHA256 098109d48f165efd14ea989cdf0678db74ff7c6d580b876c2b589eff777920d8 SHA512 859c1491217d168f615efb1e9c147d4a64b92ae8f661aa33d2074037adb93b2ab49434c365e264d2f288786f5f2ff0b8862c2959787004178566d04703cb090d WHIRLPOOL aa22d2f80ac6c5ed49b5458461133484014b0538c5d64976dd5cf87d1e836446f610fcc58ec425c6ca5ebca98b6e5c4b5b87bf47486781b8c6837d9bbcd92c49
 EBUILD abcmidi-2017.10.23.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
+EBUILD abcmidi-2017.11.01.ebuild 794 SHA256 b04f9fde0cea696204c97be5fc052fdffdc522c5f23de893add98675457d782c SHA512 74e4869499ab64922e7e5431dfbe640bc0af1d9502953aa7186128f0d3df6243d0944a74e4cdea76c9a1bb53b5d24fad130119f76f5af865d0b65b43cf2cf001 WHIRLPOOL 39a850861e57b7431152ad2a599b285b5f2c896d22eef298f03da60d8010ae426dd4401db7a067c15372d76de1c48d1f5d2a07268740096f755eeefc30279e48
 MISC ChangeLog 4168 SHA256 dfde158a68a63628e011667f3f0ee948824dcb379fcb1a2a238360730678c6d5 SHA512 9d623a04dcfa9fcbfbbcdacd44a675ea2faeaeed04cb42f27ea2f1f6f7643f62f57adac819fe9a14a01abaab8a285dba9290d636eb04e13b80e7737efc045845 WHIRLPOOL 1bd98e8e359eef989d5023a8ec8277864b5cdb99dd90e0c429b0f6e46c2ecfcb2c56be284013b7d5a34caf7a8a855244b4bb3fc5074366be7a18b6240a301f25
 MISC ChangeLog-2015 8942 SHA256 eaebb0e8329e2be37d2750a40b5c6a32911c969934ae77dfde9ccc9f4053e91c SHA512 b3cf908c40b8b93d64ef4f0c4d787a3261e90a744f3cb5a7dc237829cc141bb2e2727c6ecce1111a94ed0e323ec49895fa6f17ca621c548475488ad4fbb03d1b WHIRLPOOL 9819d47080919e62c107480691acad5124dda6c63177164899e5aa2cae853e8d84d03d7de0f9a2fcb4cf6e5d98e2235edee9f4e08679209625c07ce403db1c2a
 MISC metadata.xml 326 SHA256 a2ccc6f3b97c41d5636859e54cb6731fcc2717c551ecb22b440116b17f5b0ddd SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a WHIRLPOOL 40eacbc7470fc238963f173dc58df5d55aaf97381bc9f8a6b3ba28adb173b2bd26324b5980ebd4e95191de81cd2deb8192052c467eccd218f289ccb39a9a8acb
diff --git a/media-sound/abcmidi/abcmidi-2017.10.18.ebuild b/media-sound/abcmidi/abcmidi-2017.10.18.ebuild
deleted file mode 100644
index adf33138050d..000000000000
--- a/media-sound/abcmidi/abcmidi-2017.10.18.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="abcMIDI-${PV}"
-DESCRIPTION="Programs for processing ABC music notation files"
-HOMEPAGE="http://ifdo.ca/~seymour/runabc/top.html"
-SRC_URI="http://ifdo.ca/~seymour/runabc/${MY_P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples"
-
-DEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2016.05.05-docs.patch )
-	default
-
-	rm configure makefile || die
-	sed -i "s:-O2::" configure.ac || die
-
-	eautoreconf
-}
-
-src_install() {
-	default
-	dodoc doc/{AUTHORS,CHANGES,abcguide.txt,abcmatch.txt,history.txt,readme.txt,yapshelp.txt}
-
-	if use examples ; then
-		docinto examples
-		dodoc samples/*.abc
-	fi
-}
diff --git a/media-sound/abcmidi/abcmidi-2017.10.11.ebuild b/media-sound/abcmidi/abcmidi-2017.11.01.ebuild
index adf33138050d..adf33138050d 100644
--- a/media-sound/abcmidi/abcmidi-2017.10.11.ebuild
+++ b/media-sound/abcmidi/abcmidi-2017.11.01.ebuild
diff --git a/media-video/mediainfo/Manifest b/media-video/mediainfo/Manifest
index dfb441cde269..e2198f85cc0c 100644
--- a/media-video/mediainfo/Manifest
+++ b/media-video/mediainfo/Manifest
@@ -1,5 +1,7 @@
 DIST mediainfo_0.7.99.tar.xz 1327592 SHA256 ca308d3fd1ded0baad62be2388f65c98949ab9111589b5561c8f0f9c3537ed88 SHA512 7e50d0757c18e0eb07955a440250ca40fb5ee28dd4565528f8797f842611955942a4a6ff5b3c8736d4e24fe503272b2cd93de55187b2c3bca2c99021fe0330fa WHIRLPOOL 0ac9d9042a5382ae9b3a98879e407013fa593bfc01559834ace61f5b1b9aabde54b31f62a407c01956541cc71e46d879b0fcf57fedd2f5cb46fb7812b0cb5a9f
+DIST mediainfo_17.10.tar.xz 1319988 SHA256 0c1130cfa1878592f1225097a1814126378abbcc33926cdfff6bcc99422670fb SHA512 8e24aa71054c8887dc9fc6f9ddb188dfcf61afa37549aed77f77cd13f31cf1ac2e56c2f4e5901cc4ab9d52403740d82b8081898515b4f81944566941906b63f2 WHIRLPOOL bd2af8e4583b4f64cd65dc74d7f3d3f2491f75dc49825edf496235c82302efebcc84e10dcd76bfa7ae1e9d3d5251776ef69c094058379042f9bee5f30c7738af
 EBUILD mediainfo-0.7.99.ebuild 1548 SHA256 1f55bf684e4d4535d5211240c26d567d2db0511d9c19eba9a143e2abee6c1296 SHA512 7b881f5f0199a8fb044fc5fdbe0856f769bb4e94a3a684e49cd69d089de4cb0921c1a4c47a971ddb3a99bc98e289806054e2581cf9c053b215b8867a85d511d6 WHIRLPOOL 82f9a283230e530a180fd956961fb3a14563e6c60590aa852d97e7640da6f6d8c8ade138ef57282605e8f11f199bd369d76a65a97e5465179fe9685408585018
+EBUILD mediainfo-17.10.ebuild 1550 SHA256 9808db6e406855992cbe89c876adbbf2266b86473a3e05ba185af55b42a886ef SHA512 5eca56eedaecb066a123cb042b9ee4c53cc3ba629bc498e9bfb8dcfd519672b680766fc82af8d2fced59deed4a6fb7002322cfd565d790ba620a2782cc3af162 WHIRLPOOL 569aa28882246d4541275cb3272ccc937c893a84b10492234e35011124a453c2bd80612404b7ea902c818492303abc11d7e61d0d2f453b6cb67f7e014176f898
 MISC ChangeLog 5320 SHA256 84bea5b5194a485f443149dea94bb59fccabb1112cc2d829090421a2294d1084 SHA512 58db1a1c6949b86ebb7a226adf66fa853ae90f752bdcf41f5cf184e3e18e9e378fd8c67736cb78c7306add760f0c12e0cf27d02e5ce98e8d6e531e0486bf5c25 WHIRLPOOL d26a51fb5f7f31a227796808bc4a6e31a1f98bde0780d2b83caaad2236cb6fbcb033c95dbd6aca642018850f688e6ea78a28c0654eb7cdb174b2feff320eecce
 MISC ChangeLog-2015 11146 SHA256 6c2b5ed60b828ed8cf45d91cc15fbec9b2509684cc429232444b3121351a2f6f SHA512 8d714aee56ec7c89c4d1ae2c357d2bf9268c22adb63f36b35ee6f7e78bb945d6831532710662e29e15b7e9aea062860f3ea616be7c18746ab4e8d5d4ca804f54 WHIRLPOOL 1377b0762947b48217bd0461e2bb5816f4db81769a02cad4f6c1616b6dd4aa11f81a89c02687b3fff6838d4154676c52839a9701a408c662252a4528ab8a759a
 MISC metadata.xml 343 SHA256 b8b4a87c95842408a4d73eaf5b592d569a99ea6ba3cee8999072cc66cc17e017 SHA512 3647e319de82c1521bd1e6a28dc7a64435b052130102d7a4b6f1478d92cfc94a164b7d9435855b4929d584be2f886f6bc51c84f6cb63b8431ac028583d57f0a3 WHIRLPOOL 5c9ecc6ea491b57153de00a64d3238be4e2b82fb020b883d4529ee04d1807bc37be2572d306716e933f433f504a5dd9d773586993cebc1234a67a3f7e31067b2
diff --git a/media-video/mediainfo/mediainfo-17.10.ebuild b/media-video/mediainfo/mediainfo-17.10.ebuild
new file mode 100644
index 000000000000..f3350adbb933
--- /dev/null
+++ b/media-video/mediainfo/mediainfo-17.10.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+
+inherit eutils autotools wxwidgets
+
+DESCRIPTION="MediaInfo supplies technical and tag information about media files"
+HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo"
+SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="curl mms wxwidgets"
+
+RDEPEND="sys-libs/zlib
+	>=media-libs/libzen-0.4.37
+	~media-libs/lib${P}[curl=,mms=]
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[X] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/MediaInfo
+
+pkg_setup() {
+	TARGETS="CLI"
+	use wxwidgets && TARGETS+=" GUI"
+}
+
+src_prepare() {
+	eapply_user
+
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		sed -i -e "s:-O2::" configure.ac
+		eautoreconf
+	done
+}
+
+src_configure() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		local args=""
+		[[ ${target} == "GUI" ]] && args="--with-wxwidgets --with-wx-gui"
+		econf ${args}
+	done
+}
+
+src_compile() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+	done
+}
+src_install() {
+	local target
+	for target in ${TARGETS}; do
+		cd "${S}"/Project/GNU/${target}
+		default
+		dodoc "${S}"/History_${target}.txt
+		if [[ ${target} == "GUI" ]]; then
+			newicon "${S}"/Source/Resource/Image/MediaInfo.png ${PN}.png
+			make_desktop_entry ${PN}-gui MediaInfo ${PN} "AudioVideo;GTK"
+		fi
+	done
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 3b58ff1cb6ac..818257943ae1 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Nov 2017 20:39:50 +0000
+Fri, 03 Nov 2017 17:39:49 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 3b58ff1cb6ac..818257943ae1 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Nov 2017 20:39:50 +0000
+Fri, 03 Nov 2017 17:39:49 +0000
diff --git a/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1 b/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1
index 07612663f609..8d1adedee17a 100644
--- a/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1
+++ b/metadata/md5-cache/app-admin/sysklogd-1.5.1-r1
@@ -3,11 +3,11 @@ DESCRIPTION=Standard log daemons
 EAPI=5
 HOMEPAGE=http://www.infodrom.org/projects/sysklogd/
 IUSE=logrotate
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=BSD
 RDEPEND=dev-lang/perl sys-apps/debianutils
 RESTRICT=test
 SLOT=0
 SRC_URI=http://www.infodrom.org/projects/sysklogd/download/sysklogd-1.5.1.tar.gz mirror://debian/pool/main/s/sysklogd/sysklogd_1.5-6.diff.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=c2dd6125e62f27c3e844a381b333314c
+_md5_=e174a4317aa888b1bf1e8caa0e401e38
diff --git a/metadata/md5-cache/app-admin/tripwire-2.4.3.6 b/metadata/md5-cache/app-admin/tripwire-2.4.3.6
index d4047015c867..9020290414df 100644
--- a/metadata/md5-cache/app-admin/tripwire-2.4.3.6
+++ b/metadata/md5-cache/app-admin/tripwire-2.4.3.6
@@ -4,11 +4,11 @@ DESCRIPTION=Open Source File Integrity Checker and IDS
 EAPI=6
 HOMEPAGE=http://www.tripwire.org/
 IUSE=libressl selinux ssl static +tools
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc x86 ~x86-fbsd
 LICENSE=GPL-2
 PDEPEND=tools? ( app-admin/mktwpol )
 RDEPEND=virtual/cron virtual/mta selinux? ( sec-policy/selinux-tripwire ) ssl? ( dev-libs/openssl )
 SLOT=0
 SRC_URI=https://github.com/Tripwire/tripwire-open-source/archive/2.4.3.6.tar.gz -> tripwire-2.4.3.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=45d2db186537e363f2eebfe4b9a93b9d
+_md5_=e7307744dfb6c2a4db72579a33ef361a
diff --git a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3 b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
index 7456e31ecd11..8bf067a1ec88 100644
--- a/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
+++ b/metadata/md5-cache/app-emacs/doxymacs-1.8.0-r3
@@ -9,4 +9,4 @@ RDEPEND=>=dev-libs/libxml2-2.6.13 >=virtual/emacs-23
 SLOT=0
 SRC_URI=mirror://sourceforge/doxymacs/doxymacs-1.8.0.tar.gz
 _eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=5333fa537566ada4c9fcbd62ecae1ac0
+_md5_=5a343760d9dc6d77e002778fda24e094
diff --git a/metadata/md5-cache/app-emacs/emms-4.4 b/metadata/md5-cache/app-emacs/emms-4.4
new file mode 100644
index 000000000000..8ae34c9c2605
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/emms-4.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=media-libs/taglib >=virtual/emacs-23
+DESCRIPTION=The Emacs Multimedia System
+EAPI=6
+HOMEPAGE=https://www.gnu.org/software/emms/ https://www.emacswiki.org/emacs/EMMS
+KEYWORDS=~amd64 ~ppc ~sparc ~x86
+LICENSE=GPL-3+ FDL-1.1+
+RDEPEND=media-libs/taglib >=virtual/emacs-23
+SLOT=0
+SRC_URI=mirror://gnu/emms/emms-4.4.tar.gz
+_eclasses_=elisp	571fd9c6c9d8b71c8461bb9f33e135ab	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=54092665f9aa757d6ebcc23c74c88c5d
diff --git a/metadata/md5-cache/app-emulation/containerd-0.2.9 b/metadata/md5-cache/app-emulation/containerd-0.2.9
deleted file mode 100644
index 622c59e47b01..000000000000
--- a/metadata/md5-cache/app-emulation/containerd-0.2.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=>=dev-lang/go-1.8
-DESCRIPTION=A daemon to control runC
-EAPI=6
-HOMEPAGE=https://containerd.tools
-IUSE=hardened +seccomp
-KEYWORDS=~amd64 ~arm ~ppc64
-LICENSE=Apache-2.0
-RDEPEND=>=app-emulation/docker-runc-1.0.0_rc3_p20170607 seccomp? ( sys-libs/libseccomp )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/containerd/containerd/archive/cfb82a876ecc11b5ca0977d1733adbe58599088a.tar.gz -> containerd-0.2.9.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2076178aec52db6081fd233bda3a6e3c
diff --git a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170605 b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170605
index 30b639d891dc..9b92ac32eda3 100644
--- a/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170605
+++ b/metadata/md5-cache/app-emulation/containerd-0.2.9_p20170605
@@ -4,11 +4,11 @@ DESCRIPTION=A daemon to control runC
 EAPI=6
 HOMEPAGE=https://containerd.tools
 IUSE=hardened +seccomp
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=app-emulation/docker-runc-1.0.0_rc3_p20170706 seccomp? ( sys-libs/libseccomp )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/containerd/containerd/archive/6e23458c129b551d5c9871e5174f6b1b7f6d1170.tar.gz -> containerd-0.2.9_p20170605.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=da80e335031f0f26b7548bfa0ee042ba
+_md5_=a6e201f082c0ce5c5ae508c7698446a2
diff --git a/metadata/md5-cache/app-emulation/containerd-1.0.0_beta2 b/metadata/md5-cache/app-emulation/containerd-1.0.0_beta2
new file mode 100644
index 000000000000..4f16db124cc6
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/containerd-1.0.0_beta2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=sys-fs/btrfs-progs >=dev-lang/go-1.8
+DESCRIPTION=A daemon to control runC
+EAPI=6
+HOMEPAGE=https://containerd.tools
+IUSE=hardened +seccomp
+KEYWORDS=~amd64 ~arm ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=|| ( >=app-emulation/docker-runc-1.0.0_rc4 >=app-emulation/runc-1.0.0_rc4 ) seccomp? ( sys-libs/libseccomp )
+SLOT=0
+SRC_URI=https://github.com/containerd/containerd/archive/v1.0.0-beta.2.tar.gz -> containerd-1.0.0_beta2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=2a2ceb1e32d4997a3c3cc77a2318d372
diff --git a/metadata/md5-cache/app-emulation/containerd-9999 b/metadata/md5-cache/app-emulation/containerd-9999
index b4a1ccf99149..1ff808134ece 100644
--- a/metadata/md5-cache/app-emulation/containerd-9999
+++ b/metadata/md5-cache/app-emulation/containerd-9999
@@ -5,7 +5,7 @@ EAPI=6
 HOMEPAGE=https://containerd.tools
 IUSE=hardened +seccomp
 LICENSE=Apache-2.0
-RDEPEND=>=app-emulation/runc-1.0.0_rc2 seccomp? ( sys-libs/libseccomp )
+RDEPEND=>=app-emulation/runc-1.0.0_rc4 seccomp? ( sys-libs/libseccomp )
 SLOT=0
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs	0b4e2a941727a19d38600d1046c8c398	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8dc6294cc1ce703cf83f322463c43683
+_md5_=c4a4aaea26f52796135f9e6249ba051d
diff --git a/metadata/md5-cache/app-emulation/docker-17.06.2 b/metadata/md5-cache/app-emulation/docker-17.06.2
index c0de7406a297..862a393cbb6e 100644
--- a/metadata/md5-cache/app-emulation/docker-17.06.2
+++ b/metadata/md5-cache/app-emulation/docker-17.06.2
@@ -4,11 +4,11 @@ DESCRIPTION=The core functions you need to create Docker images and run Docker c
 EAPI=6
 HOMEPAGE=https://dockerproject.org
 IUSE=apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp
-KEYWORDS=~amd64 ~arm
+KEYWORDS=amd64 ~arm
 LICENSE=Apache-2.0
 RDEPEND=>=dev-db/sqlite-3.7.9:3 device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) apparmor? ( sys-libs/libapparmor ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 ~app-emulation/containerd-0.2.9_p20170605 ~app-emulation/docker-runc-1.0.0_rc3_p20170706[apparmor?,seccomp?] app-emulation/docker-proxy container-init? ( >=sys-process/tini-0.15.0[static] )
 RESTRICT=installsources strip
 SLOT=0
 SRC_URI=https://github.com/docker/docker-ce/archive/v17.06.2-ce.tar.gz -> docker-17.06.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5689176afb097c172149c28f557fad1d
+_md5_=27a270cd8848c6c23c5904f16b84b23f
diff --git a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc3_p20170706 b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc3_p20170706
index 589cae594542..997209f58531 100644
--- a/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc3_p20170706
+++ b/metadata/md5-cache/app-emulation/docker-runc-1.0.0_rc3_p20170706
@@ -4,11 +4,11 @@ DESCRIPTION=runc container cli tools (docker fork)
 EAPI=6
 HOMEPAGE=http://runc.io
 IUSE=+ambient apparmor hardened +seccomp
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=amd64 ~arm ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=apparmor? ( sys-libs/libapparmor ) seccomp? ( sys-libs/libseccomp ) !app-emulation/runc
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/opencontainers/runc/archive/810190ceaa507aa2727d7ae6f4790c76ec150bd2.tar.gz -> docker-runc-1.0.0_rc3_p20170706.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536
-_md5_=af6dc67c9e00a1cb6cddfd7d635c9e30
+_md5_=3cf8f062f8ae13fd3d41ac479b5ef12d
diff --git a/metadata/md5-cache/app-emulation/free42-2.0.6 b/metadata/md5-cache/app-emulation/free42-2.0.6
index 0582aea6723f..86647ae17f0c 100644
--- a/metadata/md5-cache/app-emulation/free42-2.0.6
+++ b/metadata/md5-cache/app-emulation/free42-2.0.6
@@ -4,10 +4,10 @@ DESCRIPTION=An HP-42S Calculator Simulator
 EAPI=6
 HOMEPAGE=http://thomasokken.com/free42/
 IUSE=alsa
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
 SLOT=0
 SRC_URI=http://thomasokken.com/free42/upstream/free42-nologo-2.0.6.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=28c3264525d3f34e223e435e22979f66
+_md5_=4fc40e59cc25f9a6a3be87a0b438d6f1
diff --git a/metadata/md5-cache/app-emulation/xen-4.8.2-r2 b/metadata/md5-cache/app-emulation/xen-4.8.2-r2
new file mode 100644
index 000000000000..4ffce9840d3d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-4.8.2-r2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
+DEPEND=|| ( >=dev-lang/python-2.7.5-r2:2.7 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 )
+DESCRIPTION=The Xen virtual machine monitor
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=custom-cflags debug efi flask
+KEYWORDS=~amd64 ~arm -x86
+LICENSE=GPL-2
+PDEPEND=~app-emulation/xen-tools-4.8.2
+REQUIRED_USE=arm? ( debug )
+RESTRICT=test splitdebug strip
+SLOT=0
+SRC_URI=https://downloads.xenproject.org/release/xen/4.8.2/xen-4.8.2.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.8.2-upstream-patches-2.tar.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=09be65de5a9a972046fd3f14a285df37
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.8.2-r1 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.8.2-r1
index 4c98e2375dd8..2a0a2a668fda 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.8.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.8.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest
 EAPI=6
 HOMEPAGE=https://www.xenproject.org
 IUSE=custom-cflags python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=app-emulation/xen-tools-4.8.2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.8.2/xen-4.8.2.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz http://xenbits.xensource.com/xen-extfiles/polarssl-1.1.4-gpl.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=82b168c8547515497785712be9a3981e
+_md5_=4bc582fc9e6496330e34e65886d46891
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r1
index 4d028328c415..15ff2f6a90a3 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Xen tools including QEMU and xl
 EAPI=6
 HOMEPAGE=https://www.xenproject.org
 IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
 REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/4.8
 SRC_URI=https://downloads.xenproject.org/release/xen/4.8.2/xen-4.8.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20151110.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-2.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.8.2-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-10.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=88b1f770658ebb3a3fd4e5b71d7dff0d
+_md5_=d605e073bfab330225f9f784a83895a6
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r2 b/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r2
index 93e5541622fb..7d229d2ba14c 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r2
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
 DESCRIPTION=Xen tools including QEMU and xl
 EAPI=6
 HOMEPAGE=https://www.xenproject.org
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/4.8
 SRC_URI=https://downloads.xenproject.org/release/xen/4.8.2/xen-4.8.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20151110.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-2.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.8.2-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-10.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=285c76c31ab3673549b421f97c6b399d
+_md5_=f54d37eff4dcd3cdd113e5675cf15b40
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r3 b/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r3
new file mode 100644
index 000000000000..b7718b303c85
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.8.2-r3
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/lxml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x86? ( sys-devel/dev86 sys-power/iasl ) pam? ( dev-python/pypam[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-devel/bin86 system-seabios? ( sys-firmware/seabios ) sys-firmware/ipxe sys-devel/dev86 sys-power/iasl ) dev-lang/perl app-misc/pax-utils doc? ( app-text/ghostscript-gpl app-text/pandoc dev-python/markdown[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-proto/xproto !net-libs/libiscsi ) qemu? ( app-arch/snappy:= x11-libs/pixman sdl? ( media-libs/libsdl[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib >=dev-lang/ocaml-4 )
+DESCRIPTION=Xen tools including QEMU and xl
+EAPI=6
+HOMEPAGE=https://www.xenproject.org
+IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
+REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
+RESTRICT=test
+SLOT=0/4.8
+SRC_URI=https://downloads.xenproject.org/release/xen/4.8.2/xen-4.8.2.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20151110.tar.bz2 https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-2.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.8.2-upstream-patches-2.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-10.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=dd391f61c5b664f969bff006fcd8ba08
diff --git a/metadata/md5-cache/app-i18n/anthy-9100h-r2 b/metadata/md5-cache/app-i18n/anthy-9100h-r2
index 941788d07fd8..af350d220949 100644
--- a/metadata/md5-cache/app-i18n/anthy-9100h-r2
+++ b/metadata/md5-cache/app-i18n/anthy-9100h-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Anthy -- free and secure Japanese input system
 EAPI=6
 HOMEPAGE=http://anthy.osdn.jp/
 IUSE=canna-2ch emacs static-libs
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2 LGPL-2.1
 RDEPEND=canna-2ch? ( app-dicts/canna-2ch ) emacs? ( virtual/emacs )
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/anthy/37536/anthy-9100h.tar.gz
 _eclasses_=elisp-common	23f47b2e1de7abf387105eddd1318738	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=1191f7c5b6f7e6af586e5e15bc2b1725
+_md5_=4c83cc32c6f21cedabcf41c0cec908d1
diff --git a/metadata/md5-cache/app-misc/graphlcd-base-0.1.9 b/metadata/md5-cache/app-misc/graphlcd-base-0.1.9
index 134e2bfde752..3940d9c854e6 100644
--- a/metadata/md5-cache/app-misc/graphlcd-base-0.1.9
+++ b/metadata/md5-cache/app-misc/graphlcd-base-0.1.9
@@ -4,10 +4,10 @@ DESCRIPTION=Graphical LCD Driver
 EAPI=6
 HOMEPAGE=https://projects.vdr-developer.org/projects/graphlcd-base
 IUSE=g15
-KEYWORDS=~amd64 ~ppc ~x86
+KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 RDEPEND=g15? ( app-misc/g15daemon ) media-libs/freetype
 SLOT=0
 SRC_URI=mirror://vdr-developerorg/501/graphlcd-base-0.1.9.tgz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2e8753c93bec6f574e915ca7c4fee0a4
+_md5_=98c790fab7c31443b816a575d42ed74d
diff --git a/metadata/md5-cache/app-misc/pal-0.4.3-r1 b/metadata/md5-cache/app-misc/pal-0.4.3-r1
deleted file mode 100644
index db0714353d03..000000000000
--- a/metadata/md5-cache/app-misc/pal-0.4.3-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses sys-libs/readline nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=pal command-line calendar program
-EAPI=5
-HOMEPAGE=http://palcal.sourceforge.net/
-IUSE=nls
-KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=mirror://sourceforge/palcal/pal-0.4.3.tgz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=ab662d788a99fa254ece97a92b182634
diff --git a/metadata/md5-cache/app-misc/pal-0.4.3-r2 b/metadata/md5-cache/app-misc/pal-0.4.3-r2
index 7e7d08937d84..c1837a192662 100644
--- a/metadata/md5-cache/app-misc/pal-0.4.3-r2
+++ b/metadata/md5-cache/app-misc/pal-0.4.3-r2
@@ -4,11 +4,11 @@ DESCRIPTION=Command-line calendar program
 EAPI=6
 HOMEPAGE=http://palcal.sourceforge.net/
 IUSE=nls
-KEYWORDS=~amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.0 nls? ( virtual/libintl ) sys-libs/ncurses:0 sys-libs/readline:0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/palcal/pal-0.4.3.tgz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	7b6fb2fc216b101b5d97d171925a847c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=0164e74aff476f9959c3ee710d800c15
+_md5_=a2d7f4c0f1571122fbb124cced8d86f8
diff --git a/metadata/md5-cache/app-portage/portage-utils-0.64 b/metadata/md5-cache/app-portage/portage-utils-0.64
index 8c08def5f122..c7684d3b3fba 100644
--- a/metadata/md5-cache/app-portage/portage-utils-0.64
+++ b/metadata/md5-cache/app-portage/portage-utils-0.64
@@ -4,10 +4,10 @@ DESCRIPTION=small and fast portage helper tools written in C
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Portage-utils
 IUSE=nls static
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/iniparser:0
 SLOT=0
 SRC_URI=mirror://gentoo/portage-utils-0.64.tar.xz https://dev.gentoo.org/~vapier/dist/portage-utils-0.64.tar.xz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=53b3e9e194fe19177372b65feb79374f
+_md5_=b60f49e70a52a6ac6158c158c43bc4bc
diff --git a/metadata/md5-cache/app-text/djview-4.10.6 b/metadata/md5-cache/app-text/djview-4.10.6
index 3805a2aa3d93..fa4a817913af 100644
--- a/metadata/md5-cache/app-text/djview-4.10.6
+++ b/metadata/md5-cache/app-text/djview-4.10.6
@@ -4,10 +4,10 @@ DESCRIPTION=Portable DjVu viewer using Qt4
 EAPI=4
 HOMEPAGE=http://djvu.sourceforge.net/djview4.html
 IUSE=debug nsplugin
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=app-text/djvu-3.5.22-r1 dev-qt/qtdbus:4 dev-qt/qtopengl:4 dev-qt/qtgui:4
 SLOT=0
 SRC_URI=mirror://sourceforge/djvu/djview-4.10.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	e5d920147bfccf4930062e462e2a417d	multilib	97f470f374f2e94ccab04a2fb21d811e	nsplugins	2049586e425364a1c5bdb004205d1758	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6ab971ebcfad59d3594daf824bb4c724
+_md5_=d6c8b37653c2372cdf19ae4c43fe4867
diff --git a/metadata/md5-cache/app-text/jabref-bin-4.0 b/metadata/md5-cache/app-text/jabref-bin-4.0
index f7fb060c5c7d..878eaef16378 100644
--- a/metadata/md5-cache/app-text/jabref-bin-4.0
+++ b/metadata/md5-cache/app-text/jabref-bin-4.0
@@ -10,4 +10,4 @@ RDEPEND=|| ( dev-java/oracle-jre-bin:1.8[javafx] dev-java/oracle-jdk-bin:1.8[jav
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v4.0/JabRef-4.0.jar
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=997e5da0f50c2c05678a96c7eb7eeda4
+_md5_=96d2b1d5715dcf4b22035f8d2705968e
diff --git a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20140525 b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20140525
index f25922100ece..b91d475ed431 100644
--- a/metadata/md5-cache/app-text/ttf2pk2-2.0_p20140525
+++ b/metadata/md5-cache/app-text/ttf2pk2-2.0_p20140525
@@ -3,10 +3,10 @@ DEPEND=>=dev-libs/kpathsea-6.2.0 media-libs/freetype:2 sys-libs/zlib !media-libs
 DESCRIPTION=Freetype 2 based TrueType font to TeX's PK format converter
 EAPI=4
 HOMEPAGE=http://tug.org/texlive/
-KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/kpathsea-6.2.0 media-libs/freetype:2 sys-libs/zlib !media-libs/freetype:1 !=dev-texlive/texlive-langcjk-2011*[source]
 SLOT=0
 SRC_URI=mirror://gentoo/texlive-20140525-source.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8a69e5cd76c057ab0203d798cd0e8467
+_md5_=d05652b9d079ceb282f061df44961b84
diff --git a/metadata/md5-cache/dev-db/m17n-db-1.7.0 b/metadata/md5-cache/dev-db/m17n-db-1.7.0
index 2c85526b2ee0..d75efad7646e 100644
--- a/metadata/md5-cache/dev-db/m17n-db-1.7.0
+++ b/metadata/md5-cache/dev-db/m17n-db-1.7.0
@@ -3,9 +3,9 @@ DEPEND=sys-devel/gettext
 DESCRIPTION=Database for the m17n library
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-db.git
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=!dev-db/m17n-contrib virtual/libintl
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-db-1.7.0.tar.gz
-_md5_=8fb92094902ee494b9948d8e63e2f681
+_md5_=005809635095af0d2ab0230590541dac
diff --git a/metadata/md5-cache/dev-db/mysql-5.6.38 b/metadata/md5-cache/dev-db/mysql-5.6.38
index ca61a5fbae76..b70af5f819d5 100644
--- a/metadata/md5-cache/dev-db/mysql-5.6.38
+++ b/metadata/md5-cache/dev-db/mysql-5.6.38
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile config configure install postinst preinst prepare pretend setup test unpack
-DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
+DEPEND=|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 kernel_linux? ( sys-process/procps:0= dev-libs/libaio:0= ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 !dev-db/mariadb-native-client[mysqlcompat] jemalloc? ( dev-libs/jemalloc:0= ) tcmalloc? ( dev-util/google-perftools:0= ) systemtap? ( >=dev-util/systemtap-1.3:0= ) openssl? ( >=dev-libs/openssl-1.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] ) >=sys-libs/zlib-1.2.3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] sys-libs/ncurses:0= virtual/yacc static? ( sys-libs/ncurses[static-libs] )
 DESCRIPTION=A fast, multi-threaded, multi-user SQL database server
 EAPI=6
 HOMEPAGE=http://www.mysql.com/
-IUSE=abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
+IUSE=numa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 debug embedded extraengine jemalloc latin1 libressl +openssl +perl profiling selinux +server systemtap static static-libs tcmalloc test yassl
 KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 PDEPEND=perl? ( >=dev-perl/DBD-mysql-2.9004 ) server? ( ~virtual/mysql-5.6[embedded=,static=] ) virtual/libmysqlclient:0/18[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs=]
@@ -13,4 +13,4 @@ RESTRICT=libressl? ( test )
 SLOT=0/18
 SRC_URI=http://cdn.mysql.com/Downloads/MySQL-5.6/mysql-5.6.38.tar.gz http://downloads.mysql.com/archives/MySQL-5.6/mysql-5.6.38.tar.gz mirror://gentoo/mysql-extras-20171018-1948Z.tar.bz2 https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~grknight/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20171018-1948Z.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20171018-1948Z.tar.bz2
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	mysql-multilib-r1	2c06af347ab7308dd741813b1a3da8e3	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	prefix	7b6fb2fc216b101b5d97d171925a847c	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=868ad7e342ca1a353b698f29d7562298
+_md5_=8e989165515c715dc354d5acb0a910a9
diff --git a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4 b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
index 9d95efbfdc2f..510a20831820 100644
--- a/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
+++ b/metadata/md5-cache/dev-db/sqliteman-1.2.2-r4
@@ -3,10 +3,10 @@ DEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sql
 DESCRIPTION=Powerful GUI manager for the Sqlite3 database
 EAPI=6
 HOMEPAGE=https://sourceforge.net/projects/sqliteman/
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 ~arm x86
 LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=x11-libs/qscintilla-2.9.4:=[qt5(+)]
 SLOT=0
 SRC_URI=mirror://sourceforge/sqliteman/sqliteman-1.2.2.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=756b796b613e36ab5d1be7f88deeb670
+_md5_=d87d914e67e7d058ab03e1e07004edc3
diff --git a/metadata/md5-cache/dev-lang/erlang-18.3 b/metadata/md5-cache/dev-lang/erlang-18.3
deleted file mode 100644
index 5bcf0e64851d..000000000000
--- a/metadata/md5-cache/dev-lang/erlang-18.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) wxwidgets? ( x11-libs/wxGTK:3.0[X,opengl] virtual/glu ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
-DESCRIPTION=Erlang programming language, runtime environment and libraries (OTP)
-EAPI=5
-HOMEPAGE=http://www.erlang.org/
-IUSE=compat-ethread doc emacs halfword hipe java kpoll libressl odbc smp sctp ssl systemd tk wxwidgets elibc_FreeBSD java
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris
-LICENSE=Apache-2.0
-RDEPEND=ssl? ( !libressl? ( >=dev-libs/openssl-0.9.7d:0 ) libressl? ( dev-libs/libressl ) ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2:* ) odbc? ( dev-db/unixODBC ) systemd? ( sys-apps/systemd ) java? ( >=dev-java/java-config-2.2.0-r3 )
-SLOT=0
-SRC_URI=http://www.erlang.org/download/otp_src_18.3.tar.gz http://erlang.org/download/otp_doc_man_18.3.tar.gz doc? ( http://erlang.org/download/otp_doc_html_18.3.tar.gz )
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=cc3c5959a1a79f4b33ac75e234944073
diff --git a/metadata/md5-cache/dev-lang/python-2.7.14 b/metadata/md5-cache/dev-lang/python-2.7.14
index dac115343f66..87fc8b2e1604 100644
--- a/metadata/md5-cache/dev-lang/python-2.7.14
+++ b/metadata/md5-cache/dev-lang/python-2.7.14
@@ -4,11 +4,11 @@ DESCRIPTION=An interpreted, interactive, object-oriented programming language
 EAPI=5
 HOMEPAGE=https://www.python.org/
 IUSE=-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=PSF-2
 PDEPEND=>=app-eselect/eselect-python-20140125-r1
 RDEPEND=app-arch/bzip2:0= >=sys-libs/zlib-1.1.3:0= virtual/libffi virtual/libintl berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:5.2 sys-libs/db:5.1 sys-libs/db:5.0 sys-libs/db:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm:0=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:0= readline? ( >=sys-libs/readline-4.1:0= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) ) tk? ( >=dev-lang/tcl-8.0:0= >=dev-lang/tk-8.0:0= dev-tcltk/blt:0= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1 ) !!<sys-apps/portage-2.1.9 !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:2.7 )
 SLOT=2.7
 SRC_URI=https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz https://dev.gentoo.org/~floppym/python/python-gentoo-patches-2.7.14-0.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d2f0cbca2735a900995b98758fd63f25
+_md5_=cb8cafc105eb55fad46415e756f9f9ae
diff --git a/metadata/md5-cache/dev-libs/check-0.10.0-r2 b/metadata/md5-cache/dev-libs/check-0.10.0-r2
deleted file mode 100644
index f35328e394a1..000000000000
--- a/metadata/md5-cache/dev-libs/check-0.10.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/texinfo virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A unit test framework for C
-EAPI=5
-HOMEPAGE=https://libcheck.github.io/check/
-IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/libcheck/check/archive/0.10.0.tar.gz -> check-0.10.0-github.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a03b9aac1f9a96e8d92a33ae9a970d17
diff --git a/metadata/md5-cache/dev-libs/check-0.11.0 b/metadata/md5-cache/dev-libs/check-0.11.0
deleted file mode 100644
index 520c3507160d..000000000000
--- a/metadata/md5-cache/dev-libs/check-0.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-apps/texinfo virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A unit test framework for C
-EAPI=6
-HOMEPAGE=https://libcheck.github.io/check/
-IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=subunit? ( >=dev-python/subunit-0.0.10-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://github.com/libcheck/check/archive/0.11.0.tar.gz -> check-0.11.0-github.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dbcaf5dde816578d28dac035ef9d830d
diff --git a/metadata/md5-cache/dev-libs/check-0.9.11 b/metadata/md5-cache/dev-libs/check-0.9.11
deleted file mode 100644
index 0520f150862b..000000000000
--- a/metadata/md5-cache/dev-libs/check-0.9.11
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=subunit? ( dev-python/subunit ) sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A unit test framework for C
-EAPI=4
-HOMEPAGE=https://sourceforge.net/projects/check/
-IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=subunit? ( dev-python/subunit ) sys-apps/texinfo
-SLOT=0
-SRC_URI=mirror://sourceforge/check/check-0.9.11.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2bff6afe5aeb98280c887b2f5276d8e7
diff --git a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
index 124d7c3614b2..90eecb3d4561 100644
--- a/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
+++ b/metadata/md5-cache/dev-libs/libmspack-0.6_alpha
@@ -2,10 +2,11 @@ DEFINED_PHASES=compile configure install test
 DESCRIPTION=A library for Microsoft compression formats
 EAPI=6
 HOMEPAGE=https://www.cabextract.org.uk/libmspack/
-IUSE=debug doc static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+IUSE=debug doc static-libs utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
+RDEPEND=utils? ( !app-arch/mscompress )
 SLOT=0
 SRC_URI=https://www.cabextract.org.uk/libmspack/libmspack-0.6alpha.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=fa1647d82710630bd7eb7597c2321777
+_md5_=a194e75700e02001aa887e39bd1fa060
diff --git a/metadata/md5-cache/dev-libs/m17n-lib-1.7.0 b/metadata/md5-cache/dev-libs/m17n-lib-1.7.0
index fae5370156ce..016f3b0561d5 100644
--- a/metadata/md5-cache/dev-libs/m17n-lib-1.7.0
+++ b/metadata/md5-cache/dev-libs/m17n-lib-1.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=Multilingual Library for Unix/Linux
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/m17n https://git.savannah.nongnu.org/cgit/m17n/m17n-lib.git
 IUSE=X anthy athena bidi fontconfig gd libotf libxml2 spell xft
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=~dev-db/m17n-db-1.7.0 X? ( x11-libs/libX11 athena? ( x11-libs/libXaw ) bidi? ( dev-libs/fribidi ) fontconfig? ( media-libs/fontconfig ) gd? ( media-libs/gd[png] ) libotf? ( dev-libs/libotf ) xft? ( media-libs/freetype x11-libs/libXft ) ) anthy? ( app-i18n/anthy ) libxml2? ( dev-libs/libxml2 ) spell? ( app-text/aspell )
 SLOT=0
 SRC_URI=mirror://nongnu/m17n/m17n-lib-1.7.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=a2f0849661c1d1f97dbec8a880677bf4
+_md5_=eb453e2f9051b0120dcedf5597401a9f
diff --git a/metadata/md5-cache/dev-libs/oniguruma-6.6.1 b/metadata/md5-cache/dev-libs/oniguruma-6.6.1
index 4cc0fa0a4c28..dfe4c0e953c8 100644
--- a/metadata/md5-cache/dev-libs/oniguruma-6.6.1
+++ b/metadata/md5-cache/dev-libs/oniguruma-6.6.1
@@ -4,9 +4,9 @@ DESCRIPTION=Regular expression library for different character encodings
 EAPI=6
 HOMEPAGE=https://github.com/kkos/oniguruma
 IUSE=combination-explosion-check crnl-as-line-terminator static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
 LICENSE=BSD-2
 SLOT=0/4
 SRC_URI=https://github.com/kkos/oniguruma/releases/download/v6.6.1/onig-6.6.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=9b43382984a2ca1c1db99a12c34ff63a
+_md5_=dde1dd3c2a84b7e2e6f61e01d359cc74
diff --git a/metadata/md5-cache/dev-libs/openssl-1.0.2m b/metadata/md5-cache/dev-libs/openssl-1.0.2m
index c11601a29223..298a47cd080c 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.0.2m
+++ b/metadata/md5-cache/dev-libs/openssl-1.0.2m
@@ -4,7 +4,7 @@ DESCRIPTION=full-strength general purpose cryptography library (including SSL an
 EAPI=5
 HOMEPAGE=https://www.openssl.org/
 IUSE=+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kerberos? ( >=app-crypt/mit-krb5-1.11.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
@@ -12,4 +12,4 @@ RESTRICT=!bindist? ( bindist )
 SLOT=0
 SRC_URI=mirror://openssl/source/openssl-1.0.2m.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=55ad747e9d4823992fa805fd8408014b
+_md5_=c5fcad5efb633d4bd457fd4cbc815872
diff --git a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4 b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
index f8b8ba12c4c5..a8335b97dea4 100644
--- a/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
+++ b/metadata/md5-cache/dev-libs/zthread-2.3.2-r4
@@ -4,9 +4,9 @@ DESCRIPTION=platform-independent multi-threading and synchronization library for
 EAPI=6
 HOMEPAGE=http://zthread.sourceforge.net/
 IUSE=debug doc kernel_linux static-libs
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ~ppc ~sparc x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8d9c53ea150c2053c2f77aa916a8ed41
+_md5_=498b5d5bbe9c6b6552b25bd90fd5cd90
diff --git a/metadata/md5-cache/dev-perl/Lab-VXI11-0.20.0 b/metadata/md5-cache/dev-perl/Lab-VXI11-0.20.0
new file mode 100644
index 000000000000..af6e7d1ad71a
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Lab-VXI11-0.20.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
+DESCRIPTION=Perl interface to the VXI-11 Test&Measurement backend
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Lab-VXI11/
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/Lab-VXI11-0.02.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=7fc23c15fd27675d852fba872cd5df26
diff --git a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0 b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
index b61defa95667..0389f529fd8b 100644
--- a/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
+++ b/metadata/md5-cache/dev-perl/Regexp-Common-2017060201.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provide commonly requested regular expressions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Regexp-Common/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic Artistic-2 MIT BSD )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2017060201.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ea01db89e003b3c47ebfc0bfbe9ae541
+_md5_=d79c56fe79fa286c0f90b6114825ada7
diff --git a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0 b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
index faf7888c154f..4dda4e956478 100644
--- a/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
+++ b/metadata/md5-cache/dev-perl/Test-Regexp-2017040101.0.0
@@ -4,10 +4,10 @@ DESCRIPTION=Provide commonly requested regular expressions
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Test-Regexp/
 IUSE=test
-KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~sparc x86
+KEYWORDS=alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86
 LICENSE=MIT
 RDEPEND=virtual/perl-Test-Simple virtual/perl-Exporter dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AB/ABIGAIL/Test-Regexp-2017040101.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=f6ab9d9df1e7b692985cde6b4e753605
+_md5_=4aac5e44a985501735b38cabe43ca51b
diff --git a/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0 b/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0
new file mode 100644
index 000000000000..05b091604ae6
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/USB-LibUSB-0.50.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/libusb:1 virtual/perl-Carp virtual/perl-Exporter dev-perl/Moo virtual/perl-XSLoader virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Perl interface to the libusb-1.0 API
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/USB-LibUSB/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/libusb:1 virtual/perl-Carp virtual/perl-Exporter dev-perl/Moo virtual/perl-XSLoader dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/USB-LibUSB-0.05.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=2ec5d2326412a96219d07ac77c6d5917
diff --git a/metadata/md5-cache/dev-perl/USB-TMC-0.5.0 b/metadata/md5-cache/dev-perl/USB-TMC-0.5.0
new file mode 100644
index 000000000000..9091456f18c7
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/USB-TMC-0.5.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Moose dev-perl/MooseX-Params-Validate dev-perl/USB-LibUSB virtual/perl-ExtUtils-MakeMaker test? ( virtual/perl-Module-Load virtual/perl-Test-Simple ) dev-lang/perl:=
+DESCRIPTION=Perl interface to the USB Test & Measurement (USBTMC) backend
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/USB-TMC/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=virtual/perl-Carp virtual/perl-Data-Dumper dev-perl/Moose dev-perl/MooseX-Params-Validate dev-perl/USB-LibUSB dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AM/AMBA/USB-TMC-0.005.tar.gz
+_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=e5e3f7a36b25d6592d4a3e67ab8012b4
diff --git a/metadata/md5-cache/dev-python/qscintilla-python-2.10.1 b/metadata/md5-cache/dev-python/qscintilla-python-2.10.1
index b6af62f6da1a..fbad50286b11 100644
--- a/metadata/md5-cache/dev-python/qscintilla-python-2.10.1
+++ b/metadata/md5-cache/dev-python/qscintilla-python-2.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=Python bindings for Qscintilla
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=debug +qt4 qt5 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/sip-4.19:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~x11-libs/qscintilla-2.10.1:=[qt4?,qt5?] qt4? ( >=dev-python/PyQt4-4.11.3[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-python/PyQt5[gui,printsupport,widgets,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( qt4 qt5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=10ad959a35c73eb1dae50349b0f49053
+_md5_=61ba07cb00f88a6b418e577f7f302286
diff --git a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3 b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
index 59d78f137040..4d2c96f75e9e 100644
--- a/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-4.8.7-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Cross-platform application development framework
 EAPI=5
 HOMEPAGE=https://www.qt.io/
 IUSE=+glib iconv icu libressl qt3support ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 aqua debug pch +exceptions
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=|| ( LGPL-2.1 LGPL-3 GPL-3 ) FDL-1.3
 PDEPEND=~dev-qt/qttranslations-4.8.7 qt3support? ( ~dev-qt/qtgui-4.8.7[aqua=,debug=,glib=,qt3support,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RDEPEND=>=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] glib? ( dev-libs/glib:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) icu? ( dev-libs/icu:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) dev-qt/qtchooser abi_x86_32? ( !app-emulation/emul-linux-x86-qtlibs[-abi_x86_32(-)] )
 SLOT=4
 SRC_URI=http://download.qt.io/official_releases/qt/4.8/4.8.7/qt-everywhere-opensource-src-4.8.7.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	qt4-build-multilib	277a1997239523435425a3e17d116e23	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=d2cc3bec36d4ce00d629e60613081be0
+_md5_=46cef7d0cd45f52487fb69f363aeb45a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
index 0ea0a090e206..a7c6d5d0bd4f 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=The QML and Quick modules for the Qt5 framework
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=gles2 +jit localstorage +widgets xml debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qttest-5.7.1 localstorage? ( ~dev-qt/qtsql-5.7.1 ) widgets? ( ~dev-qt/qtwidgets-5.7.1[gles2=] ) xml? ( ~dev-qt/qtnetwork-5.7.1 ~dev-qt/qtxmlpatterns-5.7.1 ) !<dev-qt/qtquickcontrols-5.7:5 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	0f449999356cc3feb4dc282fcf248e1a	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	virtualx	171580f737f5aaf18fcb456548588066
-_md5_=b0483d4b682cb1b145552c1cdc5ecdab
+_md5_=10f669b41ae4aebe316177b54e77099c
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.9.1 b/metadata/md5-cache/dev-ruby/i18n-0.9.1
new file mode 100644
index 000000000000..38ae800347bf
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/i18n-0.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Add Internationalization support to your Ruby application
+EAPI=6
+HOMEPAGE=http://rails-i18n.org/
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0.9
+SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.9.1.tar.gz -> i18n-0.9.1.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=52d308167d43c25d3f033721e125f6c2
diff --git a/metadata/md5-cache/dev-ruby/mail-2.7.0 b/metadata/md5-cache/dev-ruby/mail-2.7.0
index 7fb9ce249417..0d595e8ea97b 100644
--- a/metadata/md5-cache/dev-ruby/mail-2.7.0
+++ b/metadata/md5-cache/dev-ruby/mail-2.7.0
@@ -4,11 +4,11 @@ DESCRIPTION=An email handling library
 EAPI=6
 HOMEPAGE=https://github.com/mikel/mail
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/mini_mime-0.1.1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.7
 SRC_URI=https://github.com/mikel/mail/archive/2.7.0.tar.gz -> mail-2.7.0-git.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=7a943707521712ed67a1748e444b79f8
+_md5_=305bcf5f8c91d4da1c2f2c8d23473f34
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-0.1.4 b/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
index 3cfd2447522e..fc7d457263e1 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
+++ b/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=A lightweight mime type lookup toy
 EAPI=6
 HOMEPAGE=https://github.com/discourse/mini_mime
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~ppc
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v0.1.4.tar.gz -> mini_mime-0.1.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	ruby-fakegem	bafb56b9a7b7e84fd091508783628e78	ruby-ng	dbd648644c9f5bec523dc17dc34d8671	ruby-utils	453e0fe0dd06baac93b584c91528cc62	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=ba2a0fa8ac7a28a5443cde297dcaa34d
+_md5_=2c873bf526da56a11447996c95417fd6
diff --git a/metadata/md5-cache/dev-util/goland-173.3531.21 b/metadata/md5-cache/dev-util/goland-173.3531.21
new file mode 100644
index 000000000000..0b0a728259d9
--- /dev/null
+++ b/metadata/md5-cache/dev-util/goland-173.3531.21
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-173.3531.21.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=0a722fd2df349bdd585757860daa80ba
diff --git a/metadata/md5-cache/dev-util/pycharm-community-2017.2.1 b/metadata/md5-cache/dev-util/pycharm-community-2017.2.4
index c7143532ca3f..d388e175e2d0 100644
--- a/metadata/md5-cache/dev-util/pycharm-community-2017.2.1
+++ b/metadata/md5-cache/dev-util/pycharm-community-2017.2.4
@@ -7,6 +7,6 @@ LICENSE=Apache-2.0 BSD CDDL MIT-with-advertising
 RDEPEND=>=virtual/jre-1.8
 RESTRICT=mirror strip
 SLOT=0
-SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.2.1.tar.gz
+SRC_URI=http://download.jetbrains.com/python/pycharm-community-2017.2.4.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=0a306517f6ac263bd0a9665562bf8cfd
diff --git a/metadata/md5-cache/dev-util/pycharm-professional-2017.2.4 b/metadata/md5-cache/dev-util/pycharm-professional-2017.2.4
new file mode 100644
index 000000000000..1d8b5535ab2a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pycharm-professional-2017.2.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Intelligent Python IDE with unique code assistance and analysis
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/pycharm/
+KEYWORDS=~amd64 ~x86
+LICENSE=PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview
+RDEPEND=>=virtual/jre-1.8 dev-python/pip
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.jetbrains.com/python/pycharm-professional-2017.2.4.tar.gz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=043a076b1fcf080ae8703b5f560b9498
diff --git a/metadata/md5-cache/dev-util/systemtap-3.1-r1 b/metadata/md5-cache/dev-util/systemtap-3.1-r1
index c7c0b1fcc087..fd33f235a6ac 100644
--- a/metadata/md5-cache/dev-util/systemtap-3.1-r1
+++ b/metadata/md5-cache/dev-util/systemtap-3.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A linux trace/probe tool
 EAPI=6
 HOMEPAGE=https://www.sourceware.org/systemtap/
 IUSE=libvirt sqlite python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/elfutils-0.142 sys-libs/libcap python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] libvirt? ( >=app-emulation/libvirt-1.0.2 ) sqlite? ( dev-db/sqlite:3 )
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://www.sourceware.org/systemtap/ftp/releases/systemtap-3.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1491a0299df5137d31c9a37a5a9f38b7
+_md5_=034c2655542760d2a684a6f9d7630df9
diff --git a/metadata/md5-cache/dev-util/visualvm-1.3.9 b/metadata/md5-cache/dev-util/visualvm-1.3.9
new file mode 100644
index 000000000000..c2de4021bc50
--- /dev/null
+++ b/metadata/md5-cache/dev-util/visualvm-1.3.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup unpack
+DEPEND=>=virtual/jdk-1.7 app-arch/unzip >=dev-java/java-config-2.2.0-r3 >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DESCRIPTION=Integrates commandline JDK tools and profiling capabilities
+EAPI=6
+HOMEPAGE=https://visualvm.github.io/
+IUSE=elibc_FreeBSD elibc_FreeBSD
+KEYWORDS=~amd64
+LICENSE=GPL-2-with-linking-exception
+RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3
+SLOT=7
+SRC_URI=https://github.com/oracle/visualvm/archive/1.3.9.tar.gz -> visualvm-1.3.9.tar.gz https://github.com/oracle/visualvm/releases/download/1.3.9/nb802_visualvm_02102016.zip
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	java-ant-2	4e2b30d918dda38a51839a4d45282b62	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	1971a6927fcd7ec839f7e12b28a24bdd	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=810435eceb09ac9065b4dbd66fa750ec
diff --git a/metadata/md5-cache/media-libs/exiftool-10.61 b/metadata/md5-cache/media-libs/exiftool-10.61
deleted file mode 100644
index 2ba4c72b4aa4..000000000000
--- a/metadata/md5-cache/media-libs/exiftool-10.61
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl:=
-DESCRIPTION=Read and write meta information in image, audio and video files
-EAPI=6
-HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
-IUSE=doc
-KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
-LICENSE=|| ( Artistic GPL-1+ )
-RDEPEND=dev-lang/perl:=
-SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.61.tar.gz
-_eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=c3c9e1e91c7b8df6e2cf0cfd5be809fc
diff --git a/metadata/md5-cache/media-libs/exiftool-10.63 b/metadata/md5-cache/media-libs/exiftool-10.63
index 86d3c80acf79..d50c28a65a20 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.63
+++ b/metadata/md5-cache/media-libs/exiftool-10.63
@@ -4,10 +4,10 @@ DESCRIPTION=Read and write meta information in image, audio and video files
 EAPI=6
 HOMEPAGE=https://www.sno.phy.queensu.ca/~phil/exiftool/ http://search.cpan.org/dist/Image-ExifTool/
 IUSE=doc
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
+KEYWORDS=amd64 ppc ppc64 x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.63.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5ea65bc9ae339e0afab2ede4dd2b0f05
+_md5_=c3c9e1e91c7b8df6e2cf0cfd5be809fc
diff --git a/metadata/md5-cache/media-libs/exiftool-10.62 b/metadata/md5-cache/media-libs/exiftool-10.65
index 5bf5f2a42f6b..7b9897b0d53f 100644
--- a/metadata/md5-cache/media-libs/exiftool-10.62
+++ b/metadata/md5-cache/media-libs/exiftool-10.65
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x64-macos
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
-SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.62.tar.gz
+SRC_URI=https://www.sno.phy.queensu.ca/~phil/exiftool/Image-ExifTool-10.65.tar.gz
 _eclasses_=multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
 _md5_=5ea65bc9ae339e0afab2ede4dd2b0f05
diff --git a/metadata/md5-cache/media-libs/libgphoto2-2.5.14 b/metadata/md5-cache/media-libs/libgphoto2-2.5.14
index d1ff154d2da1..8341582163b5 100644
--- a/metadata/md5-cache/media-libs/libgphoto2-2.5.14
+++ b/metadata/md5-cache/media-libs/libgphoto2-2.5.14
@@ -4,10 +4,10 @@ DESCRIPTION=Library that implements support for numerous digital cameras
 EAPI=6
 HOMEPAGE=http://www.gphoto.org/
 IUSE=doc examples exif gd jpeg nls serial +cameras_adc65 +cameras_agfa_cl20 +cameras_aox +cameras_ax203 +cameras_barbie +cameras_canon +cameras_casio_qv +cameras_clicksmart310 +cameras_digigr8 +cameras_digita +cameras_dimagev +cameras_dimera3500 +cameras_directory +cameras_enigma13 +cameras_fuji +cameras_gsmart300 +cameras_hp215 +cameras_iclick +cameras_jamcam +cameras_jd11 +cameras_jl2005a +cameras_jl2005c +cameras_kodak_dc120 +cameras_kodak_dc210 +cameras_kodak_dc240 +cameras_kodak_dc3200 +cameras_kodak_ez200 +cameras_konica +cameras_konica_qm150 +cameras_largan +cameras_lg_gsm +cameras_mars +cameras_mustek +cameras_panasonic_coolshot +cameras_panasonic_l859 +cameras_panasonic_dc1000 +cameras_panasonic_dc1580 +cameras_pccam300 +cameras_pccam600 +cameras_pentax +cameras_polaroid_pdc320 +cameras_polaroid_pdc640 +cameras_polaroid_pdc700 +cameras_ptp2 +cameras_ricoh +cameras_ricoh_g3 +cameras_samsung +cameras_sierra +cameras_sipix_blink2 +cameras_sipix_web2 +cameras_smal +cameras_sonix +cameras_sony_dscf1 +cameras_sony_dscf55 +cameras_soundvision +cameras_spca50x +cameras_sq905 +cameras_st2205 +cameras_stv0674 +cameras_stv0680 +cameras_sx330z +cameras_toshiba_pdrm11 +cameras_topfield +cameras_tp6801 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.9.1-r4:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libusb-1-r1:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) exif? ( >=media-libs/libexif-0.6.21-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( >=virtual/jpeg-0-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<sys-fs/udev-201
 SLOT=0/6
 SRC_URI=mirror://sourceforge/gphoto/libgphoto2-2.5.14.tar.bz2
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	185a06792159ca143528e7010368e8af	udev	d91cac2c73b94629cad2daea66e0d182	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=d0d9ce22167a12e80733bbd47ea0f603
+_md5_=95bf38c5f899e8eb20b09d84a3f7180e
diff --git a/metadata/md5-cache/media-libs/libmediainfo-17.10 b/metadata/md5-cache/media-libs/libmediainfo-17.10
new file mode 100644
index 000000000000..3f639ebb6630
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libmediainfo-17.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) virtual/pkgconfig doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=MediaInfo libraries
+EAPI=6
+HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib
+IUSE=curl doc mms static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib dev-libs/tinyxml2:= >=media-libs/libzen-0.4.37[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://mediaarea.net/download/source/libmediainfo/17.10/libmediainfo_17.10.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=5280a855bc6827fa950ca5462f8a466d
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.36 b/metadata/md5-cache/media-radio/flrig-1.3.36
new file mode 100644
index 000000000000..53c1b2ee701f
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.3.36
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=5
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.36.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
+_md5_=28c2257537753eb773bb1822ef2958f9
diff --git a/metadata/md5-cache/media-sound/abcmidi-2017.10.18 b/metadata/md5-cache/media-sound/abcmidi-2017.10.18
deleted file mode 100644
index 4cc5570add5c..000000000000
--- a/metadata/md5-cache/media-sound/abcmidi-2017.10.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=app-arch/unzip >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Programs for processing ABC music notation files
-EAPI=6
-HOMEPAGE=http://ifdo.ca/~seymour/runabc/top.html
-IUSE=examples
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://ifdo.ca/~seymour/runabc/abcMIDI-2017.10.18.zip
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=35cc25d55455c2a4784d056b97a7eb29
diff --git a/metadata/md5-cache/media-sound/abcmidi-2017.10.11 b/metadata/md5-cache/media-sound/abcmidi-2017.11.01
index 2d3d7cf6f46c..14a89e71074d 100644
--- a/metadata/md5-cache/media-sound/abcmidi-2017.10.11
+++ b/metadata/md5-cache/media-sound/abcmidi-2017.11.01
@@ -7,6 +7,6 @@ IUSE=examples
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://ifdo.ca/~seymour/runabc/abcMIDI-2017.10.11.zip
+SRC_URI=http://ifdo.ca/~seymour/runabc/abcMIDI-2017.11.01.zip
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
 _md5_=35cc25d55455c2a4784d056b97a7eb29
diff --git a/metadata/md5-cache/media-video/mediainfo-17.10 b/metadata/md5-cache/media-video/mediainfo-17.10
new file mode 100644
index 000000000000..b72b330ad931
--- /dev/null
+++ b/metadata/md5-cache/media-video/mediainfo-17.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup
+DEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.10[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=MediaInfo supplies technical and tag information about media files
+EAPI=6
+HOMEPAGE=https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfo
+IUSE=curl mms wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/zlib >=media-libs/libzen-0.4.37 ~media-libs/libmediainfo-17.10[curl=,mms=] wxwidgets? ( x11-libs/wxGTK:3.0[X] )
+SLOT=0
+SRC_URI=https://mediaarea.net/download/source/mediainfo/17.10/mediainfo_17.10.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=716254fa4dcff77e8c20f8b15ee86e4e
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.5-r3 b/metadata/md5-cache/net-ftp/ncftp-3.2.5-r3
deleted file mode 100644
index a4da24cf3156..000000000000
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.5-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-libs/ncurses >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=An extremely configurable ftp client
-EAPI=5
-HOMEPAGE=http://www.ncftp.com/
-IUSE=ipv6 pch
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
-LICENSE=Clarified-Artistic
-RDEPEND=sys-libs/ncurses
-SLOT=0
-SRC_URI=ftp://ftp.ncftp.com/ncftp/ncftp-3.2.5-src.tar.bz2 -> ncftp-3.2.5.474.tar.bz2 mirror://openbsd/distfiles/ncftp-325-v6.diff.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=2c6db070c7298f9c3da959a2ddc8909d
diff --git a/metadata/md5-cache/net-ftp/ncftp-3.2.6 b/metadata/md5-cache/net-ftp/ncftp-3.2.6
index 1a46e50099e7..7562e0708204 100644
--- a/metadata/md5-cache/net-ftp/ncftp-3.2.6
+++ b/metadata/md5-cache/net-ftp/ncftp-3.2.6
@@ -4,10 +4,10 @@ DESCRIPTION=An extremely configurable ftp client
 EAPI=6
 HOMEPAGE=http://www.ncftp.com/
 IUSE=pch
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris
 LICENSE=Clarified-Artistic
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=ftp://ftp.ncftp.com/ncftp/ncftp-3.2.6-src.tar.xz -> ncftp-3.2.6.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=968a81b0e0134f8544e6a6493a2e63df
+_md5_=c72da14136bf26dd0aa9f49a199870fd
diff --git a/metadata/md5-cache/net-im/kadu-4.3-r1 b/metadata/md5-cache/net-im/kadu-4.3-r1
index 0106930f5919..9eacfd5e24f4 100644
--- a/metadata/md5-cache/net-im/kadu-4.3-r1
+++ b/metadata/md5-cache/net-im/kadu-4.3-r1
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.11.1[threads] ) mpd? ( media-libs/libmpdclient ) otr? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/libotr-4.1.0 ) spell? ( app-text/enchant ) xmpp? ( net-dns/libidn >=net-libs/qxmpp-0.9.3-r1 sys-libs/zlib ) dev-qt/linguist-tools:5 x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtsql:5 dev-qt/qtsvg:5 dev-qt/qttest:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver gadu? ( >=net-libs/libgadu-1.11.1[threads] ) mpd? ( media-libs/libmpdclient ) otr? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/libotr-4.1.0 ) spell? ( app-text/enchant ) xmpp? ( net-dns/libidn >=net-libs/qxmpp-0.9.3-r1 sys-libs/zlib ) dev-qt/linguist-tools:5 x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=An open source Gadu-Gadu and Jabber/XMPP protocol Instant Messenger client
 EAPI=6
 HOMEPAGE=http://www.kadu.net
@@ -10,5 +10,5 @@ RDEPEND=>=app-arch/libarchive-2.6[lzma] >=dev-libs/injeqt-1.1.0 dev-qt/qtcore:5
 REQUIRED_USE=|| ( gadu xmpp )
 SLOT=0
 SRC_URI=http://download.kadu.im/stable/kadu-4.3.tar.bz2
-_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=c695102e8743dafc44e514129a3aa9f5
+_eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a362be3d90d5ef3a86ca4b7ee715947f
diff --git a/metadata/md5-cache/net-libs/libtorrent-0.13.6-r1 b/metadata/md5-cache/net-libs/libtorrent-0.13.6-r1
index 08d793b6b18a..115ee456958a 100644
--- a/metadata/md5-cache/net-libs/libtorrent-0.13.6-r1
+++ b/metadata/md5-cache/net-libs/libtorrent-0.13.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=BitTorrent library written in C++ for *nix
 EAPI=5
 HOMEPAGE=https://rakshasa.github.io/rtorrent/
 IUSE=debug ipv6 libressl ssl test
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib >=dev-libs/libsigc++-2.2.2:2 ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/libtorrent-0.13.6.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=8e82385035dc8c979c62d9aab7efa359
+_md5_=33fc3c44c9768546f580321d1c11b550
diff --git a/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1 b/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1
index f16c3fa702dd..e4ab677f007d 100644
--- a/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1
+++ b/metadata/md5-cache/net-libs/loudmouth-1.5.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Lightweight C Jabber library
 EAPI=5
 HOMEPAGE=https://github.com/mcabber/loudmouth
 IUSE=asyncns ssl openssl static-libs test
-KEYWORDS=alpha ~amd64 ~arm ia64 ~ppc ppc64 ~sparc ~x86 ~ppc-macos
+KEYWORDS=alpha ~amd64 ~arm ia64 ~ppc ppc64 sparc ~x86 ~ppc-macos
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.16:2 net-dns/libidn ssl? ( !openssl? ( >=net-libs/gnutls-1.4.0 ) openssl? ( dev-libs/openssl:0 ) ) asyncns? ( >=net-libs/libasyncns-0.3 )
 SLOT=0
 SRC_URI=https://github.com/mcabber/loudmouth/archive/1.5.2.tar.gz -> loudmouth-1.5.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=068fabe1cd2a66bfeb4f10e2eab46ff0
+_md5_=2ca3abd54510d207b5fcd7e40528829e
diff --git a/metadata/md5-cache/net-libs/nodejs-4.8.5 b/metadata/md5-cache/net-libs/nodejs-4.8.5
index 889d63dafcb4..557cd7a4fe74 100644
--- a/metadata/md5-cache/net-libs/nodejs-4.8.5
+++ b/metadata/md5-cache/net-libs/nodejs-4.8.5
@@ -4,11 +4,11 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=5
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=icu? ( >=dev-libs/icu-55:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.5.2:= >=dev-libs/libuv-1.8.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v4.8.5/node-v4.8.5.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=549b3a85a4be0f00c8601a8607f6b883
+_md5_=481f2bafeaaa155e80797bcbb0cca874
diff --git a/metadata/md5-cache/net-libs/nodejs-6.11.5 b/metadata/md5-cache/net-libs/nodejs-6.11.5
index f8bd51911685..61c23dcd6b08 100644
--- a/metadata/md5-cache/net-libs/nodejs-6.11.5
+++ b/metadata/md5-cache/net-libs/nodejs-6.11.5
@@ -4,7 +4,7 @@ DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
 EAPI=6
 HOMEPAGE=https://nodejs.org/
 IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
 RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.6.2:= >=dev-libs/libuv-1.9.0:= >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
 REQUIRED_USE=python_targets_python2_7
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://nodejs.org/dist/v6.11.5/node-v6.11.5.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=663d84cfded956ce6c0e4fe26af15da1
+_md5_=635f426877a19e9df000640b386ec5ff
diff --git a/metadata/md5-cache/net-libs/nodejs-8.8.1 b/metadata/md5-cache/net-libs/nodejs-8.8.1
deleted file mode 100644
index 9ee199527d41..000000000000
--- a/metadata/md5-cache/net-libs/nodejs-8.8.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test
-DEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.7.0:= >=dev-libs/libuv-1.15.0:= >=net-libs/nghttp2-1.25.0 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] systemtap? ( dev-util/systemtap ) test? ( net-misc/curl )
-DESCRIPTION=A JavaScript runtime built on Chrome's V8 JavaScript engine
-EAPI=6
-HOMEPAGE=https://nodejs.org/
-IUSE=cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos
-LICENSE=Apache-1.1 Apache-2.0 BSD BSD-2 MIT
-RDEPEND=icu? ( >=dev-libs/icu-56:= ) npm? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=net-libs/http-parser-2.7.0:= >=dev-libs/libuv-1.15.0:= >=net-libs/nghttp2-1.25.0 >=dev-libs/openssl-1.0.2g:0=[-bindist] sys-libs/zlib
-REQUIRED_USE=python_targets_python2_7
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nodejs.org/dist/v8.8.1/node-v8.8.1.tar.xz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=bdc74a4c909c7d62a77974f716f2932d
diff --git a/metadata/md5-cache/net-misc/memcached-1.5.2 b/metadata/md5-cache/net-misc/memcached-1.5.2
index a2f0588c1a71..d1480e7da5c6 100644
--- a/metadata/md5-cache/net-misc/memcached-1.5.2
+++ b/metadata/md5-cache/net-misc/memcached-1.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=High-performance, distributed memory object caching system
 EAPI=6
 HOMEPAGE=http://memcached.org/
 IUSE=test slabs-reassign debug sasl selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=BSD
 RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-memcached )
 SLOT=0
 SRC_URI=https://www.memcached.org/files/memcached-1.5.2.tar.gz https://www.memcached.org/files/old/memcached-1.5.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=5e4c8ff452cb72e220efdb30906f5a02
+_md5_=d4d6a8feeb018470500062c598f26786
diff --git a/metadata/md5-cache/net-p2p/rtorrent-0.9.6-r1 b/metadata/md5-cache/net-p2p/rtorrent-0.9.6-r1
index cb7b38f4fc3a..82f024a2b3f8 100644
--- a/metadata/md5-cache/net-p2p/rtorrent-0.9.6-r1
+++ b/metadata/md5-cache/net-p2p/rtorrent-0.9.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=BitTorrent Client using libtorrent
 EAPI=5
 HOMEPAGE=https://rakshasa.github.io/rtorrent/
 IUSE=daemon debug ipv6 selinux test xmlrpc
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=GPL-2
 RDEPEND=~net-libs/libtorrent-0.13.6 >=dev-libs/libsigc++-2.2.2:2 >=net-misc/curl-7.19.1 sys-libs/ncurses:0= xmlrpc? ( dev-libs/xmlrpc-c ) daemon? ( app-misc/screen ) selinux? ( sec-policy/selinux-rtorrent )
 SLOT=0
 SRC_URI=http://rtorrent.net/downloads/rtorrent-0.9.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=95691344e84518aa69c000e600801cb8
+_md5_=bcd85774f572f336cf4242d25ec0d479
diff --git a/metadata/md5-cache/sec-policy/apparmor-profiles-2.11.0 b/metadata/md5-cache/sec-policy/apparmor-profiles-2.11.0
deleted file mode 100644
index ed7059bcf4ae..000000000000
--- a/metadata/md5-cache/sec-policy/apparmor-profiles-2.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A collection of profiles for the AppArmor application security system
-EAPI=6
-HOMEPAGE=http://apparmor.net/
-IUSE=minimal
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=1283f5299ba75a16e93742bccfbd6a72
diff --git a/metadata/md5-cache/sys-apps/apparmor-2.11.0 b/metadata/md5-cache/sys-apps/apparmor-2.11.0
deleted file mode 100644
index db47407b527c..000000000000
--- a/metadata/md5-cache/sys-apps/apparmor-2.11.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=~sys-libs/libapparmor-2.11.0 dev-lang/perl sys-devel/bison sys-devel/flex doc? ( dev-tex/latex2html )
-DESCRIPTION=Userspace utils and init scripts for the AppArmor application security system
-EAPI=6
-HOMEPAGE=http://apparmor.net/
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=~sys-libs/libapparmor-2.11.0
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=952117bc790e0a4522cbc870ef3b3edc
diff --git a/metadata/md5-cache/sys-apps/apparmor-utils-2.11.0-r1 b/metadata/md5-cache/sys-apps/apparmor-utils-2.11.0-r1
deleted file mode 100644
index f884561861d5..000000000000
--- a/metadata/md5-cache/sys-apps/apparmor-utils-2.11.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-lang/perl python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-lang/perl:=
-DESCRIPTION=Additional userspace utils to assist with AppArmor profile management
-EAPI=6
-HOMEPAGE=http://apparmor.net/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ~sys-libs/libapparmor-2.11.0[perl,python] ~sys-apps/apparmor-2.11.0 dev-perl/Locale-gettext dev-perl/RPC-XML dev-perl/TermReadKey virtual/perl-Data-Dumper virtual/perl-Getopt-Long dev-lang/perl:=
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=b2ae72d9f76f56083e6ce3cecb584ad4
diff --git a/metadata/md5-cache/sys-apps/net-tools-1.60_p20161110235919 b/metadata/md5-cache/sys-apps/net-tools-1.60_p20161110235919
index 4f6a537364e2..b4ac5a95a249 100644
--- a/metadata/md5-cache/sys-apps/net-tools-1.60_p20161110235919
+++ b/metadata/md5-cache/sys-apps/net-tools-1.60_p20161110235919
@@ -4,11 +4,11 @@ DESCRIPTION=Standard Linux networking tools
 EAPI=5
 HOMEPAGE=http://net-tools.sourceforge.net/
 IUSE=+arp +hostname ipv6 nis nls plipconfig selinux slattach static
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=selinux? ( sys-libs/libselinux ) hostname? ( !sys-apps/coreutils[hostname] ) !<sys-apps/openrc-0.9.9.3
 REQUIRED_USE=nis? ( hostname )
 SLOT=0
 SRC_URI=mirror://gentoo/net-tools-1.60_p20161110235919.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=f3577c2a4f90fd48df341a0234647000
+_md5_=9598cc7f1c5fed91eebdde77d2dd05e1
diff --git a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3 b/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
index f182ee59dce6..389b2d7d0620 100644
--- a/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
+++ b/metadata/md5-cache/sys-apps/udevil-0.4.4-r3
@@ -3,10 +3,10 @@ DEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >
 DESCRIPTION=mount and unmount removable devices without a password
 EAPI=6
 HOMEPAGE=https://ignorantguru.github.com/udevil/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=GPL-3
 RDEPEND=>=app-shells/bash-4.0:* dev-libs/glib:2 sys-apps/util-linux virtual/acl >=virtual/udev-143
 SLOT=0
 SRC_URI=https://github.com/IgnorantGuru/udevil/archive/0.4.4.tar.gz -> udevil-0.4.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=9ea21f59594ef738eb317861b63be1a7
+_md5_=947af459530eea398afc61c2a146cc3b
diff --git a/metadata/md5-cache/sys-apps/yarn-0.27.5 b/metadata/md5-cache/sys-apps/yarn-0.27.5
deleted file mode 100644
index 6764aab83793..000000000000
--- a/metadata/md5-cache/sys-apps/yarn-0.27.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!dev-util/cmdtest net-libs/nodejs
-DESCRIPTION=Fast, reliable, and secure node dependency management
-EAPI=6
-HOMEPAGE=https://yarnpkg.com
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=!dev-util/cmdtest net-libs/nodejs
-SLOT=0
-SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v0.27.5/yarn-v0.27.5.tar.gz
-_md5_=6fedb25f0e162930bd1829752e87300a
diff --git a/metadata/md5-cache/sys-apps/yarn-1.0.2 b/metadata/md5-cache/sys-apps/yarn-1.0.2
deleted file mode 100644
index b03d99d2ca13..000000000000
--- a/metadata/md5-cache/sys-apps/yarn-1.0.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=!dev-util/cmdtest net-libs/nodejs
-DESCRIPTION=Fast, reliable, and secure node dependency management
-EAPI=6
-HOMEPAGE=https://yarnpkg.com
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-2
-RDEPEND=!dev-util/cmdtest net-libs/nodejs
-SLOT=0
-SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.0.2/yarn-v1.0.2.tar.gz
-_md5_=0057e55191ef4416f0a30eaae74a0065
diff --git a/metadata/md5-cache/sys-apps/yarn-1.0.1 b/metadata/md5-cache/sys-apps/yarn-1.2.1
index 58d8f98ffabb..7e17611f9ae4 100644
--- a/metadata/md5-cache/sys-apps/yarn-1.0.1
+++ b/metadata/md5-cache/sys-apps/yarn-1.2.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=!dev-util/cmdtest net-libs/nodejs
 SLOT=0
-SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.0.1/yarn-v1.0.1.tar.gz
+SRC_URI=https://github.com/yarnpkg/yarn/releases/download/v1.2.1/yarn-v1.2.1.tar.gz
 _md5_=0057e55191ef4416f0a30eaae74a0065
diff --git a/metadata/md5-cache/sys-devel/qconf-2.0 b/metadata/md5-cache/sys-devel/qconf-2.0
deleted file mode 100644
index c8d3569fe7ac..000000000000
--- a/metadata/md5-cache/sys-devel/qconf-2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtxml:5 )
-DESCRIPTION=./configure like generator for qmake-based projects
-EAPI=6
-HOMEPAGE=http://delta.affinix.com/qconf/
-IUSE=+qt4 qt5
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtxml:5 )
-REQUIRED_USE=^^ ( qt4 qt5 )
-SLOT=0
-SRC_URI=http://delta.affinix.com/download/qconf-2.0.tar.bz2
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=dab424a12c7e619eac1abc7cd7f28b56
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11 b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
new file mode 100644
index 000000000000..95979d8b1511
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.13.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.13_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.13-13.base.tar.xz mirror://gentoo/genpatches-4.13-13.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.13-13.experimental.tar.xz ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=a40426fe82a10e45633eb210f2b42a85
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96 b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
new file mode 100644
index 000000000000..920d227f8613
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.4.96
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.96
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.4_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.4-100.base.tar.xz mirror://gentoo/genpatches-4.4-100.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-100.experimental.tar.xz ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=5d709e1a948be93a6431072bd939f699
diff --git a/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60 b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60
new file mode 100644
index 000000000000..98e0f90926bc
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/aufs-sources-4.9.60
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/
+IUSE=experimental module vanilla symlink build
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND==sys-fs/aufs-util-4*
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.60
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~jlec/distfiles/aufs-sources-4.9_p20171030.tar.xz !vanilla? ( mirror://gentoo/genpatches-4.9-62.base.tar.xz mirror://gentoo/genpatches-4.9-62.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-62.experimental.tar.xz ) )
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=3c23c9ab5c4c499f3e7161f7c51f4a56
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.13.11 b/metadata/md5-cache/sys-kernel/ck-sources-4.13.11
new file mode 100644
index 000000000000..bf8075073092
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.13.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.13
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.13.11
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.13.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-4.13 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.13-gnu/deblob-check -> deblob-check-4.13 ) mirror://gentoo/genpatches-4.13-13.base.tar.xz mirror://gentoo/genpatches-4.13-13.extras.tar.xz mirror://gentoo/genpatches-4.13-13.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.13/4.13-ck1/patch-4.13-ck1.xz
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=c030bde7ece78d202221ed5d21f261cd
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.60 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.60
new file mode 100644
index 000000000000..29b4a49e4587
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.60
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://users.tpg.com.au/ckolivas/kernel/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( freedist )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.60
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-62.base.tar.xz mirror://gentoo/genpatches-4.9-62.extras.tar.xz mirror://gentoo/genpatches-4.9-62.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	kernel-2	880361b861490d9503f47d4f16e05f2c	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_md5_=f175f6569982ed106fd1d3ca4e1f3761
diff --git a/metadata/md5-cache/sys-libs/libapparmor-2.11.0-r1 b/metadata/md5-cache/sys-libs/libapparmor-2.11.0-r1
deleted file mode 100644
index aaf4bef6cd12..000000000000
--- a/metadata/md5-cache/sys-libs/libapparmor-2.11.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) sys-devel/autoconf-archive sys-devel/bison sys-devel/flex doc? ( dev-lang/perl ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Library to support AppArmor userspace utilities
-EAPI=5
-HOMEPAGE=http://apparmor.net/
-IUSE=doc +perl +python static-libs python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://launchpad.net/apparmor/2.11/2.11/+download/apparmor-2.11.0.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	perl-functions	01e8c68d5a528bbcda4d3c60205983df	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=05ef5e9abfb7a707ff6f401e33027031
diff --git a/metadata/md5-cache/sys-process/tini-0.16.1 b/metadata/md5-cache/sys-process/tini-0.16.1
index ebbf3eb65132..ce525a719b42 100644
--- a/metadata/md5-cache/sys-process/tini-0.16.1
+++ b/metadata/md5-cache/sys-process/tini-0.16.1
@@ -4,9 +4,9 @@ DESCRIPTION=A tiny but valid init for containers
 EAPI=6
 HOMEPAGE=https://github.com/krallin/tini
 IUSE=+args +static
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=amd64 ~arm ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/krallin/tini/archive/v0.16.1.tar.gz -> tini-0.16.1.tar.gz
 _eclasses_=cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=0999c23c27820d4ba48e55d11d50e650
+_md5_=039f0b0e2f51650c4738cd15723fb29f
diff --git a/metadata/md5-cache/sys-process/vixie-cron-4.1-r15 b/metadata/md5-cache/sys-process/vixie-cron-4.1-r15
index aef378b52e66..4ce3153d0a67 100644
--- a/metadata/md5-cache/sys-process/vixie-cron-4.1-r15
+++ b/metadata/md5-cache/sys-process/vixie-cron-4.1-r15
@@ -4,10 +4,10 @@ DESCRIPTION=Paul Vixie's cron daemon, a fully featured crond implementation
 EAPI=0
 HOMEPAGE=ftp://ftp.isc.org/isc/cron/
 IUSE=selinux pam debug
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=ISC BSD-2 BSD
 RDEPEND=selinux? ( sys-libs/libselinux ) pam? ( virtual/pam ) >=sys-process/cronbase-0.3.2 !sys-process/bcron !sys-process/cronie !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=mirror://gentoo/vixie-cron-4.1.tar.bz2 mirror://gentoo/vixie-cron-4.1-gentoo-r4.patch.bz2
 _eclasses_=cron	f1612f73abbd36aca8b193e1e2cac6d5	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=d7f9c395cb2a5729f78a05ff3509d151
+_md5_=2eee91c4fb990acf787f27048db6745d
diff --git a/metadata/md5-cache/www-apps/gitea-1.2.1 b/metadata/md5-cache/www-apps/gitea-1.2.2
index f99c956b927e..73cd1b5de56e 100644
--- a/metadata/md5-cache/www-apps/gitea-1.2.1
+++ b/metadata/md5-cache/www-apps/gitea-1.2.2
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm
 LICENSE=MIT
 RDEPEND=dev-vcs/git
 SLOT=0
-SRC_URI=https://github.com/go-gitea/gitea/archive/v1.2.1.tar.gz -> gitea-1.2.1.tar.gz
+SRC_URI=https://github.com/go-gitea/gitea/archive/v1.2.2.tar.gz -> gitea-1.2.2.tar.gz
 _eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	e4b567c44272a719fabf53f0f885d3f7
-_md5_=44b36219d0b5b8b84954847ad16ae9f4
+_md5_=962e9aee03a5457189284335934905fc
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.18 b/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.30
index ad3233799f53..4c6c7a2639f0 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.18
+++ b/metadata/md5-cache/www-client/google-chrome-beta-63.0.3239.30
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_63.0.3239.18-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_63.0.3239.30-1_amd64.deb
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3251.0 b/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3253.3
index cab1290d42e0..3da8603e0522 100644
--- a/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3251.0
+++ b/metadata/md5-cache/www-client/google-chrome-unstable-64.0.3253.3
@@ -9,6 +9,6 @@ LICENSE=google-chrome
 RDEPEND=app-arch/bzip2 app-misc/ca-certificates dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/pango x11-misc/xdg-utils
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_64.0.3251.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_64.0.3253.3-1_amd64.deb
 _eclasses_=chromium-2	fcd0e1c5eaae64392927ca67cdb13e0c	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6cdf7c4d2429baad20b9cfbd73d530cd
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.18_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.30_beta
index b735eb9b61b2..fc67771dfd85 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.18_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-63.0.3239.30_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_63.0.3239.18-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_63.0.3239.30-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3251.0_alpha b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3253.3_alpha
index 115168c3fd6b..da84d59fa52b 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3251.0_alpha
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3253.3_alpha
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:beta !www-plugins/chrome-binary-plugins:stable
 RESTRICT=bindist mirror strip
 SLOT=unstable
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_64.0.3251.0-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-unstable/google-chrome-unstable_64.0.3253.3-1_amd64.deb
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	185a06792159ca143528e7010368e8af	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
 _md5_=e6bda532181b632aa3e6c51ebf1fc380
diff --git a/metadata/md5-cache/x11-libs/qscintilla-2.10.1 b/metadata/md5-cache/x11-libs/qscintilla-2.10.1
index a9e2540bd906..a18ec1d50153 100644
--- a/metadata/md5-cache/x11-libs/qscintilla-2.10.1
+++ b/metadata/md5-cache/x11-libs/qscintilla-2.10.1
@@ -4,11 +4,11 @@ DESCRIPTION=A Qt port of Neil Hodgson's Scintilla C++ editor class
 EAPI=6
 HOMEPAGE=https://www.riverbankcomputing.com/software/qscintilla/intro
 IUSE=designer doc +qt4 qt5
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 designer? ( dev-qt/designer:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 designer? ( dev-qt/designer:5 ) )
 REQUIRED_USE=|| ( qt4 qt5 )
 SLOT=0/13
 SRC_URI=mirror://sourceforge/pyqt/QScintilla_gpl-2.10.1.tar.gz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	185a06792159ca143528e7010368e8af
-_md5_=01940f6efc95470b43470446c4b0e20b
+_md5_=cb711ed291196034be9ea6161b0255d9
diff --git a/metadata/md5-cache/x11-misc/virtualgl-2.5.2 b/metadata/md5-cache/x11-misc/virtualgl-2.5.2
index 4666af74fa09..a3654b82dd7a 100644
--- a/metadata/md5-cache/x11-misc/virtualgl-2.5.2
+++ b/metadata/md5-cache/x11-misc/virtualgl-2.5.2
@@ -4,10 +4,10 @@ DESCRIPTION=Run OpenGL applications remotely with full 3D hardware acceleration
 EAPI=6
 HOMEPAGE=http://www.virtualgl.org/
 IUSE=libressl ssl abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 x86
 LICENSE=LGPL-2.1 wxWinLL-3.1 FLTK
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) media-libs/libjpeg-turbo[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXext[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/glu[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/opengl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] amd64? ( abi_x86_32? ( >=media-libs/libjpeg-turbo-1.3.0-r3[abi_x86_32] >=x11-libs/libX11-1.6.2[abi_x86_32] >=x11-libs/libXext-1.3.2[abi_x86_32] >=x11-libs/libXv-1.0.10[abi_x86_32] >=virtual/glu-9.0-r1[abi_x86_32] >=virtual/opengl-7.0-r1[abi_x86_32] ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/virtualgl/files/2.5.2/VirtualGL-2.5.2.tar.gz
 _eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	f9fb12e2dbe2e0c9c17f030bae85eb02	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	flag-o-matic	2274fcc1e7ef6affaff5bcd636275417	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	systemd	34815d3b76e745c5ca33eec9f95074c2	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=9aefff326585669527e48b04b74e1a28
+_md5_=f8ef4d7334112823b2b06fe8cda346de
diff --git a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1 b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
index 0209d6549912..b438d0b3e5dd 100644
--- a/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
+++ b/metadata/md5-cache/x11-misc/xdg-user-dirs-gtk-0.10-r1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3 dev-u
 DESCRIPTION=Integrates xdg-user-dirs into the Gnome desktop and Gtk+ applications
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/xdg-user-dirs
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=dev-libs/glib >=x11-misc/xdg-user-dirs-0.14 >=x11-libs/gtk+-3.5.1:3
 SLOT=0
 SRC_URI=mirror://gnome/sources/xdg-user-dirs-gtk/0.10/xdg-user-dirs-gtk-0.10.tar.xz
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	227b041a120d309fdefbebb3b8c1dfa9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	185a06792159ca143528e7010368e8af	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=788de3d1fdc16282e96badad9541c885
+_md5_=b86b193d1c525fc7ee3ed40c12524700
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 3b58ff1cb6ac..818257943ae1 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Nov 2017 20:39:50 +0000
+Fri, 03 Nov 2017 17:39:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 2732d0155745..31ac8c4d8dac 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Nov  2 20:39:50 UTC 2017
+Fri Nov  3 17:39:49 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 72cdbc5fc4d6..029bbc835e57 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Nov 2017 20:45:01 +0000
+Fri, 03 Nov 2017 17:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index a26061ceeb71..c0d071d8dd61 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-ecf43ed6a4edbda3b79f016664852e9f2674fe60 1509653947 2017-11-02T20:19:07+00:00
+7491b1c8fcef82e5ddf0cfb23c5b4b287a91d9e5 1509727675 2017-11-03T16:47:55+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3d5c37e8698e..1256d44cf062 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1509654901 Thu 02 Nov 2017 08:35:01 PM UTC
+1509730501 Fri 03 Nov 2017 05:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 3b58ff1cb6ac..818257943ae1 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 02 Nov 2017 20:39:50 +0000
+Fri, 03 Nov 2017 17:39:49 +0000
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index 4e7eff40fd9a..3075853b6e12 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,8 +1,5 @@
-DIST ncftp-3.2.5.474.tar.bz2 454682 SHA256 b4ebe2415761a5137cd1d313c8fc1352f26d8963cc9e9e354e29720aa2089d42 SHA512 ebd7f618e5a9ac5e59f3e3dbf9b15765e80404416865212c0b2ee7339aafe2296867faf02fad2084e5a6377796e787d5cfc6599ec3f0e544c6b137734cfdc405 WHIRLPOOL 4b9c0a6bc5b90149d3a1b9ea24dea030faefa4dfe9e361c7694a2e1f133182bf85e46041de209a9a34d7be81b70870298c718a19dd41458dbc9c90283478cfd8
 DIST ncftp-3.2.6.tar.xz 418836 SHA256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d SHA512 040db7e2ca2ee78b79d682a951fd98c1e0ee2936b64462259992d70c51241fa50ae06c66b4f40933ad0ab7122f581bbb8ba7cda764dba5f70a1f8c7d3d751199 WHIRLPOOL 9d41e9e1f9119482cdbb10b819a48b0e58e2df2f3f56fb1ccd0443527592d31aba48642b1831b272231fabb230b0c7c673099d2d272a6a9077001abbb02491a5
-DIST ncftp-325-v6.diff.gz 23295 SHA256 7fb95240c33aeca67e53be58f6016a7e1dcd753b125940f539dab7595e0d02ba SHA512 6e2e740fba2c2b5268ab5928db979ac813bd29dd76633603d69d747fdf765858e1de893a6067518b0b1f01d0b90d8d6426998f5d9b37bbbebe144951878e2b0a WHIRLPOOL 2f7868bdc0e74707a0b0e2e8a2a1b7d0634fd86ff440e5046a48d5b01c1efb86621a5844d56b0e8793d243fa1a998b6136d147a1a9aeeb95c00e1d312415ebb6
-EBUILD ncftp-3.2.5-r3.ebuild 1167 SHA256 2c1ffedc45bb169e925eab4515c763ae5771f46917cc7adf1d4617fce16a9390 SHA512 e17fbd19e18b55cf757cedca548a0568b366ee38dfc370468a03daecc9d5f028e3045999e54875e85bfc00c45bf32ac1fb7c50c7abbfed62fb1b89dc9e7c16ba WHIRLPOOL 1a6d1975cf8befd7e0c5e1c2d8ceeac793f88759d5af1e9ff0b6ab1ea48f16baa0ceb44c7f2b01ab1dff146a1ea9061c3b685d31fbd6b8be36f50ef06233da76
-EBUILD ncftp-3.2.6.ebuild 1059 SHA256 ea8743d757402770c68f27c4aebd855e4a4344b45316c0850297a5dd44ba1428 SHA512 3008cd651504685fc2fdc0121df8825b3e69038917f4ec925d0b77b96bbfb87e53bcee1901203780a6c78c53f478f2305e6c90ede211111e2ad4672ceb4ed5f7 WHIRLPOOL 19509eef59522bf63c45e7c960cc6956e028af3d5a8e3df4f70cbf273c3b429434b3709aa560faf7df9f66e660461608c04494dee2dfc02ea347eb505c306f0a
+EBUILD ncftp-3.2.6.ebuild 1058 SHA256 065ce428c3fc7d529c2f21ef42db6fbce9abeaf7d5f86974d280dfbc6a6bd4fb SHA512 3425f30eaa416e7a03f25de9914e0d814f9104fec7714cae9dfbc9ec06121b8a5367831914fe1b811e0330e2fda50a11a1554413c603b60a8f8bf7565178659b WHIRLPOOL dc95f9fd2d1c19072f2d963fd0aa788cba3a6596ac184375a3e698201c75284ebc59495d35a8e96793a49fe9ba9fe00d086c8909c336cdf70153a5ca1705ff99
 MISC ChangeLog 2322 SHA256 9fd24ac61d902f6f69d1fc2e7538514fd21c16a2cfd52f346b52c1a53ef0d426 SHA512 b9c010dbaa123607a58c6d242e623a035e1f077e8a44b44ea413d5bc81f990db4cabcced811e98ffd8e500ca88ea494af9ab6e1992f5a43df3dd0686c86dccae WHIRLPOOL 0c7e1ad3f4bb741c127228be97f2c841b19565696e942106aa638d63485c8549ed359746f4d1048c8db7b772c6f825bdcfd78cee57142a82a795829a067a9ced
 MISC ChangeLog-2015 17803 SHA256 34f41bacc4fdf891983dcf4095aca1c5f28015754e4bdd9dcd29162c8bd2597e SHA512 b6d0a8be68acc8fcdf0c3a745685196808db6803991039f44f71d54c65ce930288fbe37c24aee47a623847c1a372c108897e5bd39321e18e821895965df5a1ad WHIRLPOOL b7f44ab88ccfd667a6632ac24cce1439e09170a15378077c872566499d4b477eb22091551689f59f586ac1cdac512d9486b639201af705d6cfde8d559ab83650
 MISC metadata.xml 738 SHA256 719fb096a36c8d1be308c67234688f6af2dea89fe59a0ef3445fdcc76d61008f SHA512 e792a9cbbc371515f5137c4c00faad6936b4c6cc27bcfd5bfab151b00002ae8159cb9b76777a4bdd59dd87ea951ea62898ac74f6afd8a4ec0a1e5dcec12210b3 WHIRLPOOL 6b08b542a318a5ab4e01163db4c1a631fbb709c4e0bb0df4842c30145583874dfce9a859206f0b4337e8e929e2cf5332bbb54d5892747a8fd14f2b79faaa35f3
diff --git a/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild b/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild
deleted file mode 100644
index b0903768db2b..000000000000
--- a/net-ftp/ncftp/ncftp-3.2.5-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils toolchain-funcs
-
-DESCRIPTION="An extremely configurable ftp client"
-HOMEPAGE="http://www.ncftp.com/"
-SRC_URI="
-	ftp://ftp.${PN}.com/${PN}/${P}-src.tar.bz2 -> ${P}.474.tar.bz2
-	mirror://openbsd/distfiles/${P//.}-v6.diff.gz
-"
-
-LICENSE="Clarified-Artistic"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
-IUSE="ipv6 pch"
-
-DEPEND="sys-libs/ncurses"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${P/.474}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P//.}-v6.diff
-	tc-export CC
-	sed -i \
-		-e "s:CC=gcc:CC ?= ${CC}:" \
-		-e 's:@SFLAG@::' \
-		-e 's:@STRIP@:true:' \
-		Makefile.in */Makefile.in || die
-	AT_M4DIR=autoconf_local/ eautoreconf
-}
-
-src_configure() {
-	LC_ALL="C" \
-	LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		econf \
-		$(use_enable ipv6) \
-		$(use_enable pch precomp) \
-		--disable-ccdv \
-		--disable-universal
-}
-
-src_install() {
-	default
-	dodoc README.txt doc/*.txt
-	dohtml doc/html/*.html
-}
diff --git a/net-ftp/ncftp/ncftp-3.2.6.ebuild b/net-ftp/ncftp/ncftp-3.2.6.ebuild
index 6d1ec1918465..6186cd069fa7 100644
--- a/net-ftp/ncftp/ncftp-3.2.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.2.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris"
 IUSE="pch"
 
 DEPEND="
diff --git a/net-im/kadu/Manifest b/net-im/kadu/Manifest
index 2565457b2e14..7d6428e9c49b 100644
--- a/net-im/kadu/Manifest
+++ b/net-im/kadu/Manifest
@@ -1,9 +1,11 @@
 AUX kadu-2.1-port-to-QtQuick-2.3.patch 5640 SHA256 12276d2b4ea71869b6a454cd9e2fc358f94107822d85399af6a8de51f2207ef1 SHA512 f5923c25861497fac78f29ed70fd5ea444797ecd93cd89d5e87326e76977ac74837975a7c0c948463f7eb0b9db25246c71246710a70aad32e01c378251140505 WHIRLPOOL 62098cfa991030f811f245052dd67d4fdd17722403b61fd18e9ffff33503f06cd6dff2b592f92ae0778adc2d57f32a532a219c287e644de8d1e9d6d7f40ef360
 AUX kadu-2.1-qt5-compilation.patch 542 SHA256 5a18b98d3bc6182e489344157057d60802c52f70f7fa8063254b4b9570df94a2 SHA512 294a2d90145d8765e0ae25482607f326f5fc8a86c589ed686ad37e02a13a5d487c28c5b0fbc3495de690864cc5b120cc5a75297dfc5ff28a4b6e4eaf7eade5d8 WHIRLPOOL db78ee7f4ac1c2eade749d8d6e1e86daf437514288042c111a5caa605f6f14595cae664310cabcf89b3c19d289d2b5c520cc237d65b6ff48efb82bfebeccdd83
+AUX kadu-4.3-do-not-force-ccache.patch 635 SHA256 ea78811a5584741aa4cf17685b3d0fa6bfff47f30f0e6d80c5dd0e9d5cabea33 SHA512 d17b7a20d78c8446d845bdb80c4a110adb164d0dfaff52f5a67730a3e1d861f65ccb84d67d04cc7088169b6d3d56376c8c43b3c432795a273a0da5517eabd86b WHIRLPOOL 89059bf0502665500f555520558eaa829cc8cca0e8b403a846772e54f4c0d4de03e8c23441b810a75b128f4ab5bf2f6ff56b7176fa920e2148cf95cbc1bfd571
+AUX kadu-4.3-fix-plugins-rpath.patch 473 SHA256 9fd28bc5a31204098867b9df53b41c4146ec47db86006b2ed19ea75926f69768 SHA512 af94cb0127abd7ffe6ebd9fea20d17efb835773a6e8194caddd07b736e84e2ee40da51b820ec38e8eb07de6755941b53ded07f9b8aa9a7acd28b612c3259f952 WHIRLPOOL 177d33d7a05d3c9cb339ee7e5f9c7ca1bc2831c7db6a51b0a3f754e41ad89c52d58bca0f2f7e2bbad13a0053529c4def0cb4dcf402f53b09b1b3471c91a8607a
 DIST kadu-2.1.tar.bz2 6013519 SHA256 9f8092756d4a870c1ecb016c0cba2c833e1697b3eb7e9bf51813b1f0a541ffb8 SHA512 3f0e38aefbaf15f357ae8232b1364deb5954a2464895fafa0a324ad99c7d14c6ba7495bed51d628e04c30bbaaf8e49412c70bbbbf01a40f360406c1afba2384a WHIRLPOOL 10b214ca8d1964054918dc0e1b85bf1157d2496e3ad340958302083a0374ac4fb7b6ac96741637f3847ac06dd9c322b0e529f9c204b9ebc6658157f7b7c2b8a2
 DIST kadu-4.3.tar.bz2 8087786 SHA256 ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e SHA512 fb3d16320894bbfbd50e695d61f305710e59bccce84319389a4047626e97da95ded0b35bc5f7e5d8c2ac96594693b14dd8dd8d46eb1863f89d3eec2e51c73cc9 WHIRLPOOL 606d25ea578f5edbf768ad9f7cce96a11d58b6a97ff85fc1ba9dbf1062e1ac5774c0b9318ff3bb6cc90767f015b68e8df22086c6cc0ecff5b726e94596562214
 EBUILD kadu-2.1-r1.ebuild 2753 SHA256 f732e12862571eb700b4115a19f0521a03e5cb3befbe089599cb4666b3075ba8 SHA512 c419340e5107b22b678d3b61abe921b29a4155df0773a21edcab6e513100e6cbec823d5effa1975066b04df815f3bfffba308df649c555148e3c3ca18390d56e WHIRLPOOL 497352ceba8461b60b8c3b73f002bb31f9a08caa7caa03a11e79e974890a8761087df2f0ca8db466de35841e396857959ac8b571d90344121375cbb4a8f84235
-EBUILD kadu-4.3-r1.ebuild 2332 SHA256 86ccd0e68c71a7be64206b4af85de2105560314274cca2db3088637f0757792c SHA512 15ae7828478c9fa87ce19f3191dd0ab2abf04ca9eb84eb31127978c08fc8827e4ee2816257a7683396a4bbf538402fb6502513f319e600ec8162257bb4544b3e WHIRLPOOL 59e07296e2e753b4088925f339424fdee45b8e0cc6872f3c9359e4d0343343fe936aebc94452e4969e2e1bcd1bcfa9b8f9e16e913ef684f9fc8ea826916f6b9c
+EBUILD kadu-4.3-r1.ebuild 2504 SHA256 0dff01f7cdffa46168daf3c307a0291c57d0a86399254d6491d83c078a16f205 SHA512 d35a15398bc95402668bd0f5dce81ac591c44a5a38f6cda86ad906dc494f2317e476e1ef0f9c30c060387120a656f2c8e299e73d1ad9b5e82c555b01b2a5c2c6 WHIRLPOOL cab6c9f7c179254a9023cfb567435baaf73913cf20d0addf199e893a3d939a6fc3282858eddcb15bee93d53ce74bab7fa435a471c11fd476ebc492a2ccb12f47
 MISC ChangeLog 3711 SHA256 2f9fb50708693fb45af9e42dcc74c5e2e811b67403284b8f5b57ab12aebfe292 SHA512 7438f66ee90178d94360083c8129a2b4a9a8ae2a4475442af680f39ec1bbab2cb53bd6a0ac58ea202a310b2e8cfb59ca9e09bbc8cfdc27f424fbf6f5f3856105 WHIRLPOOL 817f97bb63482bed5bd2fe89a018483d0800a2efbd440c8b582a6898f6c07397456312f384b6430e63ca0ef5cfe50c90c2cefb2c4a6bb10d1669691307f0044c
 MISC ChangeLog-2015 22539 SHA256 795191f9799eab353a11f4c79b0ed3b36f78d23420d00a6c41be3e85f996498e SHA512 2f7059e1dad15b1369132ee926f0132f18a39c316d4eea498a25cf14795643f887d5ff4155abad5f699e6bb9e7a2f983b2b600b772926007fc26ec8f61998336 WHIRLPOOL b19acd3152dd1b46ab7160eb100a89908825f497efedc8eb9981b1c74200a1ea5de43acb294f60621f4b488a10b6628ee524deb737d0d5c31dac156dcc7028c7
 MISC metadata.xml 635 SHA256 ff678e69d2677fcd15b08cc49179b787e61a4af9a71f0baeceeb9ab898175896 SHA512 91bc130c8ea984c22e84a1702216fb78956f9c25a60fadab7c9b2afa04067306ffa8936db29eb138b6f95c41b8b99ac18b26b4747a054bf56eb0af87f8cb0571 WHIRLPOOL 02ff8b88b92480b71079ed41bd5cbc0db0b9523c3e7058aa2eb88404aafa9d7ce5d6c449fdc53f4ed4085699a629fbcef394f5ff0e0578c4acafc8a96fb8dd2d
diff --git a/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
new file mode 100644
index 000000000000..2511f3c42b99
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-do-not-force-ccache.patch
@@ -0,0 +1,17 @@
+diff -ruN kadu-4.3/CMakeLists.txt my/CMakeLists.txt
+--- kadu-4.3/CMakeLists.txt	2017-01-24 22:36:21.000000000 +0100
++++ my/CMakeLists.txt	2017-11-03 03:00:07.005162047 +0100
+@@ -75,13 +75,6 @@
+ 	endif ()
+ endif ()
+ 
+-## CCache is cool stuff to improve compilation time
+-find_program (CCACHE_FOUND ccache)
+-if (CCACHE_FOUND)
+-	set_property (GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+-	set_property (GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+-endif (CCACHE_FOUND)
+-
+ # Look above, DEBUG_ENABLED is always enabled in Debug configuration.
+ # Enable it in all configurations when ENABLE_DEVELOPER_BUILD is on.
+ if (ENABLE_DEVELOPER_BUILD)
diff --git a/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
new file mode 100644
index 000000000000..bb171af5f41b
--- /dev/null
+++ b/net-im/kadu/files/kadu-4.3-fix-plugins-rpath.patch
@@ -0,0 +1,12 @@
+diff -ruN kadu-4.3/cmake/KaduMacros.cmake my/cmake/KaduMacros.cmake
+--- kadu-4.3/cmake/KaduMacros.cmake	2017-01-24 22:36:21.000000000 +0100
++++ my/cmake/KaduMacros.cmake	2017-11-03 03:24:17.827054622 +0100
+@@ -221,7 +221,7 @@
+ 
+ 	if (NOT WIN32)
+ 		set_target_properties (${KADU_PLUGIN_NAME} PROPERTIES
+-			INSTALL_RPATH "${KADU_INSTALL_LIB_DIR}/kadu"
++			INSTALL_RPATH "${KADU_INSTALL_PREFIX}/${KADU_INSTALL_LIB_DIR}/kadu"
+ 			BUILD_WITH_INSTALL_RPATH TRUE
+ 		)
+ 	endif ()
diff --git a/net-im/kadu/kadu-4.3-r1.ebuild b/net-im/kadu/kadu-4.3-r1.ebuild
index b3e45cf121e7..b33c0729b454 100644
--- a/net-im/kadu/kadu-4.3-r1.ebuild
+++ b/net-im/kadu/kadu-4.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-inherit cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic gnome2-utils
 
 MY_P="${P/_/-}"
 
@@ -100,6 +100,11 @@ tabs
 word_fix
 '
 
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3-do-not-force-ccache.patch"
+	"${FILESDIR}/${PN}-4.3-fix-plugins-rpath.patch"
+)
+
 src_configure() {
 	# Filter out dangerous flags
 	filter-flags -fno-rtti
@@ -128,3 +133,7 @@ src_configure() {
 
 	cmake-utils_src_configure
 }
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
diff --git a/net-libs/libtorrent/Manifest b/net-libs/libtorrent/Manifest
index 0289f4c95c88..67970108fff6 100644
--- a/net-libs/libtorrent/Manifest
+++ b/net-libs/libtorrent/Manifest
@@ -1,5 +1,5 @@
 DIST libtorrent-0.13.6.tar.gz 781253 SHA256 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 SHA512 b8aea4060357a8a40d15d42f1f698ef6f3ebdc885000bfbfa5bf9c81af8c88b5503a107e05c214e3e8489126928d336356c5e7e0eaf836b6b84a3cf74633b050 WHIRLPOOL 9bfc9444efef33dce9792b7dc50fd150ebf7462ea656f82ed7cf1b9c3873eb94742c1e3ecdea6d1c382383ca6ebd4ac1e1ea4169328534d056944fb26c2aa4fd
-EBUILD libtorrent-0.13.6-r1.ebuild 1723 SHA256 5f55d93452d6158f8d993113b124bb576c4d098e998978a5c96b0332ba284ff9 SHA512 ba76515e588c4d2818055fcf6777e6fa1dd3df973dd0da8d32c68d1babcc7b700182f91fbf1d6eafcc7152dab1a508b4b483871e61c404f18d14e5a62f96b2f2 WHIRLPOOL 921b6f9aa7fd41f8ea29fb18792912cf287258ecdcf79c90c4018da8015e02e400f4d3f7259c7a75585c4d3bba1135cca610fefbf7ebf1503a08e3e5bd34e638
+EBUILD libtorrent-0.13.6-r1.ebuild 1721 SHA256 65b34c12a78000d5dbd5ce5ed36898f425f3a4adde98370a1491d3d0129f71c6 SHA512 f05edef61849a4c8bce09893d88eaed92982c65bb49c5763aff5d5ff41ebc9ab0fc33646058303fe1a9f52edc4c157f0e7de03990f98c8bd40a578edae5526ff WHIRLPOOL 1eacc27ffeb25c45645467d499742d9ec5ca4fac4c53fd46f3792bc16778ac9dc09580abb55792e621d8d54980b21db75f04e08f4a36c6a6ffc7b0c5cf616817
 EBUILD libtorrent-0.13.6.ebuild 1331 SHA256 bdcf15cb76a4c0eefe86f3c9f37087f5785726ed1b35ef4fcf5e8ad0dc4f2738 SHA512 2d10363590b0e224fa814964a3ff8adaf3e43f2e2ee1feb7ccf4d3ff524577aeb295e10f5fe5270bbf694f035440078c7e2caf1e3f6ca1e0231aac03ad81bac2 WHIRLPOOL e83b9c5ffccfd951c80ab34414f740a150bf01b1bff957cf47f39e1cd108b9745a561169773262d85ed6fb5db59c7a77d15bd80479753230803d825119fb1e51
 MISC ChangeLog 3951 SHA256 7dddd53f6ecc39cb71823769ac104d6b7aa50b484ba126ab251a08b7b5d049a1 SHA512 b2ac9985ff96996e306b8bafbd3b09460ad17c380ab9313452dd720da4fe900b37eb882792cdbcc9e2642750cf66ac4585a669a6a4d560e1e2f11da1e3e6b455 WHIRLPOOL e3437752a60601d9ae4779393aa34cad93ef1012d493a2269e596654bdec11d9f55e3aa4ce362d6d0c327c2abeea43b89060e2de22a7d438f9e695ae61ba727d
 MISC ChangeLog-2015 27326 SHA256 58f65ecc39872b7657cc376cf647c4de50e7f8c7a6b0a203fbb34db27b7c8755 SHA512 5c98dfdde0ed4f29699d55eb7ee325da2095610b5c22492f003fa069cd555ff180213f9657c9cf9861e72ca138cae87f55f93bb01c57961cfc14f2bf8e706aa5 WHIRLPOOL 43564cd468893bf800d17a4b6ed7af5d448775363465ef31189ddc7ad23ae6af4779550981a6403055c043110ba92328f3f3f36da5cfeba5ef68862022b30400
diff --git a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild b/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
index 7eafcd218bef..97235820704e 100644
--- a/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
+++ b/net-libs/libtorrent/libtorrent-0.13.6-r1.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 # subslot.
 SLOT="0"
 
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="debug ipv6 libressl ssl test"
 
 RDEPEND="
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index c57a33323a07..45400c561701 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -12,7 +12,7 @@ DIST loudmouth-1.4.3.tar.bz2 366818 SHA256 95a93f5d009b71ea8193d994aa11f311bc330
 DIST loudmouth-1.5.2.tar.gz 115940 SHA256 c3dd7b5690a7b6ee4768d71d2bdee4615cfb73b6eeaa342d6a931a5160e47421 SHA512 54c3eb7ef99604d7e2d5560dc6e5be176a188e6a0d82ae6c2f488e30f06553039aa03d6f818cec25f354479a2624f60f2233d7e63b54f331e934d554de9bfc87 WHIRLPOOL 99fd7fa00f08976242313c2bc11e9edfbe1aeea9918090347a1975d5ece438892afbf3b5c16ffe79b1c0a10b28f35f62937d45a234e63b26f051466799fd7685
 DIST loudmouth-1.5.3.tar.gz 114676 SHA256 12972fcffd9bbcc4a3b2b9fbf4b0e549f7b4caf0f11c8d2af2059087ce4e8792 SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7 WHIRLPOOL 0a7d4a01ec4f0ae68f58f3267aabc2eb9f7eb0e812232a8ecd3664dd5c99ae404c4825bb5ae01f36a1cced48a9aaff67c4a92c23541e2e1fd9f69c4a67962007
 EBUILD loudmouth-1.4.3-r2.ebuild 2498 SHA256 df24c25a75f01711e7c1260ee09bbd383dce86b6e18c2241f0a8fccdef573e53 SHA512 2d0122e816ce11214c6ee00641535d0d9148c1412ee660fb361930e4cea95bf4866fbd68e340c57ec593afc94487a0aaeb1160ee1aff69a41f87138245cf7f4f WHIRLPOOL a9e1c8e8c2ba49b95c8f43b170bdab29288d176b01bfb50878cc36ab9df9ec0425be5808c9495ee76f841fc6e9550ef0e23002c2966827e1fe3430e23907607d
-EBUILD loudmouth-1.5.2-r1.ebuild 1163 SHA256 63efe87e8c14e062c809b8050281b7616e060de4460c5429c9c9c80a838f8c21 SHA512 42b8edc99b62273da907fac0a35d95c7085478c9a0da3ef5a047f4372b4fcf632bd3fb2a12c7669a694c40c0690d527dfcf212e0ad4f1e551b52f56c9abdc493 WHIRLPOOL 9b0d529e00a90460f89992f93ef851649d108691aa813339eb210a32d0e6f0da7c99b9b1e1af3eaf38434be9499fd6d94cf8be462a7a817fbe64cf15ee61be23
+EBUILD loudmouth-1.5.2-r1.ebuild 1162 SHA256 9fcd2a3dba0dc2fb1655e17d21babb80a0a0f098de5d4b51b7e9ecdbc79acb07 SHA512 2c9822ac9dce9b21a8d5ce05308e25b1a9d0661e68463503c09c4f2f0ae65906000ce7ce510610f0997a58f70c7d3e8c8b15e324fd4cf910d20a021f9b98db8f WHIRLPOOL 2b8033cb25018ed8c80b6877511bee0d0feaf1cf77f87ab1566190b61baa3b570ce6d35472cf4160846b31b3e03059d166f4a294da476334aead57d4c6ed7b26
 EBUILD loudmouth-1.5.3.ebuild 1166 SHA256 487caf946da6057b07075c3a9fc105bd747a8ababc75dda3b59786f7b5958a6e SHA512 7257a30439d6a17b92a04443405ea7ae10b83ad2621a411f25e1e6d593e8252a07012a5ded42d2645c39d45c9494b137fb77585c7bd47379ce128886f6e6ecd1 WHIRLPOOL 183d80e39a847257bcd2805ede690686d9dc0696ba5c1245913930e53b3ab1ef3466a28e1dbfc50c33a76af0509b16fb9c89dd5a601ff86151243abc360b3916
 MISC ChangeLog 4063 SHA256 863df6afc9f522b1f1a4af210e924437080027d82fca2fb2de38946af8e25160 SHA512 25144a9ded7506ae171913e1c1c945c19a88c27eafca6b9874ff18bdd42153b5b6cd256c3a97bf45b5f58d0542161fc4a51a971e356d13b9379f0f4878a14e96 WHIRLPOOL 2ff7e6f2b309b0517d07f873f18052654149d20c7083b3402d6ded7a690334b001e4451a6d40e8d83310fa9b10a94eda56b0baaf47c22c331c11aeda8a3f4a79
 MISC ChangeLog-2015 15204 SHA256 5feb983262f60ea734d8e4c754d13a37fbd8c12750d047fa362420a1875e3cfb SHA512 e71849c239afca32e7cbd4939905806252dab8af6a67751b480116bfb5f0dd06da4e8fd8f6ee4f1b02ab49431ac71904c0cfcb58e6bcbbc96bd110ec1fdf9a97 WHIRLPOOL 89cf0a8db229015f6478357e445a11201b595ac5e2adfc32c9e3a94309d4258a6c7191e3eac02ae07518bef9256485b4a7cdde414bd06a4ad167504c31f0c968
diff --git a/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
index 1ff3a71e5dfe..0e6638e9a51a 100644
--- a/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~arm ia64 ~ppc ppc64 sparc ~x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index a901064b1e5b..158b5f3f900b 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -1,20 +1,17 @@
 AUX gentoo-global-npm-config.patch 1511 SHA256 a6575286a4f0c3b4db07c2f353d2e6c093eb3caba6cd0d3b11e546734b16bfad SHA512 b6c8bf88bd44d5461cbad0354273a6f964429d1cde48ab4c8bef9f50452de22bfc5d15707c5c9adc2a0d8000a6b1be4cffdee039618b627fb0d291886309cc3f WHIRLPOOL 7e748dd02dd248fde544ee088fe4e7b295919f5da1fcaf9511071c716d073ed45380831677082f9748c3802b7bdc6004b78275f39d29f1396330a1b196c5f1e1
-AUX nodejs-8.7.0-shared-nghttp2.patch 3162 SHA256 45206aa8cb8832521218a6dc28db0877427a3fc6093311d778e61c21a01c1760 SHA512 e9a142f95c5d5758332b3652d8a821940f541c29664b2788909c20d2b25a61294e2eda712eec1332abb81f5f3d55470c2127585644e3cc9c05c3fe5cb510f54c WHIRLPOOL 1c9a3835e708011abb2306ab760efd2029aebc0f6cf82725582c5ce090bdf0d38b3ad523006e93f0bea4c001ac346371a2ed0c7e3536dcd91d7048f06a1e0df6
 AUX nodejs-8.9.0-shared-nghttp2.patch 3158 SHA256 f5589a4e9133a9ec80cca2deeb22489ee424a798fae81271b603ebbee32a46d9 SHA512 eea090e1543f718e8bb72b5923cc4e065617ec8bc6c16a27c79d2e88fd78e54d3d741a694d5fd8979025d1cdd5a761c96feb5bb1a65de771a70102118badd3a8 WHIRLPOOL 06e2542c7c742b273fec3f2a6bdd88bfb1bf3f10f442005c26e77871a82cbbd0154e378473b137b31c31aa5ad61e4124e57b7eb74a1c1db07bf2a73b3ceb711c
 DIST node-v0.12.17.tar.gz 19938029 SHA256 ddea5e253812f167608fbdda6ff29ffc30dc6f669cf2f6e4249938d28b9cd44d SHA512 86c22b17f57018083b07096beeca10e6dfa7569b3d1a25a3b12dd82796db3c9536e6136e0dd0ff62b4de116413f3722b36ce396faa46d8640f80ab09ccfcbca7 WHIRLPOOL 5fba1f95de0a7dbda7e7649bc0f8553cd8595eb87cd27062efbdc59a54673e7e1e6f80191abede683a686043a81d82b76e141aa765b98e3dc39e015aca98e41f
 DIST node-v4.6.1.tar.xz 13295568 SHA256 fe2a85df8758001878abb5bbaf17a6b6cdc12b3e465b1d3bace83b37fdf0345a SHA512 4eb2acbe13ee2373922420e3238be63d2108dacba640438bddbdea12ec2de9c655f33db611e4c0654b66bf4fdb844a7b6554a823aac73171b17599096856abdb WHIRLPOOL a6d21cce7ab8c430528682f78a6e6492f753c87949b7b1bdc15dc02911559cd89deb45329c2ba32da57b776dd4feaabec8a3e7a59a78094cfb079261b6475c76
 DIST node-v4.8.5.tar.xz 13316060 SHA256 a48aeefc2b4fae0ea6410a8045ca106af244223012eab003bd5cb00aa3b50d53 SHA512 64d936ca14648b5648dedb41f2ee8d39466788762d335fbfc9ce4cb7484d05b6c24ad912fb4b1579a08f466be50b129a96be700fd89cbca5e1de84baa63ddd12 WHIRLPOOL 8d74323f38b4f55bf2e95a628005cbb65c0f4ea0e5dd55699408e26b724ff65fd0a7f674399ed92ac3a56592064133daffcbb37d7076b8da33d28b4d17d61410
 DIST node-v6.11.5.tar.xz 15699404 SHA256 1c6de415216799fbaeca82304b3fef87accc7101ebf2ead7d5c545e0779e8aaf SHA512 62490725ef7957294c1bddf21ef0626c7472876791210168116501255ecee58457e9de9b044e10033706243299bbfd1495efeca169596fbf26f5eeba6d8fa4c9 WHIRLPOOL 6e572e34d473544624734a54243dc41101e91d045f2b9cedc0c1a65c90584deb163efb422a0c992689ef9878cc5b882758795ae4d902c1c5b20468d8fa2151da
 DIST node-v6.9.4.tar.xz 15519264 SHA256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce WHIRLPOOL d1bcf488ed1aae7959303b988c9467fc5d0930166c7bfe0e441392763e19f788496971c07560a9f62586bbb2be7ce741ece8346140d665d29593b9b8f649b002
-DIST node-v8.8.1.tar.xz 18209260 SHA256 5ce2c47ab779992db49942f757a01cc5131db5cef4e0dd270e48151b0887b57a SHA512 368eafd66d2108ebce4593bf496e129287949ea6d6b7d4b1f0f02e91ae1ef9632a63838dda752f12b4c2b133c2b2ae74b390717c02778c427e8e17964c002c0f WHIRLPOOL 26ab36f120ad068f5e36c06c6c7224fdaedcfd88d519ff573a984d83b07c5aafe0fcc773ebedab43326de32e20bfed4c681c7f14a9563733b0f091bc0ded39a5
 DIST node-v8.9.0.tar.xz 18284720 SHA256 ae8258f89e127a76d4b4aff6fdb8dc395b7da0069cba054b913dfc36b3c91189 SHA512 0dc585b9f7f91f76bcfc742d5fdbd55b7e2676ba48f9354e825560658f0ab0726dd5fab9c8aa4c251f8812363aab1ea2dab1e04f526fee95b1a99ac180490a7d WHIRLPOOL e64fc14b0253f457d95958aaa55d93801e437df72a9b838e0f6bfa765ecacc819814111bd02b39331164efbc095c940be7ec8a8ba4690e0b73d61df037a9387e
 DIST node-v9.0.0.tar.xz 18244756 SHA256 5b52bd6a90a611a42e11a908022ccfc1c2e77dcc70bfe38054a18dc57a3d5fa5 SHA512 3b7770c294b20df0ce321e03038dd8ef69ef81539c02ec5e2ef6e7d98fee9446f8ab0fd537812fd87c43e4b24018e39111c406dd657d251f28417ad7e870962d WHIRLPOOL dd1cb8aa379f0c3d2d5c89c44ca3542086ff3008226b2e154ef461e3baeb1c4ad4d53910181dad124beaa14bcc800adcd65ec31fcfb038af3e2e0b4fed892f20
 EBUILD nodejs-0.12.17.ebuild 3425 SHA256 4dbd8abed45e7a0266b9cd379bb95e205e8edf006e57711dde176ba954b996a8 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075 WHIRLPOOL fee27aa0ccbcc6e8d827de12e49fb1e549b2784b9edf6e19304ccc24ad243a28556d01fdc046a74e9023ebf394d0e47f2e60442b2c23b0b49c7c169a66beeb11
 EBUILD nodejs-4.6.1.ebuild 4435 SHA256 0ffa9d22c3264d0bcd11ad6fddba92c55257d9da1a732ed70421a844f09857b3 SHA512 989f6f6375723a6de89aa9f593585557032f4794be80e39d68fb2fb7dab6de0fbaf6b2b56205ac21f3f9bb2b2cae92505efc9b644f99fa33f24cfbfa469fc358 WHIRLPOOL c34ce2816c957622d87abbd54f04b8763f1bdb9caada6d909e761ab024d70d2a04a41a0714339da42d445a018d9a0b9830d2e1849b00de14b8c2d5a7ffb6cab9
-EBUILD nodejs-4.8.5.ebuild 4437 SHA256 9ba83181dd49f1c758430db5c0c588d9b03eda0dcfb01bff2b22a047a72daab0 SHA512 4d005e665935845424b336e6d561a3eedf38194460cd16e4db5940d8750d97b27a51fc2a077e12832b07f75a01c8dba3ff38eea84d081ed89cd99b959702545c WHIRLPOOL 4b47a76d0bea7b57558b5dd339796e80c5e67ea38de831cbd1cc011bbdf0da4086577b2d5b5471c8db04b7a51c9f40d1a351a8641ab29e2e3d5bbbf1f2e6fd10
-EBUILD nodejs-6.11.5.ebuild 6094 SHA256 7bfa8c4347e75e4d753084aa97aa9c966184312469aaaa78fbadf3ff4702babd SHA512 4a9968d5e5e2ffea375208e3b91ee972b14ffd8dcbe24b77bc86990bc8f863831d3c96de8764368d37163462009bc0ef47ac96c528f0b04cc4554fbfc59a80b2 WHIRLPOOL 874ad9b6bdda3b115170bb811ebec675f87daeeadd0812b5f0caf042570bb26b49baa77db32742a3714e5478ffebf40fa5fba4c3ac2da82f72aeb19683ce5764
+EBUILD nodejs-4.8.5.ebuild 4436 SHA256 afcc7ae2d5cb9e07ecde79c5a65366d729d8f970d3c7c44125f7a7689c6d4f20 SHA512 b02952a69db28b5146e121c445c01606c6a169c584fedf08a8c53a043c81115e812cc6e381c1cd0daf35b50c62a39b5a8b9d7f55d139cbe46e07791fb1f5e86d WHIRLPOOL db87d27bd408271ae275b87998cbec0eeac0a3fdf41aeb0fee85b978a3097e9acbbe07311a336ea0bc1cf5f866c2192f7505ebc5650e7b818de702d49082b580
+EBUILD nodejs-6.11.5.ebuild 6093 SHA256 7f354472b94d1596e929761bb25cc56d5563a16aac2e2f5fd248efbc951e01ad SHA512 b4c440d064690d4549a7ab361f778666bd512fc5667e14afca4b8d66fd108c4f48ca3022d810576d500f84f5c2daaeba3bb1502cae9b139d49a45dab6991394a WHIRLPOOL 218b383c73493cd9e8b16294f3bc43a884cbb9801b1bcc24c1676790f303afd7ca3ff97155f3bdd4a2f40737fa78319901c75b9bea8c2f91273ade51a35b6750
 EBUILD nodejs-6.9.4.ebuild 6073 SHA256 150fdc85c99024a7280f3b5c23f11c9a5c7f99ac5a075fccaa8c1dfd4f52865d SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7 WHIRLPOOL 58aabc7cc764c8a47538dff634bdb295a2c93ab646ae544cbd61fb32961a465a5da65cb9a068ff837675cd5f41ef8c769d1e06a184740e7fc86819fb4e1d1be2
-EBUILD nodejs-8.8.1.ebuild 6245 SHA256 7bb3d99a63a7847de0fe72029efc4268edffccc4e61a1399ffc0ae7a81660670 SHA512 af76765d0385310b96e5e6b9645255874d9c36be8582c83f0bf2f8be810dcf175a827ccacb1f8ad38ed4a99ed390f78c3a0996d433ccc4edc540f38de89a8984 WHIRLPOOL 416ae7ebf0fed3615d0f23e2491654962a78f9839bdcaafe2ae051fddb80ea1a4669d1ac1458bdabd23425993312bc6e8c25172a7d5b170c34732a9fe4ab8476
 EBUILD nodejs-8.9.0.ebuild 6275 SHA256 0fb5c3f0697408a8f47899989ddfae01bd92a7749045d2f722f4319a4a1949f6 SHA512 77843bffc6ba3cec789eb92c79b3563b47b2d63efb480b9ec0435decbfff4ec7e9023b0191e22576f5edc2cf4f80fe1cfeeea17246638ed526ae799d656a89ec WHIRLPOOL b39b1d58568f16cef94897007b203a6dbb35ee5f6ebfa2e6890f3c2db1408e162eb21276831edb5911730af1fb545ca7ce33206d5a1eb2a23db50ad424b5d333
 EBUILD nodejs-9.0.0.ebuild 6275 SHA256 3e5824479618160542e517bb3a5cda62a33f38db27e44330931364a70af33579 SHA512 cfc50f64b60305523f33bda6b223b9f1b1f0a07dad1c46910fa3ec7448c35ad84dd92108ddf64630665c905a910529bfd49770f9d9fb97e145d23e11d78cd34f WHIRLPOOL 0f012724e2b67cff78143368ab935adede95893a976429f22f0e8ae816587ac85f501d73f08b8b592a631c74a321fb2c54cc5eb24bda5975f0c02c508def024b
 MISC ChangeLog 16331 SHA256 16702a204cff5e2c71e5b982f323aa3aeaa29a6f3b2da7d23745b81a7f9e01bc SHA512 a98fae5176a945e301bb763d80c44c641295dabdd8cd6d8226106db206b5e3d90654f3b9d98f5adb2291218c97c1707daec05f68f5d1036edba0129c5d86169d WHIRLPOOL 7a409b0f4f81d549f26f777325c4149a645e275fd83b5128252dd27596654e6800454692664e3cf5d41030794215e8e39cbc05ff3cd6db7bd681a12a96eeffec
diff --git a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch b/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
deleted file mode 100644
index 5f5a2c7b7ff0..000000000000
--- a/net-libs/nodejs/files/nodejs-8.7.0-shared-nghttp2.patch
+++ /dev/null
@@ -1,105 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -182,6 +182,27 @@
-     dest='shared_http_parser_libpath',
-     help='a directory to search for the shared http_parser DLL')
- 
-+shared_optgroup.add_option('--shared-nghttp2',
-+    action='store_true',
-+    dest='shared_nghttp2',
-+    help='link to a shared nghttp2 DLL instead of static linking')
-+
-+shared_optgroup.add_option('--shared-nghttp2-includes',
-+    action='store',
-+    dest='shared_nghttp2_includes',
-+    help='directory containing nghttp2 header files')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libname',
-+    action='store',
-+    dest='shared_nghttp2_libname',
-+    default='nghttp2',
-+    help='alternative lib name to link to [default: %default]')
-+
-+shared_optgroup.add_option('--shared-nghttp2-libpath',
-+    action='store',
-+    dest='shared_nghttp2_libpath',
-+    help='a directory to search for the shared nghttp2 DLL')
-+
- shared_optgroup.add_option('--shared-libuv',
-     action='store_true',
-     dest='shared_libuv',
-@@ -1360,6 +1381,7 @@
- configure_node(output)
- configure_library('zlib', output)
- configure_library('http_parser', output)
-+configure_library('nghttp2', output)
- configure_library('libuv', output)
- configure_library('libcares', output)
- # stay backwards compatible with shared cares builds
---- a/node.gyp
-+++ b/node.gyp
-@@ -14,6 +14,7 @@
-     'node_module_version%': '',
-     'node_shared_zlib%': 'false',
-     'node_shared_http_parser%': 'false',
-+    'node_shared_nghttp2%': 'false',
-     'node_shared_cares%': 'false',
-     'node_shared_libuv%': 'false',
-     'node_use_openssl%': 'true',
-@@ -151,8 +152,15 @@
-       'type': '<(node_target_type)',
- 
-       'dependencies': [
--        'node_js2c#host',
--        'deps/nghttp2/nghttp2.gyp:nghttp2'
-+        'node_js2c#host'
-+      ],
-+
-+      'conditions': [
-+        [ 'node_shared_nghttp2=="false"', {
-+          'dependencies': [
-+            'deps/nghttp2/nghttp2.gyp:nghttp2'
-+          ]
-+        }]
-       ],
- 
-       'includes': [
-@@ -163,8 +171,7 @@
-         'src',
-         'tools/msvs/genfiles',
-         'deps/uv/src/ares',
--        '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h
--        'deps/nghttp2/lib/includes'
-+        '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-       ],
- 
-       'sources': [
-@@ -691,6 +696,15 @@
-                 'deps/http_parser/http_parser.gyp:http_parser'
-               ]
-             }],
-+            [ 'node_shared_nghttp2=="false"', {
-+              'dependencies': [
-+                'deps/nghttp2/nghttp2.gyp:nghttp2'
-+              ],
-+              'defines': [
-+                # We're using the nghttp2 static lib
-+                'NGHTTP2_STATICLIB'
-+              ]
-+            }],
-             [ 'node_shared_libuv=="false"', {
-               'dependencies': [
-                 'deps/uv/uv.gyp:libuv'
---- a/node.gypi
-+++ b/node.gypi
-@@ -251,6 +251,10 @@
-       'dependencies': [ 'deps/http_parser/http_parser.gyp:http_parser' ],
-     }],
- 
-+    [ 'node_shared_nghttp2=="false"', {
-+      'dependencies': [ 'deps/nghttp2/nghttp2.gyp:nghttp2' ],
-+    }],
-+
-     [ 'node_shared_cares=="false"', {
-       'dependencies': [ 'deps/cares/cares.gyp:cares' ],
-     }],
diff --git a/net-libs/nodejs/nodejs-4.8.5.ebuild b/net-libs/nodejs/nodejs-4.8.5.ebuild
index 9de641b4dac9..fe84f4a5b196 100644
--- a/net-libs/nodejs/nodejs-4.8.5.ebuild
+++ b/net-libs/nodejs/nodejs-4.8.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 x86 ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug icu +npm snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-55:= )
diff --git a/net-libs/nodejs/nodejs-6.11.5.ebuild b/net-libs/nodejs/nodejs-6.11.5.ebuild
index 67c451917337..392b16bbbbba 100644
--- a/net-libs/nodejs/nodejs-6.11.5.ebuild
+++ b/net-libs/nodejs/nodejs-6.11.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
 
 LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x64-macos"
 IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl test"
 
 RDEPEND="icu? ( >=dev-libs/icu-56:= )
diff --git a/net-libs/nodejs/nodejs-8.8.1.ebuild b/net-libs/nodejs/nodejs-8.8.1.ebuild
deleted file mode 100644
index 2739d2a8cd9c..000000000000
--- a/net-libs/nodejs/nodejs-8.8.1.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads"
-
-inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
-HOMEPAGE="https://nodejs.org/"
-SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
-
-LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
-IUSE="cpu_flags_x86_sse2 debug doc icu +npm +snapshot +ssl systemtap test"
-
-RDEPEND="icu? ( >=dev-libs/icu-56:= )
-	npm? ( ${PYTHON_DEPS} )
-	>=net-libs/http-parser-2.7.0:=
-	>=dev-libs/libuv-1.15.0:=
-	>=net-libs/nghttp2-1.25.0
-	>=dev-libs/openssl-1.0.2g:0=[-bindist]
-	sys-libs/zlib"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	systemtap? ( dev-util/systemtap )
-	test? ( net-misc/curl )"
-
-S="${WORKDIR}/node-v${PV}"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${FILESDIR}"/gentoo-global-npm-config.patch
-	"${FILESDIR}"/nodejs-8.7.0-shared-nghttp2.patch
-)
-
-pkg_pretend() {
-	(use x86 && ! use cpu_flags_x86_sse2) && \
-		die "Your CPU doesn't support the required SSE2 instruction."
-
-	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
-		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
-}
-
-src_prepare() {
-	tc-export CC CXX PKG_CONFIG
-	export V=1
-	export BUILDTYPE=Release
-
-	# fix compilation on Darwin
-	# https://code.google.com/p/gyp/issues/detail?id=260
-	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Avoid writing a depfile, not useful
-	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
-
-	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
-	# seem sandbox related either (invoking it from a sandbox works fine).
-	# The issue is that no stdin handle is openened when asked for one.
-	# It doesn't really belong upstream , so it'll just be removed until someone
-	# with more gentoo-knowledge than me (jbergstroem) figures it out.
-	rm test/parallel/test-stdout-close-unref.js || die
-
-	# debug builds. change install path, remove optimisations and override buildtype
-	if use debug; then
-		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
-		BUILDTYPE=Debug
-	fi
-
-	default
-}
-
-src_configure() {
-	local myarch=""
-	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-openssl --shared-zlib )
-	use npm || myconf+=( --without-npm )
-	use icu && myconf+=( --with-intl=system-icu )
-	use snapshot && myconf+=( --with-snapshot )
-	use ssl || myconf+=( --without-ssl )
-	use debug && myconf+=( --debug )
-
-	case ${ABI} in
-		amd64) myarch="x64";;
-		arm) myarch="arm";;
-		arm64) myarch="arm64";;
-		ppc64) myarch="ppc64";;
-		x32) myarch="x32";;
-		x86) myarch="ia32";;
-		*) myarch="${ABI}";;
-	esac
-
-	GYP_DEFINES="linux_use_gold_flags=0
-		linux_use_bundled_binutils=0
-		linux_use_bundled_gold=0" \
-	"${PYTHON}" configure \
-		--prefix="${EPREFIX}"/usr \
-		--dest-cpu=${myarch} \
-		$(use_with systemtap dtrace) \
-		"${myconf[@]}" || die
-}
-
-src_compile() {
-	emake -C out mksnapshot
-	pax-mark m "out/${BUILDTYPE}/mksnapshot"
-	emake -C out
-}
-
-src_install() {
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-	emake install DESTDIR="${D}"
-	pax-mark -m "${ED}"usr/bin/node
-
-	# set up a symlink structure that node-gyp expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	if use doc; then
-		# Patch docs to make them offline readable
-		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
-			sed -i '/fonts.googleapis.com/ d' $i;
-		done
-		# Install docs!
-		dohtml -r "${S}"/doc/*
-	fi
-
-	if use npm; then
-		dodir /etc/npm
-
-		# Install bash completion for `npm`
-		# We need to temporarily replace default config path since
-		# npm otherwise tries to write outside of the sandbox
-		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
-		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
-		local tmp_npm_completion_file="$(emktemp)"
-		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
-		newbashcomp "${tmp_npm_completion_file}" npm
-		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
-
-		# Move man pages
-		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
-
-		# Clean up
-		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
-		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
-
-		local find_exp="-or -name"
-		local find_name=()
-		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
-			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
-			"*.md" "*.markdown" "*.bat" "*.cmd"; do
-			find_name+=( ${find_exp} "${match}" )
-		done
-
-		# Remove various development and/or inappropriate files and
-		# useless docs of dependend packages.
-		find "${LIBDIR}"/node_modules \
-			\( -type d -name examples \) -or \( -type f \( \
-				-iname "LICEN?E*" \
-				"${find_name[@]}" \
-			\) \) -exec rm -rf "{}" \;
-	fi
-}
-
-src_test() {
-	out/${BUILDTYPE}/cctest || die
-	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
-}
-
-pkg_postinst() {
-	einfo "The global npm config lives in /etc/npm. This deviates slightly"
-	einfo "from upstream which otherwise would have it live in /usr/etc/."
-	einfo ""
-	einfo "Protip: When using node-gyp to install native modules, you can"
-	einfo "avoid having to download extras by doing the following:"
-	einfo "$ node-gyp --nodedir /usr/include/node <command>"
-}
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index ce9457a349dc..2f8cf5ecb273 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -12,7 +12,7 @@ DIST memcached-1.5.2.tar.gz 407715 SHA256 9ac93113bdb5d037e79c61277386564ac2e5e3
 EBUILD memcached-1.4.33.ebuild 2624 SHA256 5e8fa07f214704a05ef63385ae8a2b78920ca7aa22b994db7f370ce25876b43d SHA512 95106208e83a37e1d1f94c04cb2942194f4ed9e7f8470b831529849c3ca62b48477fc0937e87ec7cd44204d87df7672ff72e20199068d21f63b8320335e074a2 WHIRLPOOL d68b507ad7976b8b3b19de82fb4a9d13b5d35c02e0057f1ffcbbb7e616d5cbc2e8ba566ec2494c9add5e9bd44d10679c4c1850427a1bdc4bd199853495273965
 EBUILD memcached-1.4.39.ebuild 2887 SHA256 0557ddb98d86c07429a5a5b01af5eba2ea3330b5fe779917ee641157235cdaf2 SHA512 0726d795ffbaa17ed04b3b307146742bd647ab6c2084a1e0f22b333b293ac6e15a7488d69fd166f2480c49c87b236f14e7d7d7642c40fe853097347e9199e706 WHIRLPOOL 2062c9871526025fdb86633dc211f25901aefa72f9d806e58ce667274e13464bf9145cf7c172a4a4f112241363bc824586be16419d946f51411869081c5908c9
 EBUILD memcached-1.5.1.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9
-EBUILD memcached-1.5.2.ebuild 2903 SHA256 90149ac9457d7b15126a8ddd6295977c0f68ac387094fe06eaec9d0e520d1b91 SHA512 3d20f3405b30234652ea9fd75f6ae4842aac4153f4062703b6090cfb2f4691781e5a2e474cfd9b971a7ea2b2cef12cb1d12b3c9fcf18d2b5e7ba2955112085c6 WHIRLPOOL 2f346ce0fbbc02230fc854eee1d92cfc53cded2d5c3ce3aa14aeaff7c528b96583b7a3c7c69e84f7646a4db68d1c8ef21604738d2f4fa765eb2e7e213593d5d9
+EBUILD memcached-1.5.2.ebuild 2901 SHA256 f19a4c3440d85a6d41a20e86557ce46ab31d6e745e9b8dc0c372ec36b8fa3c52 SHA512 356e61df043c43ee2cae974e2955daa893eb4f060b506cbcf9c96b467264a7a44ef9f0cb3727dbe5cf7859ce20421f9af79ed87b4ad59f6f4fd0ff6251b506f6 WHIRLPOOL a32d673b71d649a349332269c5f2f86a3414ff777749380108e5fb1ed5fbfe944dde6ea37b71a337b43c5e928d8694041fa63d8ff5330a5eda9d8bc69ca1cf1e
 MISC ChangeLog 9513 SHA256 2f72df675f6c2041cda3cdb32f7a4f1314fda9417e8873fc24ab60950767e527 SHA512 9962bb124817964f19dceee258da39a00d1f95ab6929efc27d012920f1e2bdc290e5619603cceeb53d080ecf79c22ab9bc3628c923895002220e17cec357e22b WHIRLPOOL 828f0916052f66539e8b37f6c46e14064a2bab23d5066205dfed3049f695ac712d1029d401c85b68954a24f3a971369d05751d17c50564f97c71d7153966f692
 MISC ChangeLog-2015 29003 SHA256 a8e02533be3dc8071b69388e8c927edc33d54ce26b596a775f99a30698847eb4 SHA512 55fa88fdce9ff266070e8b5eab890a2418165bc6ab5c093f071acd0c3d218059d47a255281fc789c98869ac67b81aae4ae81111131d2dc5feb0457b54b6301a6 WHIRLPOOL e5fda7152db66bb75db44574d2c68f1272a4323498d25755b5a8f4b01cc684e6fd362c68c143df09b29dcbbdfb3f6fcf4b4291ac252fe28da60ebc705f194e82
 MISC metadata.xml 1134 SHA256 e189a8b1f9310663b1921d6279b993ea689153406a9058fbc977927c65e05068 SHA512 c3ce23016f9ea9067f6628f246866e3fcee6624f1a21360e448c7eebc3babd8fa3717966e58eeb0b6fd9885730609fa732a3e10b0a4dfaa57b0f0acc85c20bb4 WHIRLPOOL 9e1b630893ccee95aedb117e40d03de15605fb5085eea1bf687ca445b9972e8fc900dbed7bcf0d45bb351e3801e1849210d6517e8891bae7bf2fd004a207dc53
diff --git a/net-misc/memcached/memcached-1.5.2.ebuild b/net-misc/memcached/memcached-1.5.2.ebuild
index 9e386070af56..1bdf5b35e65f 100644
--- a/net-misc/memcached/memcached-1.5.2.ebuild
+++ b/net-misc/memcached/memcached-1.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test slabs-reassign debug sasl selinux" # hugetlbfs later
 
 RDEPEND=">=dev-libs/libevent-1.4:=
diff --git a/net-p2p/rtorrent/Manifest b/net-p2p/rtorrent/Manifest
index eb1db8798260..a2172efccaf1 100644
--- a/net-p2p/rtorrent/Manifest
+++ b/net-p2p/rtorrent/Manifest
@@ -6,7 +6,7 @@ AUX rtorrentd.conf 13 SHA256 6725e7a3ed74f1432bd6b317f2aec7f9609bc20dd81dbbfcc63
 AUX rtorrentd.init 702 SHA256 0c5999447341924265eb520ae378b5871949dbf19c70699fbbd34c2c78d18475 SHA512 6ac954e78dfa29a56ccfb53f666a96b7e93ec919b613f609ce16e312d44ab7c3adb849af826695494a92f882fb051f3e7c8a97d1b283ea9ac8673333ef8f8ab6 WHIRLPOOL 41e118f3a2825752f37af32807f4c32c79d4ac4631ceca8afa61798d104e6036aeb631e8ba7842523b4546a5ac41d61cf8b391e2db5bc0e76ba15ae532ac3982
 AUX rtorrentd_at.service 308 SHA256 f3de3506146e3dac6698028378d51a9f62a2fa8957173b250bf607bc6ceb57e8 SHA512 cc707500af2dbb0cc0c8297512807f9312445cf70de00bcf2f7267388834f1d0454eaaa9a8b52387e5f84288400286414225c55af0f560f61a8d0858971a8615 WHIRLPOOL 8060403740dec4d92c8527c1b5b5d5902fbcdb43f20d2639e3fc644bc7bbd73c890c76d1f85c3bec9ab9e8a7d5fe74e779b8bdaaa3f8a52c234e8ce4de417778
 DIST rtorrent-0.9.6.tar.gz 610845 SHA256 1e69c24f1f26f8f07d58d673480dc392bfc4317818c1115265b08a7813ff5b0e SHA512 704f7b79d5bc78b817da21a6886662a5a97fde210a110c50f708bdc18e1dcf3ef5c5f4e2740261d41221cfc69c19926bf34e10057adf10601da9e6e06b2cef75 WHIRLPOOL df5878014087d894e9796508627ec508ff5d042c78cc09e8d9ae57a7f9556bb549f9900e3995a7296420438ca0edda245907f8ae0c71d5a0ae28c3af7a6f992e
-EBUILD rtorrent-0.9.6-r1.ebuild 1666 SHA256 ef7875bc1d8c5dc34bf52c3294729030ba394664f31259a33536996cb5b392b9 SHA512 424d4be8a4e1fdda05649911df8c2f6334ac746b28124b42de2aa08ed5c0195927683fea477dc265a6098180ad0df032a5a5a05e797656cc00e195ad4fc30607 WHIRLPOOL 7849ea0aa4e083646e02eeb75dfbcd1574a7e0a0176bedf6639c225c104bf7c630a73fa28d849af6e2fd6ea8db280e13d98010ef124e4ee46160afb0e471f096
+EBUILD rtorrent-0.9.6-r1.ebuild 1664 SHA256 95ed6f8522cb26a9a8538bc73067e935e01e12b92bba6ab1ff079b5c741eb6fb SHA512 0fcf4ff972bb7da89137be847cb33f479cd7d95ec55b2d946b2deb2e82e0036b13e187cf6d90685e4bdc7a1db05937fa7ca4af7a58f6048bdc4a4a231b2935c4 WHIRLPOOL f00d077e5cacfec880854310e93258c7ba6dfd34b0293cce95a921b4318e788df8e35b6b4f37ac72d673a214e05e905a16bef7bfa9e608c4ba79b6d0dbca11f6
 EBUILD rtorrent-0.9.6.ebuild 1607 SHA256 65df8be3e41caa2916f752792b10c9e9cbe138a4ada3a31d8b65566339fcea43 SHA512 8fe7ab26bd876073b09ae926e979a32d926374a411a70753b7133731f5a381ec2577df095689fa9fc7d759792e62dae7734324e24446b3c01f4f97322f17f04b WHIRLPOOL a34343707fbf59286e33d087b23b4452106cab797a8c2371ea9c3e15de5a93a10537b7a983941db9c09c054b6e46c29c065c3840985fa723d9b2e204fa11c8b7
 MISC ChangeLog 4603 SHA256 4f54e944391ea3138ded299645d00aec5e37d4ac53d000259c72b7a66fd15e04 SHA512 7468aca2ff09fe11064213d6fd25b2946b2dcdf7fcad7cbcaa23ecbcdd2e670d83aceb80e48dcec0bfbf9c904cce3f58f88c4632a4e09458b67760927acb035c WHIRLPOOL c90988ac796a33ee5e35a81172fa8cddc1614fd2a89401c9b594dddb81efa0c75ab6919d8f8682fe6ffa531c6b98a057d1e3a9ed7644f8a3d9bb75f3e5964e7b
 MISC ChangeLog-2015 30299 SHA256 56a50fc40703456a109c21b62c768a999c8baf18684ff35658fda55e08cc2790 SHA512 661d2db8b47ec1f7463e62e412f2a9d67b01536d4401eafa77521af7805c4d3caf61249de9cee8585d0555c32dc65dd8a21127eeef8251caef3f93b8c5199785 WHIRLPOOL d6e32052df092c0ba95955c7f07f7bfb4fd39d5fbad593949c0ca69d9aa85cf676ec728c5d4745b0443fb799b1bcb2743fcda2cfc574603856f4e0b864fb8e27
diff --git a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
index 483629ab5db4..049115416efa 100644
--- a/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
+++ b/net-p2p/rtorrent/rtorrent-0.9.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://rtorrent.net/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="daemon debug ipv6 selinux test xmlrpc"
 
 COMMON_DEPEND="~net-libs/libtorrent-0.13.${PV##*.}
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 121b4078df62..f50eacb55ae9 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -66,6 +66,7 @@ app-admin/collectd -collectd_plugins_mqtt
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
+dev-db/mysql -numa
 dev-db/percona-server -numa
 
 # Brian Evans <grknight@gentoo.org> (23 Aug 2016)
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index c1f2b0728ebe..fd40be2c228c 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -40,6 +40,7 @@ app-admin/collectd collectd_plugins_mqtt
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # It's only supported on amd64, ia64, powerpc and x86
+dev-db/mysql numa
 dev-db/percona-server numa
 
 # Brian Evans <grknight@gentoo.org> (23 Aug 2016)
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index 98a61f2dfc72..24bbe3472d35 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -92,6 +92,7 @@ net-misc/networkmanager ofono
  
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
+dev-db/mysql -numa
 dev-db/percona-server -numa
 
 # Gilles Dartiguelongue <eva@gentoo.org> (23 Aug 2016)
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index 09c1767c60c6..e23ebb32a40a 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -61,6 +61,7 @@ games-emulation/dosbox glide
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
+dev-db/mysql -numa
 dev-db/percona-server -numa
 
 # Pacho Ramos <pacho@gentoo.org> (21 Aug 2016)
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index ebfbaafd0d12..530319203b6d 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -57,6 +57,7 @@ app-admin/collectd -collectd_plugins_mqtt
 
 # Thomas Deutschmann <whissi@gentoo.org> (26 Aug 2016)
 # Enable numa support on supported architectures
+dev-db/mysql -numa
 dev-db/percona-server -numa
 
 # Brian Evans <grknight@gentoo.org> (18 Aug 2016)
diff --git a/profiles/package.mask b/profiles/package.mask
index 0750c29ad9cd..7be9ab5fd82c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -473,15 +473,6 @@ dev-util/mutrace
 # to create unbootable kernel/initramfs images. Bug #622716
 =sys-kernel/genkernel-3.5.1.0
 
-# Thomas Deutschmann <whissi@gentoo.org> (17 Jun 2017)
-# Unmaintained in Gentoo repository; Multiple vulnerabilities
-# People using VMware in Gentoo should switch to Gentoo's VMware overlay
-# Bugs 619398, 621910, 616958, 536364, 614666, 612804 ...
-app-emulation/vmware-workstation
-app-emulation/vmware-player
-app-emulation/vmware-modules
-app-emulation/vmware-tools
-
 # Hans de Graaff <graaff@gentoo.org> (05 Jun 2017)
 # Bundles obsolete and vulnerable webkit version.
 # Upstream has stopped development and recommends using
diff --git a/profiles/updates/4Q-2017 b/profiles/updates/4Q-2017
index 6e0c121a8880..7f12db68bf03 100644
--- a/profiles/updates/4Q-2017
+++ b/profiles/updates/4Q-2017
@@ -2,3 +2,4 @@ move dev-ml/ocaml-dns dev-ml/dns
 move dev-perl/HTML-Format dev-perl/HTML-Formatter
 move dev-perl/MARC-XML dev-perl/MARC-File-XML
 move dev-perl/MARC-file-XML dev-perl/MARC-File-XML
+move dev-util/gogland dev-util/goland
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5be79c64d5d8..7697a5440270 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1370,6 +1370,7 @@ dev-db/mysql:latin1 - Use LATIN1 encoding instead of UTF8
 dev-db/mysql:libressl - Enable SSL connections and crypto functions using dev-libs/libressl
 dev-db/mysql:max-idx-128 - Raise the max index per table limit from 64 to 128
 dev-db/mysql:minimal - Install client programs only, no server
+dev-db/mysql:numa - Enable NUMA support using sys-process/numactl (NUMA kernel support is also required)
 dev-db/mysql:openssl - Enable SSL connections and crypto functions using dev-libs/openssl
 dev-db/mysql:profiling - Add support for statement profiling (requires USE=community).
 dev-db/mysql:server - Build the server program
@@ -1840,7 +1841,6 @@ dev-lang/ekopath:openmpi - Include pre-built OpenMPI 1.x libraries
 dev-lang/ekopath:openmpi2 - Include pre-built OpenMPI 2.x libraries
 dev-lang/erlang:compat-ethread - Enable compatibility with pre-pentium 4 CPUs in the ethread library.
 dev-lang/erlang:dirty-schedulers - Enable dirty schedulers
-dev-lang/erlang:halfword - Enable halfword emulator
 dev-lang/erlang:hipe - HIgh Performance Erlang extension
 dev-lang/erlang:kpoll - Enable kernel polling support
 dev-lang/fpc:ide - Build and install the Free Pascal Compiler IDE
@@ -2110,6 +2110,7 @@ dev-libs/libmateweather:gtk3 - Build with GTK+3 instead of GTK+2
 dev-libs/libmemcached:hsieh - Use Hsieh hash algorithm.
 dev-libs/libmemcached:libevent - Use the libevent event loop interface.
 dev-libs/libmemcached:sasl - Use sasl auth for communications.
+dev-libs/libmspack:utils - Enables building cabrip, chmextract, msexpand and oabextract
 dev-libs/libnfc:pcsc-lite - Enable NFC drivers that require pcsc-lite
 dev-libs/libnl:doc - Install development documentation
 dev-libs/libnl:python - Install experimental dev-lang/python bindings
diff --git a/sec-policy/apparmor-profiles/Manifest b/sec-policy/apparmor-profiles/Manifest
index 1858ed014205..b78a106dc9d1 100644
--- a/sec-policy/apparmor-profiles/Manifest
+++ b/sec-policy/apparmor-profiles/Manifest
@@ -1,6 +1,4 @@
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
-EBUILD apparmor-profiles-2.11.0.ebuild 636 SHA256 7c785f702bbe02ff9f6a363e5219ce9d2ecd135d3ef45b5cb15dd298b8935148 SHA512 bd564dcd1e4ba452dce4462fbd5a830286fb66e6c7798579ed4ef61fe791b96f3d5a66e8131ad778b2a73fbd5f56f8cd62b18082e6b9b807e84df7f38a86387f WHIRLPOOL da366087cb6eb00db070dc514fde8a50c183fd139998603fb6d576e446ef883585b8d3976462808fffa9bfeefd0931bfe406768cf24ca22f9c883332e0166301
 EBUILD apparmor-profiles-2.11.1.ebuild 633 SHA256 20628664d41130e791b68cbfe0c6d58d8568c76f5457552b5dbe1dde15684953 SHA512 10d4407d6b1a9c12b865313eebf8c157f30aa4f56cb46f2573415f38f8106c4e36cb1642a220885b3e1e7ad42afb83512538e8696d2fc990c55aab94b0ee3af2 WHIRLPOOL 7502940680e2a584204b3d52110c4f63aad4037e46f0cc05af4d72a39a426b91794a67381b495ed0aab9373af9a14dab9a3f4103c60185eb752992167ae8be14
 MISC ChangeLog 3436 SHA256 778c74be369268de87dafceb983f753ddca66e7e1d449fc131d22937f58f2530 SHA512 ee99039d1f82f978e660f5a0440dc6dc73339bb95e1e783f0823204a4a2f20cc85d5cf0a50e931835b7d4bb3686da570e6369a263d814d7ff3711ce147dae946 WHIRLPOOL 3dd7dc3024d388e55370e7e43bc818bc238a4e5eedee2974d97cf815d21a774fa21f4136496eb84c7e269d8e2d75f19e641772b87be11efc9198b55d05c2c1b1
 MISC ChangeLog-2015 843 SHA256 e9a9e8c4031321483cf6145811178cf6025cbbf503a120f8627c31967253a1af SHA512 7a8532080eb5db7176115d0d67ba7eb83bfc5c6c096735e1e6a44bedbf88d7b21464968cf96e930cf2619fcf1d6679a577f7a5ea56cb279594eb6721f0d9d248 WHIRLPOOL 39f76595bca61d1febf0d4db63ac8a1c30a41221c0eba9ec4fdbce774d2d2af0053582be03289b110780b083461114c27b5f4ff0dad9dca5111a5fcf1e691529
diff --git a/sec-policy/apparmor-profiles/apparmor-profiles-2.11.0.ebuild b/sec-policy/apparmor-profiles/apparmor-profiles-2.11.0.ebuild
deleted file mode 100644
index 679e65f9e729..000000000000
--- a/sec-policy/apparmor-profiles/apparmor-profiles-2.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="A collection of profiles for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="minimal"
-
-RESTRICT="test"
-
-S=${WORKDIR}/apparmor-${PV}/profiles
-
-src_install() {
-	if use minimal ; then
-		insinto /etc/apparmor.d
-		doins -r apparmor.d/{abstractions,tunables}
-	else
-		default
-	fi
-}
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 9613e0a9bbd5..74a6880405f8 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,7 +1,5 @@
 AUX apparmor-utils-2.11-shebang.patch 613 SHA256 34331002e209aaf17903bef5b8d4cb69d8dfcb37fbce8aeff6203465520e763a SHA512 6e94b4a48dee68dc2c321115744fa2ba6be33cd1f6f13cf3c97a4bb1f206d8c990e8dded7c81e8cf53107fdc2afcf208ab664f6438725d17ef652f5accb8cc76 WHIRLPOOL ab01bff5ecf10af481892590159c1cb690005c83a0b6128cd3f8980c3f048fc3a9f25cc9dbbce71b19f06ac4a7d63f35eef14e81f004a46a720fce1cc6e13537
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
-EBUILD apparmor-utils-2.11.0-r1.ebuild 2070 SHA256 c748fe5021e6c07aeeb7f32438d335fb58083ee3b487738cf1af5637f0181dbf SHA512 ecf22feb4d53df6c77989c19e15c70fbd6bc8b8415965410584de66682ca048fde5dbe2590bc929689da9105f1529917479d8fee08f6ac6064bb47094deabcd6 WHIRLPOOL 757fbb460e9c2a828d1126b43c996d85895f14d7214315f6f516c9a01108f0bfb4708801ffea36c1105f291c79c69eb9b8112e5d1502dc9e0b69e41401a017ba
 EBUILD apparmor-utils-2.11.1.ebuild 2067 SHA256 2ba90c1fea7bbc969cc58599cb6f43a4a6a4c38225096deaa4dfd114e6b6445e SHA512 ec3310c097fc265f6913e79727b4d92d4a4d669a4e72f545158b9aed10190f42a8aba25ef428a0c9678018e5e1550a49e18c8c992a5fed721380ade94e14aee8 WHIRLPOOL 08ecff599411fef02d3e2d640a0b973b49be1f5e547bd1d1a1438eb31b3e250e18c5dd8adb9caf5fcc60e56549d75583086d7ed058c9722629e837f69fcec913
 MISC ChangeLog 3592 SHA256 fc1b6f0f45401794a893a0051a09c4043925da0ac60339ea4c426e95f5972736 SHA512 979595a1ef0da2d5ae9675c6581702a055fd341b6719b1a6306dd70706ac4d14af4b1fd46528e3bb667e7f648d93a0bfe95f1ba160982b582826e0c1031c8756 WHIRLPOOL 04fd96ac8ac2db1cfabce6b2dac43066758f820aa4b00cac4731ae12321c83b7bd2632e54966c45102f49050a02f033ed5019ddb019ae2a5ccb738f81044f6df
 MISC ChangeLog-2015 1112 SHA256 d7a9ee2a4f8027c475ff1b783cc11345edc8cd4943396ae4e0fd73fe11507375 SHA512 1e85e3b7e74a3fa517ff9e0bfddbca76eb8e1676259f868998ad6249a554b668ca4e99ba7b043629450f99eba87fc28dfe65511c0b9dfed99ed54384e87999c7 WHIRLPOOL 5b6396b9ef0ab8be3dd4c4814d6070e0f928c753a691da5f90cc443e7d201b532aa30c50b2481f94861818c6126176b13b92ef0703c9e6c6c91f9c205e7cd4e8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
deleted file mode 100644
index 8d9f092107ec..000000000000
--- a/sys-apps/apparmor-utils/apparmor-utils-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit perl-module python-r1 toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-DEPEND="dev-lang/perl
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	~sys-libs/libapparmor-${PV}[perl,python]
-	~sys-apps/apparmor-${PV}
-	dev-perl/Locale-gettext
-	dev-perl/RPC-XML
-	dev-perl/TermReadKey
-	virtual/perl-Data-Dumper
-	virtual/perl-Getopt-Long"
-
-S=${WORKDIR}/apparmor-${PV}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.11-shebang.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i binutils/Makefile \
-		-e 's/Bstatic/Bdynamic/g' \
-		-e 's/EXTRA_CFLAGS = /& ${CFLAGS}/' || die
-}
-
-src_compile() {
-	python_setup
-
-	pushd utils > /dev/null || die
-	# launches non-make subprocesses causing "make jobserver unavailable"
-	# error messages to appear in generated code
-	emake -j1
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	export EXTRA_CFLAGS="${CFLAGS}"
-	emake CC="$(tc-getCC)" USE_SYSTEM=1
-	popd > /dev/null || die
-}
-
-src_install() {
-	pushd utils > /dev/null || die
-	perl_set_version
-	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
-		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
-
-	install_python() {
-		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
-			--root="${D}" --version="${PV}"
-	}
-
-	python_foreach_impl install_python
-	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
-		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
-	popd > /dev/null || die
-
-	pushd binutils > /dev/null || die
-	emake install DESTDIR="${D}" USE_SYSTEM=1
-	popd > /dev/null || die
-}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 4e86153d0a5d..93f237d06af0 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,10 +1,7 @@
-AUX apparmor-2.10-dynamic-link.patch 381 SHA256 527e91364b3482a9063a8e6802eec87c6e73fe3727960119dca6fcaa588f004d SHA512 b407e5a58ac52d6c69ddc5dd91cc1e65676fd3fbd91bd0d0591b926d6804a1d893b06bec09f2955ad77324e3177ebd05838b50b5be0eeda613378b9246ded47d WHIRLPOOL 4e746d9d43f13cbba54305479c8998a387814fac4399d01e7a5ec583a41b61db86ac3b89f13b07e6f36c9fda969db4e563a0844d597028b55749bbb98c554a7d
 AUX apparmor-2.10-makefile.patch 859 SHA256 f096dddaa00930585f50f5d0f22fb5ec1df1e3c2b91cfb9090bca2c07f15b2bd SHA512 dee07ecd82d1336692c9621688dc5bad3d17787544ff05e7a6f2d20f396071a33a093bdcc5d987f91df14af34bc8cdf3362cf38d0ce5e804afe76511d9da5eee WHIRLPOOL e92107009590906bc1cc831d6d27c47f83631186ec5c0edb1d8723c83ebf4248d2aa4795fa58da7ce79894b3d82e7625b8da9d8992c2ddd824c8cf1af7f87a1e
 AUX apparmor-2.11.1-dynamic-link.patch 391 SHA256 ae1e27145b5c5c1ee0bbefbce6417b0a388ae4f37a66ea9d646c8829b9b7460c SHA512 d0ef56293b556b0af74201321b01de5c763763ecfba8dac930f35c6f733667f148c59295c78edfab9d835893f5518a42aa38f16de7464e218fbd57727726713c WHIRLPOOL f13a1b71b14aed5c71e57e95cc81bc53399a911cd3818de082b447a268dc218a00f383c1c3818da11aa5f0542aed07df3772d9eb55c47d023e310adea1a6520d
 AUX apparmor-init 1284 SHA256 6357f9645587de19c46d824215ca4c3be99c488e8da9bd0e403b69e33ba8ed07 SHA512 4ee4747ec98a0828beb690bf5e01bc112d958bff4c68d60fc0cbb9f0707bd8daecc011dba3916aa6e6368f460eedce7f2ce42aad9ccea49a5d898dcae3d01148 WHIRLPOOL bf4da39d477c32ca5bad91ffda9938280694631cc80c4191e6ab42844b9f0e867f9c39a98a92b1a2b5a52d25c93e21142dba745026efd3e2c60ee6d8d0e61bff
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
-EBUILD apparmor-2.11.0.ebuild 1255 SHA256 c5f5110b8eee16e980c7c9a29d8e3e6802ef462ed0d649542ee1ea0ab2be4bdc SHA512 ac04e8a3b26c02a9180b237c2530dbe88d1d80c7096b53b20068a9fbfe7b431d0b4807292441d1874ae6502235659be0d033d3c5854d1df5c318ad6098595f83 WHIRLPOOL 6c8fbb727c7cacd34d4eec97cdd2b8a566245be81a51725a3af704314eeaa863809093b903a62211b7ecfaba8285406b07d380df2832c3c667541fc1bf84b53f
 EBUILD apparmor-2.11.1-r1.ebuild 1271 SHA256 e3608b3fb914afebbd2aa2986401f41c4d3b633f4ff5094103a2d9ff21ce43a9 SHA512 37183de377fd0decd3559a6da3e75c213fa9a5c5a413efa012295b7af39981dd50b7546bbfed9e4a57105c44d4a2d430925186a18b1b9c6de5fccb854d4bc0f8 WHIRLPOOL 38a36523ff818fb4e15297aee90caa3466f4c7d3fe2b08bd2e9a60bb197a74d6f624ee0ba52596c0389b62f6a31e66529b5f2aca8aac7a3369c9bdd7b67aba12
 MISC ChangeLog 3741 SHA256 e993988739c1edd3e6ad61e06dbd2dac5b0967595e44dca8d07185111b7efef0 SHA512 0d88c7d17aca58058cd07419085dd3bf45fe7738400c3ef0e6638841df198447885a17df6f279f881133945e3c2662c3186b1831dca4ddc45fc55430aa385d96 WHIRLPOOL 87421359cc81feab9dc70d519a65de5b70acf544b25c75e9c0dde7f855317e174372f4e978e10f54ee2686a4696cbd507263e16cd99443bb88e22ff8333ce2d1
 MISC ChangeLog-2015 816 SHA256 8adb7825141984a46d9827b45c51f963a65df2ff9e3c75932d8e202987a206be SHA512 9347843cd3c7414100e3efc03d4b54d37e7748a3da6b2edc8ba26d5af6c33956282a5ecb37c0c6d8f8f89477c2ec892065f93e29215da56800dc5278a64945cf WHIRLPOOL 2bb135bb2d4dd51e2a17982accda85ca30eaa00353f1239bb757f37e33172f91555508901784ff9043b8216448bbec763ab9ec84d1307a75ec613e7e3fe006f9
diff --git a/sys-apps/apparmor/apparmor-2.11.0.ebuild b/sys-apps/apparmor/apparmor-2.11.0.ebuild
deleted file mode 100644
index 99787fd94be7..000000000000
--- a/sys-apps/apparmor/apparmor-2.11.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${MY_PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc"
-
-RDEPEND="~sys-libs/libapparmor-${PV}"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-tex/latex2html )
-"
-
-S=${WORKDIR}/apparmor-${PV}/parser
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.10-makefile.patch"
-	"${FILESDIR}/${PN}-2.10-dynamic-link.patch"
-)
-
-src_prepare() {
-	default
-
-	# remove warning about missing file that controls features
-	# we don't currently support
-	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
-}
-
-src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
-	use doc && emake pdf
-}
-
-src_test() {
-	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
-}
-
-src_install() {
-	emake DESTDIR="${D}" USE_SYSTEM=1 install
-
-	dodir /etc/apparmor.d/disable
-
-	newinitd "${FILESDIR}"/${PN}-init ${PN}
-
-	use doc && dodoc techdoc.pdf
-}
diff --git a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch b/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
deleted file mode 100644
index 24263d0892b2..000000000000
--- a/sys-apps/apparmor/files/apparmor-2.10-dynamic-link.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -87,7 +87,7 @@
- AAREOBJECT = ${AAREDIR}/libapparmor_re.a
- AAREOBJECTS = $(AAREOBJECT)
- AARE_LDFLAGS = -static-libgcc -static-libstdc++ -L.
--AALIB = -Wl,-Bstatic -lapparmor -Wl,-Bdynamic -lpthread
-+AALIB = -Wl,-Bdynamic -lapparmor -Wl,-Bdynamic -lpthread
- 
- ifdef USE_SYSTEM
-   # Using the system libapparmor so Makefile dependencies can't be used
-
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index 7e155cd23dfe..c91533e59e98 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -2,7 +2,7 @@ AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968
 DIST net-tools-1.60_p20160215155418.tar.xz 227284 SHA256 9c9aee20e3b09213ab0b27c62329fafcb25e156143fc3999c16e8dcee72304b2 SHA512 3fac6e00f061daf5c9ed1c8038d14635333a6149b09ad1493db35e4f931095915ad47468c42cc10299a4df1b5c946d6609a92a00c326a50a4da166670f6608e4 WHIRLPOOL b04de5acd5cb17177d105168d8dd5d4e1cbb108d946bd656b162b11081098b9254993883088df851c3f2fc4eab2dbc18892cff96f20f1e2748663ab6f17ffac0
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 SHA256 d9b52abb6bbf3305fde1fe414059602371a7819b214206312f6b16a2fde46fcd SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01 WHIRLPOOL 413553072466cee79c1f231742d6256f97d9a9e84647ee27aed97cf01eee16fd621c67fa67523174bcc0dd0c5f6181d2f6fcc698e3268fc9996eb2cbc7db1070
 EBUILD net-tools-1.60_p20160215155418.ebuild 2479 SHA256 869b801a0a8ad090c2db68edca53ad5f0e320e26f4b8daddff3e25a1edbcff27 SHA512 da7768af74f99fa957bc459151ebedb4afa51e81ccfd15973b2e6c15d01a084c4bb079537b191fb394526ff9b550d1acb32093b5ed551055525efa0f7b23696a WHIRLPOOL e3b1849fe0ea1ba420f1f640e027bd378d3b3e048ea2d1c28dc09f505ce8e3ac7986bd5ab7103ef70fdee92d26d72899dad74cf3148b6b8af09ee283767665ec
-EBUILD net-tools-1.60_p20161110235919.ebuild 2572 SHA256 8a916b251d563084523237d688e9f8dc06003844d73a354607da8062489caea2 SHA512 e53dc7e22e05c644da793c8d50bfde63cff2a21e7fbce24ea8e57282e1acf6b7235adf68c11c27ba61e6883dd5e699310ed8befd681b19f93692a3ad04d5e041 WHIRLPOOL 87050eb9e6f3e0eae4ba2f2ff2c040745f0d99e2d4c759ea4f39db06ec6d4e8cce1049f7f29f226865cd24ea668073bd51067adf54e5cb2c4dd8c158a4d3dbe6
+EBUILD net-tools-1.60_p20161110235919.ebuild 2568 SHA256 6542d4e7c4a656f7deb7ba8cef9ec7f93d2506a512cb99d41e88a58e9900bfda SHA512 55bad71499c240de6f4b5871a3a00328efbb0edec323c53d1371551541988eecff033ae86a74ba33bc96700d5936a00d692fbd28181e6832c79bf96d2142ff5a WHIRLPOOL 00b7f82195448ceb06a88f04dc58932cf2883c8af57bfd797f1c50eaa2995d98c19db74cb7b987505562237835ba8dfffe6410caf8b4511176e761d56a9de966
 EBUILD net-tools-9999.ebuild 2492 SHA256 4fb8579e614ec23b72f43b2a79268c232121e09edfb3ddf6e8a2f7e174c34c39 SHA512 b45c414ea855d08d24bd0d0fa7ff565017e6d1581962429cb69317ccd20bd9bf821fee6ffd917c5702d5f32299e5bc86b06acacf143971b662ef84936eabe616 WHIRLPOOL 9e542ff19e5c5a23748cf892d15765b4623bd01e34e5e637df793cba4a84688dbe8b5b84f7749102aa8a9d2dbe0f2d70e7a2595a152606ab18ff4b2603ca4f5c
 MISC ChangeLog 9045 SHA256 3e2624c5a46782340f42e17453079c31876fdd4c526fb144c481d436ebbf77f7 SHA512 5f01d14852c3e87fc070d4a3601f17bd773edbfc163d5f93faf4859184f16772cb4fe8b7b64565c3c20b2719367b334ddbd3b05d0e5d87c969d847aa4d7c0516 WHIRLPOOL a28ec18d7c4b913fa43eb0e067c37c35a89115c40752d21ee5e28468a2a7a213c25ae68af134253f608af7131c81691563164294abe63be00d4c4837aac7d9a9
 MISC ChangeLog-2015 25006 SHA256 48a7f6ba1885082cc136ec093bb0fa60fdd15f750568b431008592701dd89b9e SHA512 9b862acae7f12b8197477fdfd5f18d18791a2d625f2bc9efacacd3d1dc50ce2818f4515af83f5f2a760c2829eaacf17449d8a56a5b5e85ee1a96242234d9e235 WHIRLPOOL 9a4dd77390d2dd49a004299dce7ce424cd94d6e98e7413ab4a2acec5afe9dd17ea8de02833326ec843de99f8425e5e56c26516dda7eb6438624eef9aacbfafa5
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index 58514c0f19f2..d73f899b1372 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/udevil/Manifest b/sys-apps/udevil/Manifest
index 3a303f21eac5..922a9dc166e6 100644
--- a/sys-apps/udevil/Manifest
+++ b/sys-apps/udevil/Manifest
@@ -5,7 +5,7 @@ AUX udevil-0.4.4-stat.patch 230 SHA256 7d53ad7e72e2df27a1f1255ffc7300d439fc495b6
 DIST udevil-0.4.4.tar.gz 477254 SHA256 ad2fd8375bd62622718a04235e9772119459089938dbb78e657955e595822b7c SHA512 adce4916e06d1cc4965521abbcbc2901e53930691167f431cb18e28d3ef8bde740e95a6a5f40dfc58dfd7b4b661b4475d3dd2b6174a5d7a55ae7c65629b82327 WHIRLPOOL 6bd7b5e6792e9f556113260a86f1aa29b795a0d7ddc577f86fd286d2a95515ac32e80bdfc4677a1aa59b0efcbddd8e40eec83db4e63439e8d1fead6061b64bec
 EBUILD udevil-0.4.4-r1.ebuild 1922 SHA256 05af2aa6c95b622e93df2bb2dad452cab0bded25d5592ab7955ee75b6fcc2cdd SHA512 9ccb1b2e9fd377c02cedea8ee3e8bc7ee0b0ccf1647b733d34122969d24a284e40d251c3d0e294aeab1b830589d60621e793071e46d523bfe34ef12b5deacad9 WHIRLPOOL 7ddf3dcad74f00201448e8ae5524bd937f4010dcb78434052fe14979a942a91dc4c6d21e4c1d8983ca408e3521f3f591a477520fa0b751cc20882187e2059580
 EBUILD udevil-0.4.4-r2.ebuild 1988 SHA256 f6ee9de831cb6f8235c3eeb7127f1d7039b0fd916e0cdea500ceb01d70882eae SHA512 6802bb465b172e4a42fad2366bcb4ae1ae05b0c48f772e0ca545df5ef8409ad21c1dad721a9838fea188e6ba4bb7e693d03f18fa73895d60074641ca1050ab8a WHIRLPOOL f94e9ff0a12f908ec9878fe21d3c4126e5da19513f4182ee573935919bf464a4e9c7895c681890ddaa7926f158a96bd164b02cdc911061150e28367b9ffd97c5
-EBUILD udevil-0.4.4-r3.ebuild 1991 SHA256 9d2630aa2b02b2b044520c2d1012f2e97909d69fb0e3c4197fdb616108c92772 SHA512 4a8ab23fb5bc0fb16a7d1b73e3edcb43b4f542c0029b946f7e2d35d986b98412b39b1af8c69845641f05e8e5c9bdb87cdb6d742f54b92b75f72e187d08281429 WHIRLPOOL a4391d41f99834960a02f3e81636c27cf034fc52f7346890a4c5c109218dcf0d34b903f5c27f14b9a528bc692fa36ac17555e6454836e83c32347a85c694f72a
+EBUILD udevil-0.4.4-r3.ebuild 1990 SHA256 db92d55454f0d3df2b4a3d665f181463d41d87204fac38e49acfa9ac43c9c65c SHA512 b4781c12890498449630411fb44a73a39cf275eac2c90505e9b4fcd11240e53b22e844aed244deb47b29d159bb48508311335dbb7ebcc85074ebe954762eaa3c WHIRLPOOL ab1db4be3a38528703a2fca6ab79d15a90ae419a370b1dc1fbaf120308d3548c3404944f71ab2cf3727276c7a239bec1b54f2b3ba651a62f3c5af556df49eb02
 MISC ChangeLog 3959 SHA256 aa418acf34e960d98d918762b8a55e4d9e1f44f22661b48dc436aa797021ca26 SHA512 7d02c9bc4694df61743affdff7f8161628afa7419a83085e5c61f44923ed3486cb15d4b32789a67dd4667e06b4c4731f022463f17dd77579eb3c45e12cc2e1dd WHIRLPOOL 81ae4cbeda83abded9fb344c8228d80d231b7183d767346d5c380a71ac6b4a0c7b517524ff4f32857ad1b2cdf0e2235fc7e6b9b69e4d6f28f3fbb9e7a42edc07
 MISC ChangeLog-2015 5481 SHA256 c86c51c498a065cdf33aba0962d5de945b648291970a0a6e5b9f55e3d6ac4f96 SHA512 02c89098f801288505b02525df2c7b234da43061c01dfe094055db625402511d4474d276c9005754ea2a4851b33a6982d7570a83c80fe398b431d7094afd427f WHIRLPOOL 2e26ffbb1994f1ae3b36dae8585efcc424c06ddd7a87d0da7c8e6115495528737c6c3fbf953e09c74659675d51a0dfff48a3c60e3f4dbc5ad210d2832753b816
 MISC metadata.xml 453 SHA256 c833a6570cffb4afd017770ef61616f99c4a86d5ffb86d6426fc8dcd5fe664e8 SHA512 92443a23495fc46cfba373d4e712d2e530080b68e4ebceff8cec159d71bf581eb3ea66c1c85134f4edcce3740a22d7eb00d9c5339efa6445318bf2f98028d78a WHIRLPOOL cb33dcf0cebb2cf16160bbcad9a04ea6a1402f3fb54aa6a8c10376415cdd3627cf08f508edce8cdee851393395ca3af87a34b8e5e80dd7b575d37e7d17d75a2c
diff --git a/sys-apps/udevil/udevil-0.4.4-r3.ebuild b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
index d3d8bdc8ddaa..b59ad33132fd 100644
--- a/sys-apps/udevil/udevil-0.4.4-r3.ebuild
+++ b/sys-apps/udevil/udevil-0.4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/IgnorantGuru/udevil/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND=">=app-shells/bash-4.0:*
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index 6aa074c03c54..f750f8b2d1d4 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,10 +1,6 @@
-DIST yarn-v0.27.5.tar.gz 816114 SHA256 f0f3510246ee74eb660ea06930dcded7b684eac2593aa979a7add84b72517968 SHA512 a21615f3bf4996d6e2dc84b54c3e9ca8a58143941a80771121f6eb6f5dcf8fd655e1c9b9420e7a0ab3a7c26ecd6bdd3790451d76435d7e3d6fbb5ba8ac729dbd WHIRLPOOL e21887c715c72c490c58817ca0a6542899f4036ccd81fedfab4f751b13eca6196f82236d206f7a58d550e78f0bff4dac08fbfc44f287e2463ad119042b98a83b
-DIST yarn-v1.0.1.tar.gz 843398 SHA256 6b00b5e0a7074a512d39d2d91ba6262dde911d452617939ca4be4a700dd77cf1 SHA512 3d22bb7a7b32cff26bb7053a12e21fdabf4a2ff198e7164e034fd5e0b6a5760e0def19bcc6592f7df850108a3bf36d60a9337f1dc56a35ed72c98b14c0af95fb WHIRLPOOL 99826575498c7944ddf07c61c3bac5b7163c4fbe65f8196502b7322cc5978b1988ae524a4d2ae4ab69c78d5773d4bb66598fb1495394e139e7f72e3c2a32fe8c
-DIST yarn-v1.0.2.tar.gz 843696 SHA256 8a31f8fa50ab6d5f8852025fb0ea4a50f2f8b82792f060fa99de0acc370b0698 SHA512 21b24f4633517f001f0cf2529d67316b5a1aded787c6516504b0f7b89fec991c3f17f7a098590bcfcea88a5d9831121079facca2237c678495bd2124cdf07dad WHIRLPOOL 12dca2a10b2e946bf0587ac41254b86813a49ca9025e11d4939851de5da9178c5e9c7603711e7b876dea3f3aa01c2068f7c9df5142f8bb7117cbe9535842031d
 DIST yarn-v1.1.0.tar.gz 874168 SHA256 171c1f9ee93c488c0d774ac6e9c72649047c3f896277d88d0f805266519430f3 SHA512 7ce740ac47d8ba42c47d0262979fcd1d22daede2a298e1743341c52584bee7d4beca8758c118deccaefd9cb0bc2780a37e110ae3633af56ac6916ae0389eadf6 WHIRLPOOL 21fabd1824fc7bf3ef3cf4ac64103e19f97c547f968aa0220371ca0ddb3cba71e034cd6143047ac85fa8c8ff1d39c3364e7bf3de57f9628af244d9c8723a7498
-EBUILD yarn-0.27.5.ebuild 835 SHA256 101f221f5d8613dea088fec8790cb00ed312e1eb9b89e5625e1bf3c622efae3c SHA512 77b5aad546e5360d72c137ab356a20a51f43bf1b014bb315b81a4b09fc296eade7b3e871ddba371a3234d31c3b736ca3c2e5fec3a95da44e39ce45d5425cbc78 WHIRLPOOL d13f41aa657c47ce301595c609206e5083283caca0cde421c60e445db60f78d021334cc039a9d6f6028352aef74465c8c54728524da1bc5affa45953ecc9eaaf
-EBUILD yarn-1.0.1.ebuild 841 SHA256 c31c4b8ecdf31512767377f786363066c026966b60c04c7fdaca66431ca8416b SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5 WHIRLPOOL 3d899e46a31b59e476d8c40424049a50ebb8181131917bbee7929967d42b7d83e0445251cf0dcc58610ead0bd40c310d9c6c068db9b7762ef8e7b3172dc25201
-EBUILD yarn-1.0.2.ebuild 841 SHA256 c31c4b8ecdf31512767377f786363066c026966b60c04c7fdaca66431ca8416b SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5 WHIRLPOOL 3d899e46a31b59e476d8c40424049a50ebb8181131917bbee7929967d42b7d83e0445251cf0dcc58610ead0bd40c310d9c6c068db9b7762ef8e7b3172dc25201
+DIST yarn-v1.2.1.tar.gz 885691 SHA256 f8ed07675c3a0b866e11a02af5c15d2f34c3aa261ab1501943ecee328786c959 SHA512 cb61788e16cd3537073b3a8711ce6a29f7e14380cea20ca16144e97ed05ec62c685b805a18af9e70d16f7aedb4c460cad97027e37fb43596f97570386d596477 WHIRLPOOL c435a313d8701ab75e0945314dd96fd591e623078fc541e3ddbd44710e941c3fa1b7b9381489590955bdb32f715ccd21275d05e083b5d9d332122df7eb3a799e
 EBUILD yarn-1.1.0.ebuild 841 SHA256 c31c4b8ecdf31512767377f786363066c026966b60c04c7fdaca66431ca8416b SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5 WHIRLPOOL 3d899e46a31b59e476d8c40424049a50ebb8181131917bbee7929967d42b7d83e0445251cf0dcc58610ead0bd40c310d9c6c068db9b7762ef8e7b3172dc25201
+EBUILD yarn-1.2.1.ebuild 841 SHA256 c31c4b8ecdf31512767377f786363066c026966b60c04c7fdaca66431ca8416b SHA512 89b39480a4b8a24f7a1fe3a6231b25d9b5d70b21c2e8d3d4aab95581b9906b6e6be1aac50b4cf3914995f5e2c27482f40c56eade9cbb3efc59b24a5e899c86f5 WHIRLPOOL 3d899e46a31b59e476d8c40424049a50ebb8181131917bbee7929967d42b7d83e0445251cf0dcc58610ead0bd40c310d9c6c068db9b7762ef8e7b3172dc25201
 MISC ChangeLog 623 SHA256 cbca76454ad138533b7a87a50f03dbc06cd62b3d7d9361369c334c15b8f12a13 SHA512 57af4eb3b80a33408699ec59b3aeb5588c0e662035ad2d1ceefe2970b725c0d2ff8e61ea3a24e4298739bff64d988c694ffa3b0bad0b5b758216997669a334ed WHIRLPOOL 3b2c2e0da5c3f711d9833b6201b721783845d974cca843113b9a05083d41c5b1bce65dbc04287fa16a0c915e6756538154b44adb9ad147b8ff75d12bf0d0a689
 MISC metadata.xml 249 SHA256 23d2c373be07d71afb1a2c75f5ec9631d4779a020d6fd2a7c5c11431d175292e SHA512 d406f99c7fb4c5839522e07fbee81cf55330fc0c4ba6fff5281179f2ea7c21048e7cbd5563665b9a458f8b5a9724dd1fb9ac8641e2bb192f1514358902560f73 WHIRLPOOL 68a9fc21435a1948e13369c6a5312664bc9020aca52ec7108272be6d8ccd8bdb4bd00775b3d47311ea15a0adb4befd896ad8c8d23bfd4ebb91877b3df997bfed
diff --git a/sys-apps/yarn/yarn-0.27.5.ebuild b/sys-apps/yarn/yarn-0.27.5.ebuild
deleted file mode 100644
index 631ba960a315..000000000000
--- a/sys-apps/yarn/yarn-0.27.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/dist"
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	fperms a+x "${install_dir}/bin/yarn.js"
-	while read -r -d '' path; do
-		[[ $(head -n1 "${path}") == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0)
-}
diff --git a/sys-apps/yarn/yarn-1.0.2.ebuild b/sys-apps/yarn/yarn-1.0.2.ebuild
deleted file mode 100644
index f028ad115d08..000000000000
--- a/sys-apps/yarn/yarn-1.0.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/yarn-v${PV}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-v${PV}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	fperms a+x "${install_dir}/bin/yarn.js"
-	while read -r -d '' path; do
-		[[ $(head -n1 "${path}") == \#\!* ]] || continue
-		chmod +x "${path}" || die #614094
-	done < <(find "${ED}" -type f -print0)
-}
diff --git a/sys-apps/yarn/yarn-1.0.1.ebuild b/sys-apps/yarn/yarn-1.2.1.ebuild
index f028ad115d08..f028ad115d08 100644
--- a/sys-apps/yarn/yarn-1.0.1.ebuild
+++ b/sys-apps/yarn/yarn-1.2.1.ebuild
diff --git a/sys-devel/qconf/Manifest b/sys-devel/qconf/Manifest
index 56b70a4c8b7a..5e8e50c4f4ff 100644
--- a/sys-devel/qconf/Manifest
+++ b/sys-devel/qconf/Manifest
@@ -1,6 +1,4 @@
-DIST qconf-2.0.tar.bz2 50507 SHA256 772022c9757530c192d3bb1d31c4d6076b3464a8395dc06d3019923c44f999f2 SHA512 8820dfe191149b8bf7aa2cd631a6c4900b821c30817c6bffcf79734271c47165daceef11507690d495881c8dc8d19f8dec441c7adeb2a3e36b355b66b4f5c43a WHIRLPOOL facc512a3df046e131825a45afc928b76d8c87446b8d4161695165e6551cebfb586497b2cad3c69a9a75afa0791b9c915e6f7019ead9925d867c01d7bd573f09
 DIST qconf-2.3.tar.xz 51848 SHA256 d189dcf5589fe7d8ca53b963ba8bd33b91c4a75d1e7d863544174e6b7d69f581 SHA512 27a532cb52067707a3e04a40260bb0f42e40adff4a643d2f048832356de58271e4051c9cb810e6fffd4b4e45dba483ed65aec062506053caa262ac03b3ec6253 WHIRLPOOL 6fc386321d4a9bbb12254d427355feaadc90c4b66dfdd0d69a635c15ed72c481aede18c506b9b15260de448931bbbbec6c3a59d374c49491e997d6f52a33ea62
-EBUILD qconf-2.0.ebuild 1054 SHA256 de51390d5dfdad3aa5882a465d9ae8e6507951a4b0300093dae5636ebb2a3fad SHA512 b89239c2fb93bcda916005260b99a7d51b195ce57019a719235aab3310c5fc6240c59421be432987bcf851b979275ca99e53679005292aebb796fd76600d0d85 WHIRLPOOL a33d1f51635f5611a862c1d019ff259fd29561d95e6c7134bec33ee4c5ddfa47b43f9b49a2e529790468c8c13adc8c7fb5079da62ce2d0053563eb43926bd571
 EBUILD qconf-2.3.ebuild 826 SHA256 72cdb9ed9d19f9f28a919d1659c4312f0f515114d7701f1c4e336817a532480c SHA512 89193bfa9148fa6532ee3dfb8038089213a17e791755dcb9d8dc8f5accc88562d08d414acf0c5db3f276cf20bb2d7c41d82ac23a154e9c72019e313affadaa77 WHIRLPOOL a45f2df9db0126ab48d843906b4c0200e7d7512a342549f68d5a40be10c7748a8f7211de88799092101d85f0bd2f5a97a04e7370c6cf9eb8d7e789d076ebea49
 MISC ChangeLog 2634 SHA256 bbe3f98df9430d39a94d48af9794490e8b5663ffed4092d7fdeb2e0d4b4bb3ae SHA512 78bdc5e1bf259f416cb7f1e6669225b90c2707383b5e0d665950c0783c348599a1aa8c77febcfb194c1264f87568c68138906331081e59da89c282010316944d WHIRLPOOL 6ea5342e8f36542d2a2d7e6648ac0df9a849190ff603861d01ac944c2dcbc81089891c95f9e5ed0fc5849022ab003fb394f434397cb338cf0573bc49c8355cf0
 MISC ChangeLog-2015 2733 SHA256 72774813246201b18625b7947300174e92e3e4718a0b4746773ca02be7bc893a SHA512 3a4d6f2d3d231a069f97cfd34cb78989eae3e41cfd9259994062f802298d560805e987a7d3e9338283e8d485bde736da864de95bb9699779d34b178026ea11c9 WHIRLPOOL 61188a83eadb098c815aafd8bf31aa2b8e146459567acaf078d79cedcb455b477c53591b0c2a90416b58ea8c2bebde1775f23ca54c6befcc3bd28a1175ae676b
diff --git a/sys-devel/qconf/qconf-2.0.ebuild b/sys-devel/qconf/qconf-2.0.ebuild
deleted file mode 100644
index 2ffe7495fd26..000000000000
--- a/sys-devel/qconf/qconf-2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="./configure like generator for qmake-based projects"
-HOMEPAGE="http://delta.affinix.com/qconf/"
-SRC_URI="http://delta.affinix.com/download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="+qt4 qt5"
-
-RDEPEND="
-	qt4? ( dev-qt/qtcore:4 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtxml:5
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( AUTHORS README.md TODO )
-
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
-src_configure() {
-	# Fake ./configure. Fails on unknown options
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		$(use qt4 && echo "--qtdir=$(qt4_get_libdir)") \
-		$(use qt5 && echo "--qtdir=$(qt5_get_libdir)/qt5") \
-		--extraconf=QMAKE_STRIP= \
-		--verbose || die
-
-	[ ! -f Makefile ] && die "Makefile generation failure"
-
-	use qt4 && eqmake4
-	use qt5 && eqmake5
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install
-	einstalldocs
-	insinto /usr/share/doc/${PF}
-	doins -r examples
-}
diff --git a/sys-kernel/aufs-sources/Manifest b/sys-kernel/aufs-sources/Manifest
index 663f37158237..4985bf7f0b7f 100644
--- a/sys-kernel/aufs-sources/Manifest
+++ b/sys-kernel/aufs-sources/Manifest
@@ -3,10 +3,13 @@ AUX README.gentoo-r1 913 SHA256 4a5a46a50a473c73ba56ee24760eb0d32fe7f8c71e1ddcbf
 DIST aufs-sources-4.12_p20170925.tar.xz 180468 SHA256 e02115928ec0571e03f55a3ff57c367220ab1c6720870860029f9064eb9cc82e SHA512 d9c15393744b2e2d01555940b8be81905ecc00b690c0f3e309735b9b69fdc4032f2815379597bcecd419f731229befc6463ecce0ef211fbdef6986b7d7722782 WHIRLPOOL 4832b20bf144e0f90132c658d1a41b2396637b05bb5e181af2499fb61375701075e720d113cd261e1d5b205dc1dc739166bcdabcb2f868ccdc443187bd0252c0
 DIST aufs-sources-4.13_p20170925.tar.xz 180440 SHA256 9f6a2ef32d0670f3e0002872486adddf7a3f3ed5bb6e62a1addb84ac97358591 SHA512 83272afac48a163467299498712341875040cd6b4788ff4f9b89eb45ff07b9e73f72772a8b179b09da0dbc8a6c10ea2eba706f428cf03e6e214b91a9711cc49c WHIRLPOOL fdc2baf3ccba8a3d4e107a8b99a40848cb01ff61899537eed609c720ff2287e35ceceba3203fbd6d688c0dc8fed89f73dd6295e19c26d6042729ab9fefb5033b
 DIST aufs-sources-4.13_p20171002.tar.xz 180448 SHA256 6d950b11af80c3f87cbea2684f9884b83664a3d11c5142a0baebbbdce6bfd2b8 SHA512 0557cd49d759bdde8b846a8d2f6459d7015e17f79f289dbb82a0c788e56933a81ef00fe56610e17d3041a5b02fcb6290ae43942e173df4e94482cd5d549530c2 WHIRLPOOL 75bc259126b0e25b334efced43077148d9ea1b8d607d19638ceeee1f4bf805c0a11af3ec87c1a1880c436c885385234f68dca621d133c5d4bbef44975c0615db
+DIST aufs-sources-4.13_p20171030.tar.xz 181416 SHA256 7a7a55a5c7edcdfa89d65facf7776b1accbd19bd4a6137837313341c28422278 SHA512 2d10a4e190c7a0bab9fde23fe93614bdd0c8113f0848054b3690888a41f39cbbfc835ecac39cc79141070021895265bee874405f87097dc9caaaea1ec2c45fcc WHIRLPOOL b7cc5e69afd328cb9f962d34e3bb079ebf6b38b75640e4bc3109bbb6f8540836a7123a6dd2097514bea36d5a642f116b0b51e5b44aaed4164041b30af2149bd1
 DIST aufs-sources-4.4_p20170925.tar.xz 171260 SHA256 7b48764f00046a32c900a4c3feecfa7a9c87f26eec3d8c0bcefffe667ea41e4b SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8 WHIRLPOOL 7f1c79ce272216bb19987aa653874bca37fd39a131d482ac40a739a83db49bf79ff94b1d1c16db4b8c7f1af3034dc0451f7cd9e4d2f90f8a4a5f9897e5a69a3a
 DIST aufs-sources-4.4_p20171002.tar.xz 171260 SHA256 7b48764f00046a32c900a4c3feecfa7a9c87f26eec3d8c0bcefffe667ea41e4b SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8 WHIRLPOOL 7f1c79ce272216bb19987aa653874bca37fd39a131d482ac40a739a83db49bf79ff94b1d1c16db4b8c7f1af3034dc0451f7cd9e4d2f90f8a4a5f9897e5a69a3a
+DIST aufs-sources-4.4_p20171030.tar.xz 171260 SHA256 7b48764f00046a32c900a4c3feecfa7a9c87f26eec3d8c0bcefffe667ea41e4b SHA512 97aed8053f003156bac862af5037844554e65948abc13ab10371eb4e37ace25b22f5787f9bb3d444e60cb598aaa416c22222b12198d8842072407aa5f97bb3a8 WHIRLPOOL 7f1c79ce272216bb19987aa653874bca37fd39a131d482ac40a739a83db49bf79ff94b1d1c16db4b8c7f1af3034dc0451f7cd9e4d2f90f8a4a5f9897e5a69a3a
 DIST aufs-sources-4.9_p20170925.tar.xz 180584 SHA256 a26b314e1f84a849a67bb35b0f46796d77f95eb2aa9c9363feda41a0c4eb5808 SHA512 06d8db9f115fbf89f5bd8f47ff5ef3b0643b7a5d925d82a113c203272d234b9261a214e4eb9ea4fd083c9cf5d6a8bb64e37a7d4b1c47e1e636f6e56eeebe863f WHIRLPOOL cb305effeb391750ab615fa80c6b840c178deb2798d616bd0f1d7621766e73d05b2a3dcc830fdcf8316a51ea4bbae8c4f0ac80f03f0241b4696467f8d1c6aab6
 DIST aufs-sources-4.9_p20171002.tar.xz 180576 SHA256 fc8b7e2c09d738a2606365ce46098e91b6afd5d24214b85b76b3087675a08365 SHA512 a9b3bae581b900e7b16e27b5a33c930835f9924c2af0f8d0c02ce55ac635e990671df87f7d2dba10402e965835b9ecfbd0bae155d17aaac0b440873ea30ec541 WHIRLPOOL a78d2bbd817ba09171dd023583e42028814ec08bf256f1e8a9f41e56ab1f5636f5f0826aef9f016481fb4e6e51a7da45e2a9b9a0e3cea87392430833849a24f6
+DIST aufs-sources-4.9_p20171030.tar.xz 180656 SHA256 b1e56823e0eed435dc44fefe0a1cd256208df3870ea0d8fd132bcda02f07a7d7 SHA512 934756ed0d6030853e7fcd2f3458936ed25829dc1f882b7bd3bdf308dadf1d33135411dec438f1515372838300f1acef53f46b2e2c39228df7c6429f27270a9a WHIRLPOOL 03b94101b3638c7ab07e0f295cfb0f3d49d41e2a4bd2f8a84070ddf0050ae83d068520ec51d94b6cc5c4a89cbd9e8b9625d8f1ccda8d642890cce5f51ab6bd28
 DIST genpatches-4.12-13.base.tar.xz 227724 SHA256 3267458204389194a541fe3b887b3f42ea143f2f0eb6d7e7196eaf07ab32cd83 SHA512 6088bbe9b0007715e146917cb4288df69ee0d6a4e5628db90005c68d025bd12e304dd9e00e51a5a1a6844ed06a09571e9faec494257fd2aa3d6abc3bc9838000 WHIRLPOOL 87a4ec363cc74a12b76211f89db421062ae16ad453816384ef47782d3cd1dc609d103ab8746f7a5f41851355bc300931a4815bf33f42290eaad8c23c5c97f3d3
 DIST genpatches-4.12-13.experimental.tar.xz 5188 SHA256 93fee6ffdc200c451bbe3a8c96feb343819390171d7d11d0559bd7c2eb24f6c1 SHA512 80adbc13d7478b5c55b0b6380ffb1ba42cc10de8eb996db0457a1df6677e401d612f74ab756a9bab83b99f857af323d9d7fa6c36ace9aa0950671e1843c84777 WHIRLPOOL 43a63c45959046f616619cfcce36c398e55a2aca8c58d744f2a2fbd1123964a5d3d32905878a63e929ba7b73527753e305a1b52e9ba7af66247b714472e6734e
 DIST genpatches-4.12-13.extras.tar.xz 17352 SHA256 89e50dd5fdfe8736684b8b9da3980ef29865c28bdb2f9a86a91b5d90c4c7d3de SHA512 2f7f76e090926cff4c2980215a51cc745d8aa14a9153a8cd6170fee94e21d1b31beae0209d23963c7cc71bbcd0dbc6789e4b3eb0d8c6a0184c128a54bef44bdd WHIRLPOOL bdc6b2b96d38c8d34d384d75d1e95a988fa091295afad6242509ac56cc998784746e2e5e9571a7e2667173d45f9facc1ec498966a3f19c1ce4cd0a6e3c8b80a0
@@ -25,6 +28,9 @@ DIST genpatches-4.13-11.extras.tar.xz 17404 SHA256 75d973ece33bfb4cecf0a32282712
 DIST genpatches-4.13-12.base.tar.xz 219808 SHA256 45c1632713fa9bce7d457adb77605f24b4fc8e53c9173832f43c054595d35884 SHA512 65e1f5bebf942d73719becc60d0c46171176cf34e036374b44232e1de645205aebbb1da90d9e82699bb65dc69b78dbc5b76d39d8a041397c2508471fddd20b6e WHIRLPOOL 3e9b13e9830e99b94653d039337cc8f8cc462c8d526cd98cb70fe350fd5aa2b742c15bb2558e5e084d657cfc7273aa602bf61b60230a76e88891c41595b79e6a
 DIST genpatches-4.13-12.experimental.tar.xz 5184 SHA256 abb4c385b9e5fa8d239533c02cc797ea3bbde6eac88494baff2a429ca51f8710 SHA512 2d23dbdb14ec619aecc6ae854aeaa8094a689a17a9453383f27b57b226bf23121574c41dafa3ad7744011000bc990c92f4f65a323d38a89675777fbb61083c31 WHIRLPOOL eb9cebd6aab7f4fabff4ba8f24545f381d1468f6b995a6829d679fa88a8f9a2c4a451e803274777601efb7d8d823b97ab991ceb64ebdcd70b2630a2d80ad64d6
 DIST genpatches-4.13-12.extras.tar.xz 17412 SHA256 1570e22b14044fd5227d2bb9c632ea5ef07304636784939c3806e0e9eefded2e SHA512 d348bb190a41526ae88cd82d2f77f0ce2bb50f9a8332daca92e09de078f70db6b906f4380f7ef85b807dc5a6cf34da0bff7afbbb68de3e483a5f26de352348d8 WHIRLPOOL a53f00874064289dce27591e3580dc0ceaad0dc52fd65b0237861254c8b016b82479dd8e3478a97baea8fc365b82fde34e89b7c7553ba19e553d0398d02367a6
+DIST genpatches-4.13-13.base.tar.xz 232160 SHA256 11bd5bf67ca6b3aa92075e66c9642016e348b22949dd2f0195487863c48fe65d SHA512 02ed31fd0fedf1c312ac12a016946746df549e30c16040ab860a91041872addb0cd33e6b845fb37af179b30c9e50a090e4091d2b48eee1b61cb935fd593c1108 WHIRLPOOL c32be054cb97df1151db90fcc8cece47e6c0c5e506e37237acbceed567f9859bc34a7d734c5660c78884bfd6cb5468856700ef3adf7f7d4d145b97bde2d049a1
+DIST genpatches-4.13-13.experimental.tar.xz 5184 SHA256 6734f0f0fdf33b648f7af28252e17b72e9345a483ef0714fa45e192cb33e2b7c SHA512 c220d229f4dffaf7bf09b9d4cb1a73d61b7646191d715098e5eb51808c66d38827729edcc9999f1252d7b1bfaaed7d2d2566add7b6cbadad1db246379334dee1 WHIRLPOOL 307fe32b1492096547eca0af6de818d81724ee58f2594d4c537b1a6bf797ef45b96a51a25b5e92d279e78398f5104bb28bb20a2c2980bab779e5f292017de246
+DIST genpatches-4.13-13.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0fc3d9c83b8c40d992f6381ac3d4523d0287 SHA512 67a4cf48502378663c5277e5d6c2d98d195d7f7b3a7fe0e79a5118c7e910e19c9882807cd7d80f73c08f28d702b83e4af9248597af751dc3cf923eee40a5c0ab WHIRLPOOL 8aa276bb0617a876fea012e15ee8e1877ae6921b386e846c60881410ff565960e9c5b82e88e62e39c85439a79bf1561e2834912358f754a274870e224381ce8d
 DIST genpatches-4.13-3.base.tar.xz 22596 SHA256 112866c090fd45e88c7274c9e477baea9470267a394b5ec1b35d0fecba920612 SHA512 245f6ca8de42ce57ca1316cd30f7bee1417ef15c9e0b8c21fd318d34b226e9ed18cf856695b9ed05ee1ece178bfa81015ff61c573709271c8da7d8072ec7ae12 WHIRLPOOL 2afa998f2d1bf69efd7c18656b475b7fd9466f3fbf1ead806817005f96269a540fbbe6e4b82aeb5513653587fc1760fb3fff0528e514e3f4a6620d219e2747b6
 DIST genpatches-4.13-3.experimental.tar.xz 5184 SHA256 ced2ae1d1a9720e9ba35baef2a598c74470af66168b5d052854753c21d1ef287 SHA512 0ebe570f17c83d9179de527fe8710d7f664d4fb56c7843eb83173886a83b374ef633f3848386f8ffa5e498cb9f0510a4afcc6336e54105bc96271aeb9b0570fb WHIRLPOOL f3996bc58a7fa1ccb856ef2ea8b27035fdd4bdcc6aa52a0b1a3f8774769e95043f7af902d23fbebd7b35c69a0065ee3329363716b4ced157b9749cbfba396070
 DIST genpatches-4.13-3.extras.tar.xz 17408 SHA256 c9ad579a61c6f6950f404ca5717b1e3cca83383fb138594e708723a49474cfc4 SHA512 07543aaccc8d3c8e004d6bc30c551238ffae73a67f025a6a69e1dd7d9840a1023cf8a2c753ca49d296ff0b0f2937ff43c826e3341e5b35fa274e1d02a48af57a WHIRLPOOL 8432644e63e667340c47c20efaca6142c82e69a964cae3dee7644c3598e97b6b0cd0a4d8710b0478275dfb0391441c01608f5f30b6a6de493e807fa5b3650873
@@ -46,6 +52,9 @@ DIST genpatches-4.13-8.extras.tar.xz 17400 SHA256 9653d6207d975592974ea62b9d84d4
 DIST genpatches-4.13-9.base.tar.xz 171724 SHA256 72ac770acf46e87d762d9a45a1cac88fdd8a77c5856e04482e63b8b758c53636 SHA512 5c0f9bf950828b1c846abc2067b993982eb50be381e0498c712ace8e1e306ae1c3dcd47109def7ae83de8feaadc0601e43764de1de81f59138bc28b1ef992921 WHIRLPOOL feb9e7d51ddf74392c62c2a31b56d638a6aaa3b6b7b7ae243348b1ad6e0f83ed1842e221fabd469b09802f5d51c957231c923058a21644f249f61ec144a2774b
 DIST genpatches-4.13-9.experimental.tar.xz 5184 SHA256 83f753d1627b8e0a6fa5486f74db730f50820efc21fd81824786967c62c51da6 SHA512 35f050d00b497e624ec0538eb555680681b70a5cb8d6a43652cf254af0602ebd34f49c124a0af6779af6b47af61f6a400386fd4ccd0aa6b11a575842e9baaf8c WHIRLPOOL 0bf30768875a3fa32703a375273c446cf4476de69bf610508428aeeccb50571432d5e6884d6dbdf0d99ba9a388491f78f6cb002b03caaa1a30ce7a9f6df397b5
 DIST genpatches-4.13-9.extras.tar.xz 17404 SHA256 ced99b570b13dfe785c606851ac9b7aa2cd51b3d2f3fbec690e47a460979b912 SHA512 e07bd0bdf1c2944fa8ca2023add499a9b5d4cf2621e9a9a445e051e29dc9aed757c5935c772cface6ed5b0e2fcf99b933f1213fb2c6390c31740575e2a6c8df5 WHIRLPOOL 4e9c40adc134f6e5aa9e63aefcaa9e751503dacf178c6d198c86aaacb20f0017c9718f4c2bbb29d0a362066f05c64eeb346933fdb20d63ecd81b320102bf4f4f
+DIST genpatches-4.4-100.base.tar.xz 1513104 SHA256 46ccb979e540dcb77f7af38d07c5f66a396a128f74c4af38aa7dc43e86ce2c48 SHA512 75324834165e3493387e635918cb81d73d27b3274cc6826557df548f7f84a0aab456faf1b60e1e4bf35d8ae5fef00d1bdb4298f43208440c0422e006a3b248ef WHIRLPOOL 1db08d1b79e29854e830ac9e4b167cf076620a9da8db8c3b0ae18679cab90fd3333b43b1479f68372b04daf4acefb6dbd2c97fc65f660ae9c685d617ab5b8576
+DIST genpatches-4.4-100.experimental.tar.xz 87748 SHA256 c0d5113ebed9c284738d8999e48734f2834f42d8583ff86899f82014bf4c69f2 SHA512 822c943f114c35a8caeea20ee5f6c56d67f0d1122ca9db8f3bd9f34561735b0eaa72f9be7161b55c390ab5adf967ee64540a81a042746e39c6d294158cfd52b9 WHIRLPOOL 27fd96867ba9dad975cc401737d979867582742bd68cd14c24edae86ceb155d2d9db72c5fcc61964b48fb1c6c44f9652709ca6963cf705435b3e8ff88c6feb95
+DIST genpatches-4.4-100.extras.tar.xz 16464 SHA256 68ddbd5cbab566284824a0458e40982c467aee31bc84bc7107ad95de97971bf1 SHA512 b9ae815130b993cd2723ba54c41aa62b04e8e373b4b26f63ad0c511c445eaa1af71e7d63f0eaecd23b6ded8589b65b4e9da0dd62349a0b8b836b15b01a4e523b WHIRLPOOL 6e9b183367a2327a957130b83cea4cd8b4f1faf01e12eed927c2ea7463d72533c275e6ec7f20c73813c4b2649e0a4b050187416fc019e8842d9c42677a94826b
 DIST genpatches-4.4-91.base.tar.xz 1428436 SHA256 d6c806bd868856a9021b35d0bc3ced37029c8803846d6b251fe7fefadfe46c69 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554 WHIRLPOOL 8de12e7bdba76256e8fc41738605bbe961fa3fa0ccbe1fccaf0c8cb3708c692bb65a27db7675e42ce5558a22c81b9017742b14d6776ee2b93f4d1d92535942a9
 DIST genpatches-4.4-91.experimental.tar.xz 87760 SHA256 e04a99c94b4dd9f5856dd08ed4b286b19c765d8d0fe40237dce256f7c874dbf8 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f WHIRLPOOL fb6306af0191198d466b3349c348139342a70de118bcce0563e3209a7ead8a9d56291f3a4155ba4a4d211db8fc1e20ddec3a3b463d62fff5375df823646f7b02
 DIST genpatches-4.4-91.extras.tar.xz 16468 SHA256 6cc85cbae6d2ccf087104b5f719abf10d186d3b630572caeb1906c344c66de76 SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d WHIRLPOOL 81f8fa1676856f0941bc6d09e7e602d2213740bed6edc914d9341bad590650d5a5249fd8bbd2d640380a638ce2a12fd4ec66e0c3753c8d9d22c1fa2c3f07aacb
@@ -100,6 +109,9 @@ DIST genpatches-4.9-60.extras.tar.xz 17352 SHA256 24fc73022cb7989f7b7bb70bd6e0c4
 DIST genpatches-4.9-61.base.tar.xz 1158552 SHA256 2fc651e767d18fdf19e83109afafac16f18a5a76e2cbc131e32a8229b3198436 SHA512 dac7ef5bac6a116c813e614861be3304fb21d5fc004fb6e8d1cb7f05cfc7c4384dfafc8d8482efa737d4cbaaf110701a1c8ed23116aaac394b7ae3a38ac7c785 WHIRLPOOL 2c800f9ceb1b25bb646e283d67fbe6af7e7f98105e4f94a0ff7ae8e0ae31a7c85bd1eedb74ea8cf02d477e9096cbca1056ae55a7f06ae6188b960535b61d6f02
 DIST genpatches-4.9-61.experimental.tar.xz 106392 SHA256 fe6c42d115c1779f39fa83dffec51a1fb0815fa48ce797e3d1b78c7f488bd468 SHA512 5dc9e00964aa44a782dffb447b13fca58f234627882cef0009c53f747bf633ec9138462cf58b12f288545e2af5a33cfb2adec49b3cd1a0da96d7967e1eeb116f WHIRLPOOL 7c320f2ed66305128ed59ea05572fb1774b858ea8fb6553ec1a067219ef89256c9a8bf98bb25a4d53ab18fb00a83b916690fd8c0d0981a41dab1f817d987ce55
 DIST genpatches-4.9-61.extras.tar.xz 17352 SHA256 b26741cd2078757609ea6952467a56e0fdba6db3e70fe72cbd0b252d42d4d94f SHA512 b1acc2fe16a07d8927f5b2c21f982fde4dda608d9e80db8cd6c60739887d84a86792d39f8975920276987880ab344a58ef493816061f926c27cd7b059bcf5552 WHIRLPOOL 5fe700e29e3467900197b27d2e6e875d07cb10ad355ce73bcf2d74a5860444860cf53f4a924f2ecd31383faffd914a1e4b33acf5a2941a391c8ea3d55403126f
+DIST genpatches-4.9-62.base.tar.xz 1165604 SHA256 206dca947b813757514e5ab63f10a5884554b53359a81a82920f033970c66841 SHA512 6fec6da3e943b18235427d1df588aa3ffd5337c3239d1525f8cbb812ae2f250ba1b358b29ff80d08cc6f8f44e554e9c88c0500594a65f24ea6abce47f136a26b WHIRLPOOL 2403a6c1fc6a19ecfd646007a7ad364689d8e471eca1c7b5627d145525d933eb6e875487aacf002f66c80e96610697078b2022455a8331558387acc331195a79
+DIST genpatches-4.9-62.experimental.tar.xz 106392 SHA256 480a7000d530b36a4b3801b36c0037f7a2d68cbcd7b531a47575fa652f9a08af SHA512 c1134056fa2be38f70e6fc3315fc7ba396d36f03d6cc3a58b453558b242dd1902fad06dbe64454fba1f25d3bd4c856c76cb74d525b016f276e990704e6a80ace WHIRLPOOL 0f6b3fa4d221b97c8bcd4812fb4dc3133caee99da86bba3c24980235931fa3a3958d13a2def4f7378157c931302d53a46eb2a585cdeaf6e112ba1af373fb1dd4
+DIST genpatches-4.9-62.extras.tar.xz 17356 SHA256 6a9eb1e797afee5006c2d11435f9b066515b0a0be8190869d3318e4dea4b9c15 SHA512 0e37dcdb94a7c1cc9f55de24c90eb07f2c6c5c63044d68f862e3562913bc53cd0882d8ef48e164eab5c3e201d5e9cb50145f38f59729bad9ed79f9a8b3a8bbbb WHIRLPOOL b68e9412f072729ce7009972e7d3f2a7b8015cc6051acd5926a6779f2203858862ce30feaaa936048eeccfb0059fc9d0b1b62d74a81b396bbb81cbbc0ab10cc9
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
 DIST linux-4.4.tar.xz 87295988 SHA256 401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2 SHA512 13c8459933a8b80608e226a1398e3d1848352ace84bcfb7e6a4a33cb230bbe1ab719d4b58e067283df91ce5311be6d2d595fc8c19e2ae6ecc652499415614b3e WHIRLPOOL 02abc203d867404b9934aaa4c1e5b5dcbb0b0021e91a03f3a7e7fd224eed106821d8b4949f32a590536db150e5a88c16fcde88538777a26d0c17900f0257b1bc
@@ -109,6 +121,7 @@ EBUILD aufs-sources-4.12.13.ebuild 2236 SHA256 da73aa2c010195ac068facd0ff7cccb86
 EBUILD aufs-sources-4.12.14.ebuild 2236 SHA256 36161bc119555e132c44a01e31e091431783f630fdbed9806a85f88dff5c5840 SHA512 0b1771c7d0151706b40c5b4f2ce11e65bc099e539464a26c413ce847f7334baa01d3bc40cb899c3f3c33538dda0d82e5cfebfcc7103ccf02cbb0c13473202b83 WHIRLPOOL 206db3fa058641127a7a1db710fba4748fa6d6172a6b8081b35d279abd2ccf23f80c9c8bbad8fa71a49c905def63a9f76d5eea76a77a39a5ba56978ac5f4883d
 EBUILD aufs-sources-4.13.1-r1.ebuild 2235 SHA256 aa2741dac403d8a192fd0d65ba79b8c99c127dd6dc0648eb3a52d2a89fb31029 SHA512 a73c7fffc938954b2587b95336eb77c5c0588f1475f79bcf97cdea4ff30d3e4d44fed0fd62be4691eecef5742dc3b4de3825249ec93bfbd85a23d748fe08e3ed WHIRLPOOL 6ec2f324c3858e3c198260e7d7b59fc0ff55f402467423f1554bf7c0e3afe401a24f19da27b6c81431328600b3458b09d9b92c6ebfba46ccbf8f053533c23c49
 EBUILD aufs-sources-4.13.10.ebuild 2236 SHA256 b252b842e544e12e9ed7397749bbfd9ffb9ebb400a088aefacbaea32ac599cc6 SHA512 4e32787fcea7ee20aaddd042d26c80bfd692968d025592455e823c3589df25b6800718870aab13e4e8a699377854f300db7d0a393ec94e69b82a56d7def93f72 WHIRLPOOL 5b186ecf2e427009282cf4fd933b17ac282c81026158f5c6aacc1bd39dc58ada858ab1aea298b6b7d5e9bb256263ee351e23b842ee82fda96fe24bbfe1ee5523
+EBUILD aufs-sources-4.13.11.ebuild 2236 SHA256 c6dfd95924466897d3ff5c925e8faafb9c21d95d327105e9b6647e7168623188 SHA512 82aa95fe4fe950f644af037a12a9e05a5a21804356996839ea83e570454e704ab35a781ad3309494fc65a4beb51780210df8e309583edefb81c4b154b56f1de5 WHIRLPOOL e295b42e7d95468b9ac883567a56fc6e171ddf95fd6d03df8bef8b2c0ddc7554e2a2e18c5f6fc66638fc86d091ff70d3ac496c4f4dac601deae661e0669a91a4
 EBUILD aufs-sources-4.13.2.ebuild 2235 SHA256 e8fd071d195bc29ad1b0c764c5f9b38a81245f09cdc2fd9573f5597e75bdf02d SHA512 1948301e8d879816b00a559ceeb5084d5415c8561d89f98a55fa07b0fa00e4f99b725ac4d77c056b40668153f19922f600a10f929d92c64c2cfe22eb441b5e0f WHIRLPOOL c1a4d2507044fceb8f1e2cd0ebff4a969083dc112fee6198d4910dd2db23370f4e7d0af73a20e5aea0c7818356c3ff6552a264018535ff72106941eeec87e9cb
 EBUILD aufs-sources-4.13.3.ebuild 2235 SHA256 ef12091e6ddd79fb9654580c6d335befca1ac24319b445cd2de5d056214f87f0 SHA512 57ad1dce7b518772026ee0f3931cdcab609042bc2b6a41b1fd68f8c484a2d52a0c061e6796fdd0f55257e744eec3920c82088a0c5eb175e78e6413a2cfbc26ac WHIRLPOOL 4ee8dee143dc849bca600b51ef05bf0f05aa7cee7d907ecffe630fa4766476f5e3d25525aba16c8e296357082588644259b9dd8f2328fc183bad8109b56518ef
 EBUILD aufs-sources-4.13.4.ebuild 2235 SHA256 8b38d35f6b65f884cab835665a43dd1a07b3dab76f9731de8be2f4ffccfc35b3 SHA512 31b5e438d28b64bff7e343688ba36ca244ec08746542420ad37ed61a2d0d073e4aec921830fb48da593f384f2d50976a62c397ed634222bf3b9cd0032312a52c WHIRLPOOL a19319c15f214964fc849a791e41483cf285d926f4004014b8ba469eb906ff5b53ada2d267ce9186edcdfdd62d29d84f1b1f6d806798689b263ed77020a523a8
@@ -126,6 +139,7 @@ EBUILD aufs-sources-4.4.92.ebuild 2235 SHA256 1c36c7d4390dd5226b1e8001651a1d1098
 EBUILD aufs-sources-4.4.93.ebuild 2235 SHA256 d6380fc00aa249cf191dbdc766624b91941a267599ca97b9eddbf7af175441d8 SHA512 ddf2b23e7f81ff0ce0d2ac84a0aabe9620f71dfde263dd1397e423c31109e703a0fea3364bf92f0988cf869589b6c4b4d360aa49516d25060bd0cd0c4e937d0d WHIRLPOOL be82f193c52c3a39c6767b020b7d6cb035809a39060ac05a777e4a188d6c452f6f8f4de9a513c423f02f6ac8f0c3b5a5e0c983b2bed81890d5518ab1e7e555b8
 EBUILD aufs-sources-4.4.94.ebuild 2235 SHA256 660827005c8622603eaac002fae396ca71c1ad096505fc5fcb353272f8441b63 SHA512 f507bd54099ce2891bfb858e6378892ed306a5f009722ee7934e1852bd85e0498532bf1c23c2be6fb026e5aaf463db2e62aa5d411edb3d14a0be843eaeb2137a WHIRLPOOL 6cb03f60b9bf5ff3cd62d65c7dbbeee6732e4432bb9cb8315e5e84122c9596ead382178b55b0d1f2217a38fe35784d4a4467e6d9909b9b7e02fcbc5c1d59ff4e
 EBUILD aufs-sources-4.4.95.ebuild 2235 SHA256 b06d745a6302656fb352ae984d55ebe6acda1f20f0a852670b885b177bcf033a SHA512 0472fbd4acbd67243d4a59bfbf2706d174c3446a8f741c92a98af3ad1808ad7b4252a5924743876ca0e7e9a004bb81e92307d6e4f4b33e15602c629247ff6e8d WHIRLPOOL 6b9babebb14eae0bb1ba5a5834b2d0fcf20a3bd728959732be151ec93e07d719b9e402d5c9dae441381be5895f2047b5cbc14f430d0cfb42af5f0a98a0c89278
+EBUILD aufs-sources-4.4.96.ebuild 2236 SHA256 6e047ec8e7559c6dd2a53a0cb75e337e2c8bb7fd29f4e1e167c85ebb8a4add22 SHA512 0d8d9ddd1ec9e8d556d2db96007ad119ae0abb77dd439c0b6a3e84b0e0e98bca44fb0a2cea6fe00f7f9a8b44a6a603a03fe0e213d2cd9c6c51235406e21fd3b5 WHIRLPOOL 5fbeaaccf9921a2eea4a7fc65f315cab0f66bcc4d654706792d92cb23a1bd12d665cdb476eaf42a086b04dd182a3e4a382b4eace35e66a0433bdb5857d98852b
 EBUILD aufs-sources-4.9.49-r1.ebuild 2235 SHA256 1fdabe87b20c5104ecd0a70a3717863daaaec5314c0e3f679123ab1feea29625 SHA512 f2968a9900eae2f9ae3309b726810ec9441348e0b40abcaf0b817145707f737cad8a34127c4628d06424863fec1d13b1ebe0285fad492c683a26d1f5502ca8c0 WHIRLPOOL 028d7b564b0a06ad1a900a350eff8ba25929ea79e537ddfd675fa821d73c4f125d078c3ae80fa5ef8ddaf403c4bed022a2e94159624ea04849d3c078c32baefe
 EBUILD aufs-sources-4.9.50.ebuild 2235 SHA256 f8d71b8c1ef2c41f9706aa2fb7b054f052ebddca089961665bab231dd104bf98 SHA512 85847ee51eadd704e7ecd7228e0c9d98020729bfd939edc0befb13b018171b86af280e5a9deda192676e65e48b9a19a6665a22c47774042cc1d6505ad7b840df WHIRLPOOL bb2bd5904c1faa09ca5925baef7ee339a764ca939a20690e20797233a727c727bbb0ff180b2290ded838803cf4d75bd4b7fcc64c1c25a2635de2deb084090cdb
 EBUILD aufs-sources-4.9.51.ebuild 2235 SHA256 0beee6d75c8f7484c9e37edb08a1ec418aad5e6858c4ebc85a71495dde4783cf SHA512 bcc32349a4579dee23d3d8427832dafc77c103a8fb22f9581f842a3b170f5a28c78120f1ce56518eeb668479517e019ce19c9735a575c0272446293ae27cf0dd WHIRLPOOL fb08eee9a24e41639fee277624cf563ec512a691d436ab5e1f475021478b42273b2c9d991ac8083dd27a3c3fe3407d1cffd212d5eb4c74c5a152b245579ed980
@@ -135,6 +149,7 @@ EBUILD aufs-sources-4.9.56.ebuild 2235 SHA256 9588da49911e4f8b393fdeecb0fd44ccde
 EBUILD aufs-sources-4.9.57.ebuild 2235 SHA256 ad602f2c91da43a83b544c4672242d3fe6f9b3da61a448cb410431fc3e726c13 SHA512 1db7529cc5d56203c307e3c14d9797d0d205fd546b8a2d374ca8bc96e41f62f9569a27f7452effc0a6d84411310a2c51ae3939141a2ae3456eb9b55c5606bc97 WHIRLPOOL a1632ed91539b3bd8097526509a5b24785a772c91e08cc4ebde52e76f51aa478538a8f02a1eeee31435f1555a8800511da9421b06f4dc16c99df15b938eb68e8
 EBUILD aufs-sources-4.9.58.ebuild 2235 SHA256 1fbd54c79e3447ed9730233cde45dd738779a5b74d931262835d7b27a258450c SHA512 eb9d8d383b53a40e14f1da3a13464d52a1d86595f095040d619eeb244b477f1e3abbc50e30d6c4d1ada7caa942de0e29a85dc6083af8839d96b5f824b554156c WHIRLPOOL c8d48e48b29d5744d14ad846eb8fd2ee8192d04a384fee74e084226e56d42e6943c4dc4b10780e0834ed0e58d7e04e3eca76bf2bbbe2e0c309032eb402a5acea
 EBUILD aufs-sources-4.9.59.ebuild 2235 SHA256 0e971c79ac22274e680785112676c14e15b152e6bf6e20a3a2633991b929ad65 SHA512 55f370f3ae501265348167b0c812363da3780d2df7083405b3c3deb987774b75ae1d05fd3c07ef39648d29194e95ec896700643bfebc2abb67d9a56a7c5521a8 WHIRLPOOL 5acc9c402879ca029180f981851f7327fedb86085f0924dc13cfca363f68e158baa39372590f9a2ed7455e569ac915353e220b294a708e5ead68da0c35c72021
+EBUILD aufs-sources-4.9.60.ebuild 2235 SHA256 e62888f49cd4e8b5e66dcc53a2662c936b419eaa771dec3fb8e512f5dc893943 SHA512 8a8870e478879fcd624b9d7a234878cbef6f36ef3ae0a171fa43d3d2bb6a91169649e23337001db7474f79e43289be4a7409b3a8c0785da7ac5ceacb9f252977 WHIRLPOOL 76841581fac652b1adb918ff186ee8aa32249be990621473ed7a05f81c9cb3c0aea1760b3e9d40f6adc6e1d2b59f21a9b0bbef6b6d4d54fcf523208bf867899a
 MISC ChangeLog 22242 SHA256 f82cfee9cea2fe42cda38b43410eefd727dc68a1b03bfa83bcca6ee7f53f6fc1 SHA512 08e13df93a331b205a1fe6541484dbc0e1fe7fcb9317945d65b1e78e54efd6d8d1469733af4b29759b54b786fb18daf976b1cfa45c7171f3c24705d538a1ec6b WHIRLPOOL 0dac0da02a1501e2c200d52726bb7c3c70f6b02c43679ab70079be8063f0a8e1c49ea38ef171e54342e76963814381fb3d5c705c181f3c718a4228a69d797333
 MISC ChangeLog-2015 50675 SHA256 526e7bca65edf8f620189e8285d6f6cfcc7ec2633651e348669e77f102035a7b SHA512 cba4676e581d900f479f7e473c6da83a95595411c02553dfea23101ebae1fc88ad61046236acb29ee69428e567f99ef829b06629a17f3d5d1af23071ca48294a WHIRLPOOL ec59c7c4a025bc56b19aa074ebe52213afadfc4d0d4e71e89d5ba3aaf30a62f8fc5042571c65f4fda9c74729a217507f4dd922fa85d416cb6c5133df44d7522f
 MISC metadata.xml 808 SHA256 14e73735003711f0e49a31899869dffd127d7ecdfef551eb9a736d3f02b7e5bd SHA512 8a4a692c3c34672363c1f0021e300409be9ce7b829e966c9f508acaeaddb3719fa862a341153d457f8531ffbd502056dd54affbe3d3ed2f654c628a31735ea2d WHIRLPOOL a14387394df569fc7f129545d051c7b1389e84ac9c66de21b76ae8da3b2a0a7e6bf28ebbcf62573dd6499cc020517dc7d44c811dfff5b2fb67285feb3ae96d69
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
new file mode 100644
index 000000000000..4ed2e322586c
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.13.11.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=13
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.13_p20171030
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
new file mode 100644
index 000000000000..62b9291318bf
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.4.96.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=100
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.4_p20171030
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild b/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
new file mode 100644
index 000000000000..187771acc432
--- /dev/null
+++ b/sys-kernel/aufs-sources/aufs-sources-4.9.60.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER=62
+UNIPATCH_STRICTORDER=1
+inherit kernel-2 eutils readme.gentoo-r1
+
+AUFS_VERSION=4.9_p20171030
+AUFS_TARBALL="aufs-sources-${AUFS_VERSION}.tar.xz"
+# git archive -v --remote=git://git.code.sf.net/p/aufs/aufs4-standalone aufs${AUFS_VERSION/_p*} > aufs-sources-${AUFS_VERSION}.tar
+AUFS_URI="https://dev.gentoo.org/~jlec/distfiles/${AUFS_TARBALL}"
+
+KEYWORDS="~amd64 ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches http://aufs.sourceforge.net/"
+IUSE="experimental module vanilla"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the linux kernel tree and aufs4 support"
+SRC_URI="
+	${KERNEL_URI}
+	${ARCH_URI}
+	${AUFS_URI}
+	!vanilla? ( ${GENPATCHES_URI} )
+	"
+
+PDEPEND="=sys-fs/aufs-util-4*"
+
+README_GENTOO_SUFFIX="-r1"
+
+src_unpack() {
+	detect_version
+	detect_arch
+	if use vanilla; then
+		unset UNIPATCH_LIST_GENPATCHES UNIPATCH_LIST_DEFAULT
+		ewarn "You are using USE=vanilla"
+		ewarn "This will drop all support from the gentoo kernel security team"
+	fi
+
+	UNIPATCH_LIST="
+		"${WORKDIR}"/aufs4-kbuild.patch
+		"${WORKDIR}"/aufs4-base.patch
+		"${WORKDIR}"/aufs4-mmap.patch"
+
+	use module && UNIPATCH_LIST+=" "${WORKDIR}"/aufs4-standalone.patch"
+
+	unpack ${AUFS_TARBALL}
+
+	einfo "Using aufs4 version: ${AUFS_VERSION}"
+
+	kernel-2_src_unpack
+}
+
+src_prepare() {
+	kernel-2_src_prepare
+	if ! use module; then
+		sed -e 's:tristate:bool:g' -i "${WORKDIR}"/fs/aufs/Kconfig || die
+	fi
+	cp -f "${WORKDIR}"/include/uapi/linux/aufs_type.h include/uapi/linux/aufs_type.h || die
+	cp -rf "${WORKDIR}"/{Documentation,fs} . || die
+}
+
+src_install() {
+	kernel-2_src_install
+	dodoc "${WORKDIR}"/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	docompress -x /usr/share/doc/${PF}/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+	has_version sys-fs/aufs-util || \
+		elog "In order to use aufs FS you need to install sys-fs/aufs-util"
+
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 603e0aed7659..4d1fac243291 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -17,6 +17,9 @@ DIST genpatches-4.13-11.extras.tar.xz 17404 SHA256 75d973ece33bfb4cecf0a32282712
 DIST genpatches-4.13-12.base.tar.xz 219808 SHA256 45c1632713fa9bce7d457adb77605f24b4fc8e53c9173832f43c054595d35884 SHA512 65e1f5bebf942d73719becc60d0c46171176cf34e036374b44232e1de645205aebbb1da90d9e82699bb65dc69b78dbc5b76d39d8a041397c2508471fddd20b6e WHIRLPOOL 3e9b13e9830e99b94653d039337cc8f8cc462c8d526cd98cb70fe350fd5aa2b742c15bb2558e5e084d657cfc7273aa602bf61b60230a76e88891c41595b79e6a
 DIST genpatches-4.13-12.experimental.tar.xz 5184 SHA256 abb4c385b9e5fa8d239533c02cc797ea3bbde6eac88494baff2a429ca51f8710 SHA512 2d23dbdb14ec619aecc6ae854aeaa8094a689a17a9453383f27b57b226bf23121574c41dafa3ad7744011000bc990c92f4f65a323d38a89675777fbb61083c31 WHIRLPOOL eb9cebd6aab7f4fabff4ba8f24545f381d1468f6b995a6829d679fa88a8f9a2c4a451e803274777601efb7d8d823b97ab991ceb64ebdcd70b2630a2d80ad64d6
 DIST genpatches-4.13-12.extras.tar.xz 17412 SHA256 1570e22b14044fd5227d2bb9c632ea5ef07304636784939c3806e0e9eefded2e SHA512 d348bb190a41526ae88cd82d2f77f0ce2bb50f9a8332daca92e09de078f70db6b906f4380f7ef85b807dc5a6cf34da0bff7afbbb68de3e483a5f26de352348d8 WHIRLPOOL a53f00874064289dce27591e3580dc0ceaad0dc52fd65b0237861254c8b016b82479dd8e3478a97baea8fc365b82fde34e89b7c7553ba19e553d0398d02367a6
+DIST genpatches-4.13-13.base.tar.xz 232160 SHA256 11bd5bf67ca6b3aa92075e66c9642016e348b22949dd2f0195487863c48fe65d SHA512 02ed31fd0fedf1c312ac12a016946746df549e30c16040ab860a91041872addb0cd33e6b845fb37af179b30c9e50a090e4091d2b48eee1b61cb935fd593c1108 WHIRLPOOL c32be054cb97df1151db90fcc8cece47e6c0c5e506e37237acbceed567f9859bc34a7d734c5660c78884bfd6cb5468856700ef3adf7f7d4d145b97bde2d049a1
+DIST genpatches-4.13-13.experimental.tar.xz 5184 SHA256 6734f0f0fdf33b648f7af28252e17b72e9345a483ef0714fa45e192cb33e2b7c SHA512 c220d229f4dffaf7bf09b9d4cb1a73d61b7646191d715098e5eb51808c66d38827729edcc9999f1252d7b1bfaaed7d2d2566add7b6cbadad1db246379334dee1 WHIRLPOOL 307fe32b1492096547eca0af6de818d81724ee58f2594d4c537b1a6bf797ef45b96a51a25b5e92d279e78398f5104bb28bb20a2c2980bab779e5f292017de246
+DIST genpatches-4.13-13.extras.tar.xz 17396 SHA256 dc3c9d2b5c8c5f95af5e3da9463e0fc3d9c83b8c40d992f6381ac3d4523d0287 SHA512 67a4cf48502378663c5277e5d6c2d98d195d7f7b3a7fe0e79a5118c7e910e19c9882807cd7d80f73c08f28d702b83e4af9248597af751dc3cf923eee40a5c0ab WHIRLPOOL 8aa276bb0617a876fea012e15ee8e1877ae6921b386e846c60881410ff565960e9c5b82e88e62e39c85439a79bf1561e2834912358f754a274870e224381ce8d
 DIST genpatches-4.9-54.base.tar.xz 1053504 SHA256 ad6728a6e84a45aa9a84215f72ba1daed8c9681b61d9470b0fed24c285aec82a SHA512 3e64d39f3d7d0c1d68cca6b27df1e374970f0b42f47ff6bc900a1a12d1305093efafdccc28a1ba89404397ad285298058e882329f651e8d1031ddc86dbf06c40 WHIRLPOOL 7c22db4217a2604a05e8f4a9817fceabf865b00c7c33df95cfc5a09af6ffa84d809930c221f55cb9b500cc8d57b2e43f70f80e622a19fb73e0d068f2ec2be18d
 DIST genpatches-4.9-54.experimental.tar.xz 106360 SHA256 9c5b4ec4005bf50556163cebe4a4e577cffc3ed0ab06a40cd79bc7e9e33a964d SHA512 ace1650a90d70f1ab6d938d2509c44ff1911178161bfa6f060f5eb078b9c83d031709dc483f3481afc82c34b705cd9dd653c95c9b53817c79b0e632f970dad10 WHIRLPOOL 50c40e6160a92d98e568b3d55b336c4400cb8faff7fcfa5c71a8172e5149468b0483874c8531270f6f15b48f84fb3c47dee8ec01870c3331a150226c748b16ac
 DIST genpatches-4.9-54.extras.tar.xz 17356 SHA256 70314b113191df3bcf461537c5c5789ce990311affcb41e9d00b4a4d1f674659 SHA512 894f37761c80304fd12e20d9b2a11a56475484dd2a4504f4aada6b48854e752228256d56dfc328c7633996a16f4653af0105698b6a230619d9a3364b9d08a265 WHIRLPOOL 3fddbc03354fcb2b3c72caa7462a36d16a0595304da2ff9df0614925e252e3c15c38138b4f07789333c118dde992569c7cbbeb019b5052bc0ff18e87fb08cf6b
@@ -41,6 +44,9 @@ DIST genpatches-4.9-60.extras.tar.xz 17352 SHA256 24fc73022cb7989f7b7bb70bd6e0c4
 DIST genpatches-4.9-61.base.tar.xz 1158552 SHA256 2fc651e767d18fdf19e83109afafac16f18a5a76e2cbc131e32a8229b3198436 SHA512 dac7ef5bac6a116c813e614861be3304fb21d5fc004fb6e8d1cb7f05cfc7c4384dfafc8d8482efa737d4cbaaf110701a1c8ed23116aaac394b7ae3a38ac7c785 WHIRLPOOL 2c800f9ceb1b25bb646e283d67fbe6af7e7f98105e4f94a0ff7ae8e0ae31a7c85bd1eedb74ea8cf02d477e9096cbca1056ae55a7f06ae6188b960535b61d6f02
 DIST genpatches-4.9-61.experimental.tar.xz 106392 SHA256 fe6c42d115c1779f39fa83dffec51a1fb0815fa48ce797e3d1b78c7f488bd468 SHA512 5dc9e00964aa44a782dffb447b13fca58f234627882cef0009c53f747bf633ec9138462cf58b12f288545e2af5a33cfb2adec49b3cd1a0da96d7967e1eeb116f WHIRLPOOL 7c320f2ed66305128ed59ea05572fb1774b858ea8fb6553ec1a067219ef89256c9a8bf98bb25a4d53ab18fb00a83b916690fd8c0d0981a41dab1f817d987ce55
 DIST genpatches-4.9-61.extras.tar.xz 17352 SHA256 b26741cd2078757609ea6952467a56e0fdba6db3e70fe72cbd0b252d42d4d94f SHA512 b1acc2fe16a07d8927f5b2c21f982fde4dda608d9e80db8cd6c60739887d84a86792d39f8975920276987880ab344a58ef493816061f926c27cd7b059bcf5552 WHIRLPOOL 5fe700e29e3467900197b27d2e6e875d07cb10ad355ce73bcf2d74a5860444860cf53f4a924f2ecd31383faffd914a1e4b33acf5a2941a391c8ea3d55403126f
+DIST genpatches-4.9-62.base.tar.xz 1165604 SHA256 206dca947b813757514e5ab63f10a5884554b53359a81a82920f033970c66841 SHA512 6fec6da3e943b18235427d1df588aa3ffd5337c3239d1525f8cbb812ae2f250ba1b358b29ff80d08cc6f8f44e554e9c88c0500594a65f24ea6abce47f136a26b WHIRLPOOL 2403a6c1fc6a19ecfd646007a7ad364689d8e471eca1c7b5627d145525d933eb6e875487aacf002f66c80e96610697078b2022455a8331558387acc331195a79
+DIST genpatches-4.9-62.experimental.tar.xz 106392 SHA256 480a7000d530b36a4b3801b36c0037f7a2d68cbcd7b531a47575fa652f9a08af SHA512 c1134056fa2be38f70e6fc3315fc7ba396d36f03d6cc3a58b453558b242dd1902fad06dbe64454fba1f25d3bd4c856c76cb74d525b016f276e990704e6a80ace WHIRLPOOL 0f6b3fa4d221b97c8bcd4812fb4dc3133caee99da86bba3c24980235931fa3a3958d13a2def4f7378157c931302d53a46eb2a585cdeaf6e112ba1af373fb1dd4
+DIST genpatches-4.9-62.extras.tar.xz 17356 SHA256 6a9eb1e797afee5006c2d11435f9b066515b0a0be8190869d3318e4dea4b9c15 SHA512 0e37dcdb94a7c1cc9f55de24c90eb07f2c6c5c63044d68f862e3562913bc53cd0882d8ef48e164eab5c3e201d5e9cb50145f38f59729bad9ed79f9a8b3a8bbbb WHIRLPOOL b68e9412f072729ce7009972e7d3f2a7b8015cc6051acd5926a6779f2203858862ce30feaaa936048eeccfb0059fc9d0b1b62d74a81b396bbb81cbbc0ab10cc9
 DIST linux-4.12.tar.xz 99186576 SHA256 a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728 WHIRLPOOL 3b97da251c2ba4ace4a27b708f2b1dcf94cb1b59aaeded6acb74bd98f0d3e33f1df83670665e4186d99a55daa84c88d539d93e20f0ff18a6d46ef326c48dd375
 DIST linux-4.13.tar.xz 100579888 SHA256 2db3d6066c3ad93eb25b973a3d2951e022a7e975ee2fa7cbe5bddf84d9a49a2c SHA512 a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2 WHIRLPOOL d3d332e02cd3c5056c76c28cf1f81504c6f7b8f2caed7238e7dd7866747fb03154b88d8d7aec4d0eddf5760624bc7d6c5485fb52a3e32d098a2742eba96c0d05
 DIST linux-4.9.tar.xz 93192404 SHA256 029098dcffab74875e086ae970e3828456838da6e0ba22ce3f64ef764f3d7f1a SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a WHIRLPOOL 072505b29972ad120eb25a074217847c9c2813416c4903e605a0433574f5f87616dbea0b1454e4b19acc48107f11274b682958b1d773373156e99f8163e6606a
@@ -49,6 +55,7 @@ DIST patch-4.13-ck1.xz 84208 SHA256 a44bf7af8cec88aeb1159ecb4a0395bc214eb98fe6c0
 DIST patch-4.9-ck1.xz 165624 SHA256 5b9d8f4ef73f87e8595de66ccc38bad86e290fd9453bd536b9cc950f5344b82d SHA512 335f83b8f77c4c2c304db74268eae895ec53611b2cb5ed45a9c6e7f9c7ac37c2eba7cc714d49504ae29cc44c448aa873b52eb332fe91d4e6dbbdd2a175aab252 WHIRLPOOL fdf01a45ad028095d0c91105975724bf19eeb2ddd380f20465357748d3f4a22d73de9fc408473d9d1fb988a6956edcebd0269ff105d3392a82b96e48566aeea5
 EBUILD ck-sources-4.12.14.ebuild 1625 SHA256 5ec6b0191d3e183813fa3a89f22806865a8d8a721a2d6ee7d2a81f57d2f13506 SHA512 dcbd2fc096d8bb3379b7122a50a2f0dc705c973c3ee8cd7a50b7a6a73afceda5eabcee0c5f788e84b2bd72ff43ca6172389324803b3a7ddc4bd6470a604fe97c WHIRLPOOL b809b4c089ce50af91c0aaa0b216248971dd6881fae2e1ec9cc7a3156327b0123f53c2f2e8341735a1dcf5131377e1a43acc37d5451d7c3676203387ce5e3f27
 EBUILD ck-sources-4.13.10.ebuild 1625 SHA256 402630f72444212e7929225f20a72bdba7d2ec97c2613d3d4dea183282547dc0 SHA512 e8f29f412533d2f3dd6c0f94f6eaeccb9e31508bb7b966ae8cd3fb4a963590d79da014f01a664a575c50b9601ea8de365206b237a2ab06b972dcb2a4bcb61fb9 WHIRLPOOL e0c39823c8b93f2adb9781d39af16efb7501913de248bac023fd5c2b67b1b78d1d28181f73add34e984597b51cbe823116d1d497d880749c3af87888ab1f6751
+EBUILD ck-sources-4.13.11.ebuild 1625 SHA256 c3fe3a3ad93caeb3053cec76ea8f6cac022d67e9945b2141e4d9a9d5201859e4 SHA512 f8de4f022cf9dd4c853a2ca43e8538e0396d8857aad333360c63871b05f976517a12a02a348ef96a35c5d96cf3ac187a5a7410eba30d3144a3512525118a2aa4 WHIRLPOOL c5d748a118bbde5b814310bf7c369cb34d023d4535ef086172a060a8a683f33bc65a49a360ed39d70a4cc476d300418e5f1942534f5cceb4fa5aa3098f72681c
 EBUILD ck-sources-4.13.8.ebuild 1625 SHA256 700396b1a20a9ac92761e91dbef4ed645f46971993b96c46194d754adf07872a SHA512 0bc56986a408bd0584b9949c6624f855f0e99ae751bf7f94ccbfb01a3bd26ae91758454e6d8b4aaa032b76fb5e5c076d8db6e4ad0e256e7f3a522ba7d27b1eab WHIRLPOOL fdc007fec5d32f2bea3982aa2af43251588797a4ad3b054ccf8b1d34562bdb1aa20dddabe41c97dcc3bb5fae36a613d1fb59357130e219a4929329449f0cf148
 EBUILD ck-sources-4.13.9.ebuild 1625 SHA256 f804e06d6a971a38dcba7f183283c396203f756f348d27a0e43eee557ad32281 SHA512 fda920dbc2a132a3b2f89613ce190a31030e55be1dea43fc531a7e4856814c732738cd548c58152b312deb0ec1495e1c2c8f5f4b383d857571e8b193a8cc5dbe WHIRLPOOL 08ccb7a0cad4258b0f766c44fad4a7f5e8c91e69f9f9a7f95e38bec281305f1a4ef156e6e6a1fd73d4aca2e56821a19ae10f5c91da5f50fedf114720b3272c2a
 EBUILD ck-sources-4.9.52.ebuild 1905 SHA256 350addd7131a737a291a02f97da5fab96526ab7d3eff25546b8410b2cc4e0ad9 SHA512 cec584dc1d17b292c2f44dcaa00f41912ce4eb26c2b1f938e3f4d05505d6a555e59993bbaf577cf480573738ddde80d3422b6f92d436a57e0a2140d424177a03 WHIRLPOOL 9e1ed8b714ea42208333092d8d6913bc613692f0342a0f50fc0c523fd1e3f3763a6d705a14b3a168b886e9d8850ea4691ddd8c4f86f1e0db5279210fea129e7b
@@ -59,6 +66,7 @@ EBUILD ck-sources-4.9.56.ebuild 1905 SHA256 4d3929c0d4a41b8a3423aa19db26595a6180
 EBUILD ck-sources-4.9.57.ebuild 1905 SHA256 f7d1ef11e36c67e44b20f1d25f2b0d81e3b85bbf31be8100fb80bb5e653ea51c SHA512 4487896631799019490c46bd13202ef22b96016dc1f666b460163c0d6b9523b115b0b869a07404a50d92193cf98eb6aaa0728fe31428da3ebf2e1262f9643c2c WHIRLPOOL 2013fc4d25b6e8372261e2b56f20376a8192ccccdb09b08a796fa5527c0dd15e21c571bd380f47f5970ebb55dc74ce6c37f3f0c37df5d310e082a1cca5e1c44b
 EBUILD ck-sources-4.9.58.ebuild 1905 SHA256 677f4513b618c5d450eaab401ea480c43e8abbab9e3db3cd58bc1a94abe37e25 SHA512 a1d1b76b9386f42b7eec283b99978bdcba4620637ba32f7f93f17f14dceaa11607f5e30ef75fa2742a2017a788c02ae1991f5b69dc1300d225a5a46338d5b99d WHIRLPOOL b20027489ab1e673f59e22700b20987ed2d45581b4f0a78cb9ee6a96767518081b21950b932745c0e2ec557d6973759dce88002c3c90300cd6ee823d45193804
 EBUILD ck-sources-4.9.59.ebuild 1905 SHA256 1ee22f04947d946f7c64ce15b5447a2bc1848e800afa911b21a3a56f1cfa7b69 SHA512 77291d5fd1aadf059a2ff9af1b77bfc5dc4c4385b7df7d2e6f7d5da4d70bb42f4d3fbdc472bc3f989e7a3eeb4a1629a24d99ad56712e7de94ce8a7595d92bfc1 WHIRLPOOL 3bde39b016ea7b1f5153c878068a96993bb5ad93cabc3f0d91f64590be9eaeaab8302393bf07629b20a30c13d79f800f4f8521945a664bf361e6706c58e6b86e
+EBUILD ck-sources-4.9.60.ebuild 1905 SHA256 78c4c972ba58fc6ae1a0bd7a2da9ab30ff7c5c1691695c6f3a9291a5049db96b SHA512 b310132795831aa5e10d9931d1bedf6cb454aa5e681dae00185df09e9c660baf6c92023d2c52ae5b94d04da6aebcfe4aa07571b9d63ba5d286055178b1d3a526 WHIRLPOOL ad8c1e1535d3620dc50f7fa4b0793dfe326db79be5abf9fd85b28a28384c5e81929fad8e3167e3462dc0492ba9cb959ec089d068b63a53730eed9219a65914ad
 MISC ChangeLog 8693 SHA256 b34cb29fe694a7fae951b08ccf1562bbcc3d5b4154e643b2e6f7096be8f2ba5b SHA512 81732b96b5d47a4bd84d1710fbcb2115b0a89edb0982c984474669c4251ecf00787632b223070d879c1124fd30b5876927eab0775da0ea4a3a9be0b1bb7cb441 WHIRLPOOL 1dc401d79ac02f8be03817c385ba03277e7f5486704bcfba53012efd813ea7ec8945b550951fc19159fe7a90b7a3059806981c542f915a0e4cce1a624b4d56a4
 MISC ChangeLog-2015 22978 SHA256 f5bd9c75144802391d4e81da727842262dd69dd0a981899bc23a8f25d7f9f4f7 SHA512 d7df0a783cdfc7eb7c1bcd0c7163cf4679926ed094c35213867a4120415d4351562c33a3ce346b08f04f3cc8c880110eaf413a53b67d6ad01cb92a4e437b1c8f WHIRLPOOL d4901ece1e1b7b8dacf2dc8442ea33c8b27e0a54506926a9cfe76da288be9121a28f5f31a01362192ef594b4b1fb67b619e17cf5c12222015f5db3803afeddeb
 MISC metadata.xml 770 SHA256 62628aa544e3ea7b512ea85e0497cb0ddf7a06c7ce89d041b9f424ca77acce26 SHA512 6c1d9152ac638ac3c4483a687f24d5e9a4a8c3c840d2d046db7f082d3638cf2d460f8ce82e69bf86f1d4d2e8f7b2a9f34431e00d3f8d09bd52ce6581f3dcf6c1 WHIRLPOOL 1e5735d4d5a8867aeef0e744cc1539b247d00a3aa1c1b67e89a3d0f8bf53118ea027c4c516d90c1bc9dff1664493cca56aaf01c3a06276bab2b0f795a66fd2a2
diff --git a/sys-kernel/ck-sources/ck-sources-4.13.11.ebuild b/sys-kernel/ck-sources/ck-sources-4.13.11.ebuild
new file mode 100644
index 000000000000..872946c0e55e
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.13.11.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="13"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.60.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.60.ebuild
new file mode 100644
index 000000000000..b18e54903272
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.60.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://users.tpg.com.au/ckolivas/kernel/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="62"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index 5c7cd6537fb5..0eec8debe199 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,7 +1,5 @@
 AUX libapparmor-2.10-symbol_visibility.patch 215 SHA256 f6f22234a4dbcd6dc96683dee1d0859a4170773515f2418ae3907ed28a061935 SHA512 3c0935fb5d229f0442904bee11a2469b8f73c01ea3e93245170fdb532fc136186416c24a6c3f36ecadc4266b5a611dc6204a11c30e133cf49e2186a7b4d620cd WHIRLPOOL a49442dc1a63f1af607c7f5a4faae14eed953f088893e12e059249a1b80ac638a4a18b665f8130818b63d8d38986d5294f36ee2cc50a9f639b4ca1b1a72313f0
-DIST apparmor-2.11.0.tar.gz 5013297 SHA256 b1c489ea11e7771b8e6b181532cafbf9ebe6603e3cb00e2558f21b7a5bdd739a SHA512 86b33c1cbbd256028dd5fdfaddc764c225845acd19c833223fce5cdd6164f997fe010d7b642791f834a3417b4ea847d77175fdfd89ea99ab2111933790d42b55 WHIRLPOOL 2a3ca9a943694fba0f225cffc2bac3782545c0970b490189585a87cccf18047128eaab754e53003e03d535a5851a3198b0738a89c6547e88d081f6ad31f066d5
 DIST apparmor-2.11.1.tar.gz 5017646 SHA256 e8e2b22c18e6b6741c1f96942398923b97316b53d86408629f922d5689ec3507 SHA512 f088157cc116987e56c0e02127497b1ec6241f3d761ec3b53211fa188f5f02c9408d6b903f2d275328ede88ebfd1393e00aad9f68cbe78fa9ab3711ba0f9c00c WHIRLPOOL 46553fd18fbee79b3553bdeb2745c4d29396da0077284eda7391c7d94ff930f06242e295006d16110df12ae927d2b7ace0277769e61848d3f8670cebdd9d8c9e
-EBUILD libapparmor-2.11.0-r1.ebuild 2164 SHA256 329ee993e8b7926119f8b6fb104e4ee2a580bdb4d318feaf0a0a93a62bd63823 SHA512 aadf9e0a2b8046c574bfc94dbd2cd8551ecf98cf95d28ece0576ed97c9ded505ad149a9c08c7aecafc329f6f1a21f4adfabc9e21c826c7f3b6866c007397721b WHIRLPOOL 96637015719dbf22160df5d78a64fbe58b465c378c786b5641036f23071256104630b39e9142be136ea4d938891a4aab7b7fe6c09bf35ff62e8db99a75bfcc77
 EBUILD libapparmor-2.11.1.ebuild 2161 SHA256 ceeab8f843100e075a0eab22338707a94a3e277907ea34a0d75f9d217ce16a2d SHA512 8f54f44882c3732d2cefdf069eb9329c273b7838c0cd4dc535b8a3b0cac5d9244a75f7872d14a3be94d7ffa6452bea79189895fd2ff30973ebb5b4a94373fb81 WHIRLPOOL ce1c5bec0fe310ef9a8abe7ed7f59a40a62b97da045cb9b222b48d948ce59875ffa0a68521ff32f472e0a773be49d9e4868fd462805bc16d7caf0913dc6fdc1a
 MISC ChangeLog 4318 SHA256 6fc7d8201b9d1a8ce1be0ac28a654ef9339a1620653a125c3fb5d1ebeeb70032 SHA512 c69606261ec88ab81de4de2e18f3c637518fdd1a587661c6c452618be3184396a1b8647870a4865413c95b0a35712a8b43eb9387d40edfc18cb65aed0e1ee19a WHIRLPOOL ed3c5792afad36992be866503c10c3d9a105dfcc38e05389b944292fd174cac8aec7f617451e91d973278f31dd861e5935d9d25831bae20df79ff2625de3f0e0
 MISC ChangeLog-2015 1141 SHA256 3670b455ad98dab1b82218ca6f269b50049c66c72728955a26a7fb682f810ea7 SHA512 d552090d3efd971cb723bbfbd6555b9d8022ab4bd6d286d71374357cb03513b5840aca0cf75cb391d3fea9778b4a115b7bd27fe96ac4e2fc044246cf39347c29 WHIRLPOOL 02141fbf0524d0d0257ea68ecea1b7a0068a676f3612de1dabbc62a8f1982e22622a7bfa1f2a734844ad177ab1242bf4d5b4e119be547f1c5156cef32ddb53fa
diff --git a/sys-libs/libapparmor/libapparmor-2.11.0-r1.ebuild b/sys-libs/libapparmor/libapparmor-2.11.0-r1.ebuild
deleted file mode 100644
index 6aaecf4ef4df..000000000000
--- a/sys-libs/libapparmor/libapparmor-2.11.0-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=1
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools-utils distutils-r1 perl-functions versionator
-
-MY_PV="$(get_version_component_range 1-2)"
-
-DESCRIPTION="Library to support AppArmor userspace utilities"
-HOMEPAGE="http://apparmor.net/"
-SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${MY_PV}/+download/apparmor-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc +perl +python static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )"
-
-DEPEND="${RDEPEND}
-	sys-devel/autoconf-archive
-	sys-devel/bison
-	sys-devel/flex
-	doc? ( dev-lang/perl )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig	)"
-
-S=${WORKDIR}/apparmor-${PV}/libraries/${PN}
-
-RESTRICT="test"
-
-src_prepare() {
-	rm -r m4 || die "failed to remove bundled macros"
-	epatch "${FILESDIR}"/${PN}-2.10-symbol_visibility.patch
-	autotools-utils_src_prepare
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with perl) \
-		$(use_with python)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile -C src
-	autotools-utils_src_compile -C include
-	use doc && autotools-utils_src_compile -C doc
-	use perl && autotools-utils_src_compile -C swig/perl
-
-	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
-		emake libapparmor_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	autotools-utils_src_install -C src
-	autotools-utils_src_install -C include
-	use doc && autotools-utils_src_install -C doc
-
-	if use perl ; then
-		autotools-utils_src_install -C swig/perl
-		perl_set_version
-		insinto "${VENDOR_ARCH}"
-		doins "${BUILD_DIR}"/swig/perl/LibAppArmor.pm
-
-		# bug 620886
-		perl_delete_localpod
-		perl_fix_packlist
-	fi
-
-	if use python ; then
-		pushd "${BUILD_DIR}"/swig/python > /dev/null
-		distutils-r1_src_install
-
-		python_moduleinto LibAppArmor
-		python_foreach_impl python_domodule LibAppArmor.py
-		popd > /dev/null
-	fi
-}
diff --git a/sys-process/tini/Manifest b/sys-process/tini/Manifest
index b13d4e0cb49d..e02f1ca216b7 100644
--- a/sys-process/tini/Manifest
+++ b/sys-process/tini/Manifest
@@ -3,6 +3,6 @@ DIST tini-0.15.0.tar.gz 29473 SHA256 3c0e0373c67006ac7e59ef6213e13729b53de5f4144
 DIST tini-0.16.1.tar.gz 29641 SHA256 c2b7fe2fb92e71911d06b7571b53d4e7e8985b34efe2a599670b070b000c8dbe SHA512 aa0a802c403a07771a2b28a07b97fa2c93d40b5d5be2cba6556c8e7a92e608453010625d0236d26c27bdd2820aed3ad9ca676b70f7fcd5986d7f91eb928d053c WHIRLPOOL 98697f24e3c4ace3067943fd35f28b6243651478c407f3999e4152d58433a3c303a42ccc587717a76eec2aac10300176c2b1f360faf3a616180e2637cff661e7
 EBUILD tini-0.13.2.ebuild 910 SHA256 9fb56690ab99fa8bcfc92d5fd3c99f4cbc400972e4a23798bffcf53c0870a4bc SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334 WHIRLPOOL e754cc7b36af670bd1338ffdf4cfcb2fa23cd1ca39e56146e5fd515534c3a6fef0888aa153fffd5990261be112ca1c787f8c13a7138c4181ebd23703b21d6630
 EBUILD tini-0.15.0.ebuild 911 SHA256 e5fe6c0241084403f829ead9d58ab94f560ca0d8e8d12c8a6bdabb18aff37053 SHA512 cb538a26c6d6d0aeed29b976613c85cc5363e790b6eb2c73d78b43ece9185adbe811976e3cc9e9a38ec987e8b5dc5e5585b8bdec3be40cf11b37237f15567f02 WHIRLPOOL 00eecfa47b99435cd8bb8a27a2b59a3ef95599cffe388d1a36fecfe8d5ee9d6d2cbd6389d406a8e139e45498278afdd9770e0c02c6b566be13c7f2b2fa7e42b4
-EBUILD tini-0.16.1.ebuild 911 SHA256 e5fe6c0241084403f829ead9d58ab94f560ca0d8e8d12c8a6bdabb18aff37053 SHA512 cb538a26c6d6d0aeed29b976613c85cc5363e790b6eb2c73d78b43ece9185adbe811976e3cc9e9a38ec987e8b5dc5e5585b8bdec3be40cf11b37237f15567f02 WHIRLPOOL 00eecfa47b99435cd8bb8a27a2b59a3ef95599cffe388d1a36fecfe8d5ee9d6d2cbd6389d406a8e139e45498278afdd9770e0c02c6b566be13c7f2b2fa7e42b4
+EBUILD tini-0.16.1.ebuild 910 SHA256 9fb56690ab99fa8bcfc92d5fd3c99f4cbc400972e4a23798bffcf53c0870a4bc SHA512 a7f116a229f64b1b90f7117ad3788e514138f30a10779ce13c06672f796fda300e69301426c0c912ee777894e7e156b1dc4421cc3b9d2a994e86a28f25ea2334 WHIRLPOOL e754cc7b36af670bd1338ffdf4cfcb2fa23cd1ca39e56146e5fd515534c3a6fef0888aa153fffd5990261be112ca1c787f8c13a7138c4181ebd23703b21d6630
 MISC ChangeLog 1296 SHA256 54e7357cc31be7839f3084b8a2879cfdf98309c6a36a8aa23fcf85580263c0ff SHA512 7306347604920f0e457cf42e73537f73b2fc8caeb3f27c00a26eb1af4ea225de2d670f5e89e9add6f98404bfda3563b88f4b12e210f4fd49246bf3dd9cd06a8d WHIRLPOOL 9de022a1f5830f1183b789fee174019eea2823c977396fabe6d139993680f081e02340700bf768ea55e16f112c9bf485322844d22235bdee4b999e50bf227b88
 MISC metadata.xml 603 SHA256 70384200c89dc98df644a896de1268dfe09cabd3cf8c60d85f48bb258305958d SHA512 9e6651c7f9ae7a2b3d856af9e74e8656f89de4496fcacf5d97bcbe4d2b20be01c306cb3e116a0ad7eabe213e2476245894ffa53e5c63ef9b4e73ca989584af9c WHIRLPOOL 9893638936c1c2013130f31317c1c1383716ef35a97e37146cfc6e406618534f9c14a9837874cdf419759742669079b893a5b29d8239cf3a07c32d6f7954b3a4
diff --git a/sys-process/tini/tini-0.16.1.ebuild b/sys-process/tini/tini-0.16.1.ebuild
index 2ba5c74f375a..4e2956b566d1 100644
--- a/sys-process/tini/tini-0.16.1.ebuild
+++ b/sys-process/tini/tini-0.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/krallin/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="+args +static"
 
 src_prepare() {
diff --git a/sys-process/vixie-cron/Manifest b/sys-process/vixie-cron/Manifest
index 497a066a5c36..4cd3b312dc27 100644
--- a/sys-process/vixie-cron/Manifest
+++ b/sys-process/vixie-cron/Manifest
@@ -17,7 +17,7 @@ AUX vixie-cron.service 178 SHA256 248368dc7dcdd94ff641ad017cc64ed7a82a3791f81dce
 DIST vixie-cron-4.1-gentoo-r4.patch.bz2 4204 SHA256 8de14b11da567f7859df3dcf71802f32ac1b3650ae07c6cb6dbc259e1f6da7fc SHA512 eec8f89a97927a3557bd1350ed7e9baa0ec133e2c49f8f0fbf51adf62c377451dc48867ca6affcc7576833a5b6b749613c9b99641b1b658853f91d8071c3411b WHIRLPOOL 9951885d10f0f49cb0b66b1b592a870f24c04647688422c7fb396e266af0aeed7ae357bb571f13ee30aeec747ecfe78abb0335f80ea5bfd0084aee4321a581d4
 DIST vixie-cron-4.1.tar.bz2 54246 SHA256 fd25119b301e0e8306ec27ee912298740c5c8ae879bac02381429cf355d1122d SHA512 1db9a246243dbd4934438ce70bf022215ccffed4b899a77b076d5a7679a7b98a23ef67344e329fc7a836df90685581e10b1c95709db40601c33d2052ce561e04 WHIRLPOOL e137a0e056103efc1bf0aa022bf0f9e2ca3ab8bb3ff97645de27c2e381a4aa5303d477cd1bc6220177aa503c2bce5bbe2331d311dfac4f5ab43cf6928dbe1ea7
 EBUILD vixie-cron-4.1-r14.ebuild 3493 SHA256 54bdc9689ae51ea6a8d961c5a862b2b179d05219cd79b7b993d1600e15124086 SHA512 b51b9b7b81394c285db9b1a44aa4cc0b194c0b9480fbc1a57cf644db6b689b5715a763585c6145b8551a44e1676aabe409bc08c96a16de663c57d14184079c2c WHIRLPOOL f73639db790901d1e448062c1a36e5eccc1a4c1b7f7cc073032146f3477322470b5c568648597e256fbb39270cdae04fa285037f10f356ff6807df8dd9413839
-EBUILD vixie-cron-4.1-r15.ebuild 3507 SHA256 36357a62d775523a35e725b9f1a3fcec242d0d5c188b88cf8ca3cd6c6a171b2a SHA512 fef94027206efd56bbc2452392d9ed77332a942ac9eb6df3d358d71e8622bb23a3304215e2131c0a971e12e856db7dc2e7768fda2b438f1a77cfc9d736b6044c WHIRLPOOL 440b3386725ce795647f4c3170f02b32bead777f60e09a4cc2f50e4c6303469ffff182becf33a7117f655d1e0b6f2329be81c09562b48eeb9130a874e8c0c5a5
+EBUILD vixie-cron-4.1-r15.ebuild 3506 SHA256 067208a20525a9aed621dd0e97380c047ad276542cab594ad220c8d7aa01f9b4 SHA512 af1a861f6483e998e07689cdcd3746be30747faefdc3e214dee65805f3c6c7fb1aa7a06962b1cfeaf25ad484dd6363be57e51dc15aeed8dfa029cd91965d2098 WHIRLPOOL fbced7b6045182ec518a503ed0793c904a2337fa1ed944726a688d4121f4cf3d010e4ed4f3a82c63ec8494cce43d5d53ef027aa934bcb3267532e9d5e4637330
 MISC ChangeLog 3256 SHA256 8331d01c2abdf9d5ea9abc969c3d172a07e38e8395a3b9ab4a8dafc80d41fc55 SHA512 d6c5ac7898ad8be3e4171e90d0957fea01b48f6d0dea011b8a8cc6e2120907721f5e4ec4461a7741ee9909efb9fb1a73218ba45479977f3c276e9b53db9f7f15 WHIRLPOOL 1c8740f364acb4e34e1d40b0a0040634f2766e84c72264ffada2e828f1be4535461f0bdde2a785ebbd427eddbecbe2aa8e01fe09d9d74ce9beb153af43d2b639
 MISC ChangeLog-2015 24228 SHA256 9ab7b065b5fc93ce8b3602cf1105dee690b53a2e3ab58ccf4fafc9b7bf7b1e42 SHA512 faf5e627979e5b3500ca99af9eaf4d0b3b362ffed25be809f8e129f841227bbdd881750b3f18d7cd2c997c58e98b7e7890e69f2696b51b748bac82a245de1379 WHIRLPOOL d120d61750414f765097afdf93e1977846d41607aba77047ae8140a4c318ce1ccedfbbabcd850369f1284ed5e37ef6946252ff150d21cadc5a91e6b0f41684cc
 MISC metadata.xml 256 SHA256 cbca1ae57df68811dc0f0eeceb7449e69bc046966ad0feff3279e148f7db2f18 SHA512 155f3cbb14ae54e9dfb98e954f6bdf7f23bf5654ae2d00549f7722085a7243d934dfd99d6f1325b00dcaeb50c5344e818e602dc4e2fe47dc7aeb1fdb77668521 WHIRLPOOL 37d54b13f923df58d35217014422b6b484597ce1f80f39a4c6d8a4906d3c5dff6d8c4e14972abb5bdc3a041006c5b691d1d284dbcab35bdffd0e6a013c110215
diff --git a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
index 1e06308a812f..9df5efc8c14f 100644
--- a/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
+++ b/sys-process/vixie-cron/vixie-cron-4.1-r15.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${GENTOO_PATCH_REV}.patch.bz2"
 
 LICENSE="ISC BSD-2 BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="selinux pam debug"
 
 DEPEND="selinux? ( sys-libs/libselinux )
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 69dd4782247a..1f493bf4fbbe 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -2,7 +2,7 @@ AUX gitea.confd 74 SHA256 edf43ca063fccf9951cd1e3975fdfa7ba0e26b47d7442596ce27bc
 AUX gitea.initd 681 SHA256 d54242e9f1f8854f97cc0acf47242a2ace8ee388c9af7d152ef831ca57bbf3c0 SHA512 4565a201f34e5beecc8b535c677e308718a3df91f78a1a7132dda70bc4131871ad9f007c76490c23a001357ce78172a0a22c3e5ff9f3deaa7032e1d8cb11e986 WHIRLPOOL afc8b379026eb28360ef92671ffff1930dec68817653766ce7d3c108912aee33e6e2b3b3b33bedc39edcd5c0a9ac57012130f423be1bf7589465544d471b9050
 AUX gitea.logrotated 87 SHA256 19538aff00c6ad5377df593391f33f59b28333ebe7a95eb9848ce663a6f7c9ba SHA512 798f3fc33026f19dd31ffa78b9b1ed313d7b82b19c047f509e896c1798b2925a1bb7c4998d98a6b47e728979bf7132fb1c2a80eb7fda096a763d6791631cb6d4 WHIRLPOOL 7d8d3dea943948757803a4091a6950a2f9b2859570ee5783bf524c248557e72625042ecdaa9d694177c9a6e3e942dacf5a06e1298994ba009269d3417c299026
 DIST gitea-1.1.4.tar.gz 13018104 SHA256 36ac983bb3b3f7b1edb8a86acbd6f73f3fabcd2ecf1554b86fe212318b4234d7 SHA512 4427c4c1a588dcf201f707c3e2827fd702a0f8c0add63c6a5eff0d6ef8d21fdaaaf275f8e790017751f161431d563df22f71a6ea046085f9fb1d57da99f20524 WHIRLPOOL 14ad4d092348f8058ccb2438a9bca4dd3223305a9e8575aac808ef5bf15d1b27fc8c54b6a0b890244fe28761c31a633c7050d77b63410086fb1e03cba3e3d569
-DIST gitea-1.2.1.tar.gz 14326562 SHA256 a18e0390d2c2ca956e94e98294707c9ac1d926763d00e2da682a3e72db393612 SHA512 a8c446361d69fb71d4ee2b6476dd49b84cd88d0eb53b3f6b86a7dbd8c7189a81f65d6178aed96fb6a15dfba5940ec2026c8ff104a249405e3e14a76cd9bb8103 WHIRLPOOL 3a2e7f32fdbd3d4a03c45d08de64b37269f7bde92c42d9825fe56788003a49b4c9fcc56b62116207fd6e0b44db358b065eac9787db3a7ed4f5dd191bafa7bcd3
+DIST gitea-1.2.2.tar.gz 14326451 SHA256 865f4c7c785de15cf496d58088b10aa84c4d260ebc9ae8b0cfb8cfa2001a96d8 SHA512 a0efca25a13d157c5d56308f6febdc7b70e5438a74f68de76a44444dac1f38cec3e3c4484c7f69c3773ffff0d6790ab2da29e1d9198d65a84c1802c9848fb2a5 WHIRLPOOL 35eedc2556b80f8468086d5cfffe38b2959baa316a95e14daa27fad7b564510f249a56b0df651a71ab92feb0aa8a759164af00833de5a3e5d937a425a6551056
 EBUILD gitea-1.1.4.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
-EBUILD gitea-1.2.1.ebuild 2450 SHA256 4b51128b604e09398d5d3f8d5ad571b12f1606566ca3713b409ebb4a2803ad99 SHA512 4d86c3afe45be17bda6d2818b68e7337b744e564acbe1e6c448da766a438e7279fef8932874cd9c885f388382e21fc540d81b8256ef2e2e629e7f5b7536ad354 WHIRLPOOL 659198061e9f8216608a399c5453ab5e82606f18d1432d20791bb45062dbbf7188f5c9696967f9d1358b795052261eeda4a46a07152c5bb2b04e7c2c1b925f9d
+EBUILD gitea-1.2.2.ebuild 2450 SHA256 9d5c76701ebce68c044e9dc214dc244cb0baa1bb36a16fdb21749772cc8782ab SHA512 6c2af2db4b1067b548f6affe27e11b266a8287db84920b95c2165b97ed263cc2af19311fc8105d28130494f828865237482d686ec42f5935d5859ed9b317b22e WHIRLPOOL 87d57d54b2ba8915fc55a21e51080192a0bdc9912f3bb9ce91318b04d3443f2a17a6ae9a01dae2e0761530e4a6ae995aaca2c862acc259de80cc6469707d406e
 MISC metadata.xml 324 SHA256 cf95cc2d754abaf77062d71409b6cb4bc9cd630637518db74d8f8af0bfa1effd SHA512 7b0e56ffe4652157a5126ae7cb7cc6b557ec8367dac02c28f69243181147855dc0e96fe09dd7ff507052a7f5382445deb98090175e06d030fe635990812820ee WHIRLPOOL 4694b3b159f487e2fbeccadd34cb56080888a5422fd8bd0c39db9e18b82bbd0ea1772ba6c2a068968f80c02babd74780e158b790b9b2d260d0ff466a2808e3db
diff --git a/www-apps/gitea/gitea-1.2.1.ebuild b/www-apps/gitea/gitea-1.2.2.ebuild
index 56e96b9e348b..eb6445ca3d84 100644
--- a/www-apps/gitea/gitea-1.2.1.ebuild
+++ b/www-apps/gitea/gitea-1.2.2.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 inherit user golang-build golang-vcs-snapshot
 
 EGO_PN="code.gitea.io/gitea"
-GIT_COMMIT="34182c8"
+GIT_COMMIT="d81cf34"
 ARCHIVE_URI="https://github.com/go-gitea/gitea/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~arm"
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 77d27d2fc0ea..108780f3cb66 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-beta_63.0.3239.18-1_amd64.deb 50018880 SHA256 982ca07a579c0d39b46fbdc0bde6d8fa16ce09f2bf51be4d2030a93305ba49b1 SHA512 1fdf8ecd2aefe0c3d3350e0e1824027e780ee3d8a8b313443ee2f78be488403abb0adae06d768cfccc26ef738372c0826b9dc1308165c8c7568782869b8f6a3c WHIRLPOOL 5bc2ee12644f9f52ed81e0445b0f4e5c3c4b800895779e0d3c0235b0d59b22bb36eb644bfee14fcb9739f1cbf02501b8ce94ead79ebfeaf0532a7ca534f8bbb3
-EBUILD google-chrome-beta-63.0.3239.18.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
+DIST google-chrome-beta_63.0.3239.30-1_amd64.deb 50548256 SHA256 da0f163e662707d5ac8a3dcfff649ce062a232494466e41a6f6900f8869b2c01 SHA512 f7a497605c6115bf8c3ddc6a916929ddba255fd63e3dabce32f5929bbf691f224a6bbb23d4b8bc73488bc06c2560a47db195b7bde5c8793bd28931bf979f2605 WHIRLPOOL 4096a31a9f8316d26f1c52a7a82509b6cfc4411c7ce042037c182d2858fbbe794b3bf92c6c017ee99a7f0296ea9b44e9e37e78a8ee235669c73f00d3151822eb
+EBUILD google-chrome-beta-63.0.3239.30.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 21904 SHA256 b56029d26bb3007cfc2f52b8d5031881a614b643fcd2b5966ebb050d567a9ff5 SHA512 1fa256503b4ee20b0e8f8b3e3af6a4d1e581fa2050a0199dcce6495960c74e62e5bcc9b37309671889afe7fc4ca443a0e1f21626d653d426b4ed9582792e9e7e WHIRLPOOL 24e45971afcbcf260a68aee5dac7b2db643d139a0552568d39c0e8b7567435fedbb9a8b5a87563bbd24c8dcf9a9c9a25991a24680bb27c4f7bf1e3dbaf6feada
 MISC ChangeLog-2015 18731 SHA256 244ca1dc0c95828216c5a3a9878ee0c1bf6ca757885b8afc39a9cbd11d7477fc SHA512 70b0fe368012d1d3bd0997af71bed3fdb0f3933383ef4c0335238a7f016435f48f03ccd2c2cb432445c3b0dc1b9e6dcd3b687e65c478899b7bae0701bbf250f2 WHIRLPOOL ddb2e222026feb62390eb8bcc07514c1a00a177fada1eed838155637afbf00fa139e5a59e1175bf7157c97a7aecc6a1aff7ae4304d3251c993661da1105f461a
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.18.ebuild b/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.30.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.18.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-63.0.3239.30.ebuild
diff --git a/www-client/google-chrome-unstable/Manifest b/www-client/google-chrome-unstable/Manifest
index 50b101ca176c..51cdd3d1e4f5 100644
--- a/www-client/google-chrome-unstable/Manifest
+++ b/www-client/google-chrome-unstable/Manifest
@@ -1,5 +1,5 @@
-DIST google-chrome-unstable_64.0.3251.0-1_amd64.deb 50499978 SHA256 ca8f4ec300219c4cbdddd94e22dab92d79dd64b66ad84fd83e32353c3d82661c SHA512 d5b98e64e5dd3c39996ef67b273249686fe96db8aeb34f37b0ce0a4d71a59d88e228de58999b71b6fb7d63610d6a1d963c3702c4e3b7c85065ae328cbec0e5d6 WHIRLPOOL 35b734582de2e332fd640536c41736f7b27412e484196f412ac354d32255c4e151226881ceeb0412dfc77625890324706473e17cc63cd626800677c876cf964a
-EBUILD google-chrome-unstable-64.0.3251.0.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
+DIST google-chrome-unstable_64.0.3253.3-1_amd64.deb 50500116 SHA256 bc04986d4996eb595a0bb7783fb4104a375a3a7c4da7d108f300e33a58b52835 SHA512 9cb2457bb2a0984286d56bc7d9d37066ec25d85f78c2420f7d2bae310be90385e81a67b003ae9e988c9be7d4001b6eefdb8235c2ca142405d3a081439be09469 WHIRLPOOL d17f28529a822fe0938cf3ccfe4219b7c947ade0bc72f912631a9edeffc206af9a8721f25e63407c7f7554c4c8421381a1bd161a71a0d61ff4782aebe277004e
+EBUILD google-chrome-unstable-64.0.3253.3.ebuild 3537 SHA256 69963e5873f27f0805ba0cc65a76f1a2ba7e77b4d6b94b8b6dce338edfa47db8 SHA512 2db889ef7c6a270a30ad4cb84bf4efa76d255593a8a5320894d326605c5d8404565be8e3f1658cfd06ae51fbb52a0a1d1f81713625ef453587462d1956eae07c WHIRLPOOL f6c679cbaac78d521e053b397a0b0a3b1af081296b75c96d0ed2fcfcf1b7a14c47b1e235627d0198f4fa055b6b47246cd2895cef32bb400e3097a99a74dd8613
 MISC ChangeLog 26760 SHA256 d211ce81fe772ad972458400d9065f652f351a6dff428e1ed65abf256476219f SHA512 3341263860b9c45ade48a8bc0c83303b15ddadf6defbfbcabd6864896d67cf51b818afb3fafb064a373cc89c2b93eb1a27af2b2a8f8e8761a54d1bebbbc0b32c WHIRLPOOL 0c61e5cba799fb10a3e6b123f4c63f9cd6c394a40f4226f6f9b7db97fd1f5ed26c0909013e1d2d037ecbdca9539db590a42589bf78aa4e6955cd01ee5c4a9075
 MISC ChangeLog-2015 24195 SHA256 03cd9f706b00090ca8e0a16169bc3c45a48f3e499191f7fb6565f1988b5b8f62 SHA512 6b25f7c076af400be3e91275fcb82401d40b50327dd76a5796f0d94cf16747a6a5e4dcfa1a3da2ee737dc6bf6ed833ce6e7e2bee31a70c913b76c10f8f44e7b6 WHIRLPOOL 3753a9bee1820b25997933975fef361befc8eb3cdb42562d66b9a35b894738ea687866050be7d5e4c9c48cba0255d0797fe881ea36e4bdc5d65599ae5d45eed8
 MISC metadata.xml 624 SHA256 e295fc153645351df4b2501b78b8d6115f66e439acec1e3ae35afc84ee027de1 SHA512 318638d149ddf7c81310b8d1fc6e38525665ea5e3b7fc6830ed3b13547f80635e6a5fba60b60829187742ffc1217beaf7a72bcee2c6b76736316e004ad336786 WHIRLPOOL 4b31e15fcc05fce91aad8bbcfe28511b32f35be1a2d747661be604ff691682be30c73086ce24f5b00a83540bc494d3a4a32585ceaf78cbcd1b4070cf5012e1f2
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3251.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3253.3.ebuild
index 15a697bab362..15a697bab362 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3251.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-64.0.3253.3.ebuild
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 7200a24e9a37..7a684c756712 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,9 +1,9 @@
-DIST google-chrome-beta_63.0.3239.18-1_amd64.deb 50018880 SHA256 982ca07a579c0d39b46fbdc0bde6d8fa16ce09f2bf51be4d2030a93305ba49b1 SHA512 1fdf8ecd2aefe0c3d3350e0e1824027e780ee3d8a8b313443ee2f78be488403abb0adae06d768cfccc26ef738372c0826b9dc1308165c8c7568782869b8f6a3c WHIRLPOOL 5bc2ee12644f9f52ed81e0445b0f4e5c3c4b800895779e0d3c0235b0d59b22bb36eb644bfee14fcb9739f1cbf02501b8ce94ead79ebfeaf0532a7ca534f8bbb3
+DIST google-chrome-beta_63.0.3239.30-1_amd64.deb 50548256 SHA256 da0f163e662707d5ac8a3dcfff649ce062a232494466e41a6f6900f8869b2c01 SHA512 f7a497605c6115bf8c3ddc6a916929ddba255fd63e3dabce32f5929bbf691f224a6bbb23d4b8bc73488bc06c2560a47db195b7bde5c8793bd28931bf979f2605 WHIRLPOOL 4096a31a9f8316d26f1c52a7a82509b6cfc4411c7ce042037c182d2858fbbe794b3bf92c6c017ee99a7f0296ea9b44e9e37e78a8ee235669c73f00d3151822eb
 DIST google-chrome-stable_62.0.3202.75-1_amd64.deb 48725174 SHA256 1d54877408fa494781fedb0982b77eab0bc38f86041d0739e87a5e3603148f30 SHA512 d0a304b9007bb645b2ed0850edec186f068c21c9f15f336bb2e3b94c4b2a3f942e2c76fb7f627f741a1560774774469318edefaaf0875e0dbc3547d838559c25 WHIRLPOOL bb9207b1dd4ca30d86302d73de9bd7cbbd6cfc727b8870990d346c2f101f463bbfc5312f0bbe41f8f6cf8862f2739d57c211d36afb81d64ad5ae92c2562f6e37
-DIST google-chrome-unstable_64.0.3251.0-1_amd64.deb 50499978 SHA256 ca8f4ec300219c4cbdddd94e22dab92d79dd64b66ad84fd83e32353c3d82661c SHA512 d5b98e64e5dd3c39996ef67b273249686fe96db8aeb34f37b0ce0a4d71a59d88e228de58999b71b6fb7d63610d6a1d963c3702c4e3b7c85065ae328cbec0e5d6 WHIRLPOOL 35b734582de2e332fd640536c41736f7b27412e484196f412ac354d32255c4e151226881ceeb0412dfc77625890324706473e17cc63cd626800677c876cf964a
+DIST google-chrome-unstable_64.0.3253.3-1_amd64.deb 50500116 SHA256 bc04986d4996eb595a0bb7783fb4104a375a3a7c4da7d108f300e33a58b52835 SHA512 9cb2457bb2a0984286d56bc7d9d37066ec25d85f78c2420f7d2bae310be90385e81a67b003ae9e988c9be7d4001b6eefdb8235c2ca142405d3a081439be09469 WHIRLPOOL d17f28529a822fe0938cf3ccfe4219b7c947ade0bc72f912631a9edeffc206af9a8721f25e63407c7f7554c4c8421381a1bd161a71a0d61ff4782aebe277004e
 EBUILD chrome-binary-plugins-62.0.3202.75.ebuild 1438 SHA256 957a85f58cd8509731240ec4e6030e68f7e89371373a96f3c629da1f25848351 SHA512 fe9affa131c7e21996969e46375ba6d1834c24751cb18cbf4adaa7aaee72b889283951561f2024f893e29aaa2e25f78884854615c10c8520980045d1be20f52d WHIRLPOOL cbf0eff4fafe7339f4aa35a15fac04840b0b936f23caf724d8c144aa36c046dfe95575f2285d8704bc94437add6e6f0f55aebbd3482dd54e45e28ab5ff781f4f
-EBUILD chrome-binary-plugins-63.0.3239.18_beta.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
-EBUILD chrome-binary-plugins-64.0.3251.0_alpha.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
+EBUILD chrome-binary-plugins-63.0.3239.30_beta.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
+EBUILD chrome-binary-plugins-64.0.3253.3_alpha.ebuild 1439 SHA256 3c0ef3ef065adaf230e006e4d512b9792dc552d8bde43ec5d299666423bd02f0 SHA512 1ed9ffc20fe99949b3a96cac76195e97a59976107b1d810b14fe1024dab246de3dd229b8cb42d8ad0611183c0d12e3f5c13766b670d0dba37b724e914c95a0c2 WHIRLPOOL 98cf50f9e6a50c2269db23c8d093ce6b223e5048779f93e4e9ddbdaf3d67aa0183144f00008a99a59be500f1fc874af7fc1a1f485aad2d8e1ac68cf236b4195c
 MISC ChangeLog 51929 SHA256 50e3850c299e851033ba47f469357a12caf7da6a98c6d3b8f4fb363b1ffeca73 SHA512 46cb260ece8c3dd5c4a29ab23dd2576d99c83e811b965f6ede0402f2c244e04a130f7a31bf719b73637f008a36418199efd2f714efdd5c272d9faf6f1233d503 WHIRLPOOL 74bdc87a8aed3e93062ae0e350ad5efff3ee72fd81a9bdc2b09710e0c600caee54e473a7f255a58d10cf27d28cf36965299e7b1aae1904016167cd647c101bcf
 MISC ChangeLog-2015 77792 SHA256 96719f76c6575ca2c06e130d41c45b6de9f4199194a719a97a089c11798ac811 SHA512 f8a3c9d9f3f1e7cb7e3a0a0b83a913d1be45e284e58511bdcc0268061457bb674afd8cb56e95c675939682b1f1f1f1523d2d3a1de1624f9a4348dce5825ff61b WHIRLPOOL c8fccfb687c4856c64d37d0fa1cc3b8aa577f1e5c02fc0f89842d3b4c111bf363eb5bb4dc97bcc658931014f2342661b599456ffff616415171196a7b8ea2410
 MISC metadata.xml 448 SHA256 6db38f88565d0e9d458419135f2352ed66df8cae46c7a2a7cdfa3e00e289a6b7 SHA512 b9bc86889a7432b10cc0e2ebe3907e6bd167d0d2ddc476ccd8cb438f0a46ad7061c935661216458d7f4ba9b765da374342ee558469b412c8c9783487e9459acb WHIRLPOOL e8a97201d4a3628a594ea15cc63712d8a79d0249c6ec90df1f3f21f9e88922d99f694780f1796ea1fe16fa72f37623f99ea8fd90e84785d3b918d143085d5397
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.18_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.30_beta.ebuild
index fb901aa5d5d9..fb901aa5d5d9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.18_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-63.0.3239.30_beta.ebuild
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3251.0_alpha.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3253.3_alpha.ebuild
index fb901aa5d5d9..fb901aa5d5d9 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3251.0_alpha.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3253.3_alpha.ebuild
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 7011bbf4e8d9..e63410d84ba0 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,7 +1,7 @@
 DIST QScintilla_gpl-2.10.1.tar.gz 2663446 SHA256 97f98a9d91f908db6ce37fecc6d241d955b388a1c487173b60726cba9a3dfa64 SHA512 ea9b95ca371a8af9262493ab59ecaef77e1697ba21d1d594aab39e836917884fd829aa4f6c4e72cce60b0d3f40eac654157cc507d027945f0034881855123ccc WHIRLPOOL 96261f2c2c38458891afad057716bdfee05f74e9f15a8b8ce2eab4445b8c56256cbcb33326631ac1f3624e2c998d490f5e057c348b3a3eb44a9260c938beda61
 DIST QScintilla_gpl-2.9.2.tar.gz 2491222 SHA256 f2c8ccdc9d3dbb90764ceed53ea096da9bb13b6260da1324e6ab4ecea29e620a SHA512 28f88111d7eb6a016a4b87f04d2b7f5d6481b521a3361a526b3b45a56240f5c8de10310e819234fcba773c6df73bf398ae2dce622976a8e760f506be1defb7c8 WHIRLPOOL a04420c66fd417e5304c92a1ee3c1998f6849bccb9088dae96ed48c06cab0a9b1c012f073aafb1e05aaee46564de9ac89ae07145f3ded35cf47beac78065650a
 DIST QScintilla_gpl-2.9.4.tar.gz 2557199 SHA256 8b3a23023e9f0573caed6f9cee86f898d87b768ee15b8c211a423783a4cfa4e6 SHA512 5a2eebbe523a0f2f1c7bc63ce5ee9cb8793a597d00eea5b638f18f90d6e798e92c281be23ee5e7072d5afced9e1fccb6ae51526a3623d373d57c3db64d026b16 WHIRLPOOL 68aacdcd0fc7102494ccae1f0ea3e222845bdd3f9bef603d89fe50d50dba6ac77471228a84c1c281a46ccf74bdb6902aa3bb21f89388ec5408bdde5876cf8655
-EBUILD qscintilla-2.10.1.ebuild 2396 SHA256 a5cb62fb39e0ccb7c31fcb7e288081b2821e30713a6711275e8c0b824d7a130a SHA512 ec04a36a7db01686439adb97aad938eb966928c4ba1b3f7df23365f59e2401efe35fff12de86016937cf1cb4fc03c9e5f2e3226d5410b13bda0c1d8d1f85c4e8 WHIRLPOOL 1559a93f0715db45058117757532207f386ce99d0dccd003f5846797fdfb97e9d0bc0ea8b5af88188a692f9dca44bf7ffbac365f601581c7a4680492d90e0e32
+EBUILD qscintilla-2.10.1.ebuild 2395 SHA256 03ad6b3d2f4a7f10ec31a89cb92ce189f30665dd374fb06fb03c9d48b14aad01 SHA512 31b3e43c1a7742f09201b842b487802374692fd519b924d416bc0c372fce5b6b225e8217e092996f034bc889e9eb19b4607bd6c232f88c539abae4acf5e4ebd6 WHIRLPOOL 1e2b3e5089306fb361e3007e6c89d0d4f8fe827cf8ccc3576099809353b9859b82094b48044c6986d5c884a0b7afc953943e37513645d555e69a31d576bb70e2
 EBUILD qscintilla-2.9.2-r1.ebuild 1777 SHA256 1f7bd7a8f06f07e8e778f9295fb62246cbf690298f99066ea00fc37e7d9d7d41 SHA512 ede8971a07ae607c1c4fea4270bd24ff2631fea7511b0baf1417d41f082fac3b64b5aae8db95ee3ddcd2c4d97fbb04e55632f86b8605689eb8f99d9791420c95 WHIRLPOOL 7f4ec51cf244bfe0fdd30ab3f165819c646c36706e393ddabd0d75fe1d292ce9d23a69243574b8ed012993ab0dd3c47c47295ea1f3536944b7a80a5b06835e01
 EBUILD qscintilla-2.9.4.ebuild 1998 SHA256 949f87c4e2e2034e0027af644a3f137c2e7534f90d02c2ebc3b3212eb41f4301 SHA512 b17413f326e1f968d2f41a7df31e5709aff9c7f4b9f3d2954dd98ddf3026eaedaa073882010dc3c54fc8051b7cbdd8672189eea410da7ede732bea6ff57b4635 WHIRLPOOL cd6e7baa030e5e5f917a827e8e69be3a46d5b3a4c5b819f1f8e3e7df22c8374401d96ccb979ce7f3e47473c66569baee5d604c0313ec61634ed2209acaf3ee5c
 MISC ChangeLog 3865 SHA256 34fce0992e4657060bf5daf948d10129fcff1d81952264ee0f95f5462fc64709 SHA512 0359bf04fbf3830660bec3e9e5734791a6a1a600ae57078c1c4936928181fe0c19d0a59e6abd0d58d4f13f80cf8f0fb94893b558768004a9581a78fb75d4ef2f WHIRLPOOL 8c4ec2082187603e27453774300702c694fa4f7b21acffba2c6dc4ea8c0103796dee52d27978d9f52273ba9b4507df728e8b65ff86b300037ec1f7f592b028b7
diff --git a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
index eb99746332b8..1c0c6c6cb583 100644
--- a/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.10.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0/13"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="designer doc +qt4 qt5"
 
 REQUIRED_USE="|| ( qt4 qt5 )"
diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index 2af036677cb9..0c63a692e66f 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -7,7 +7,7 @@ DIST VirtualGL-2.5.1.tar.gz 1165255 SHA256 da342e0157257cd7b7c9c6705c7f2b9853f28
 DIST VirtualGL-2.5.2.tar.gz 1172965 SHA256 4f43387678b289a24139c5b7c3699740ca555a9f10011c979e51aa4df2b93238 SHA512 a3156f663c03e611a98a083bb12bea47820cdadc9f064e20431fddec55aae560f09b133f5254a24d7da01b64be2672d27713d7f6605eaca2d9d83090a070fafd WHIRLPOOL 33efef4b83def93908dfdd89aecb1a075b68258dc5f7909af2bcf6f1047c7dc83f5aa125366517a03abb21c97d64428a0d4f21064a686facc49f34ae486e59d7
 EBUILD virtualgl-2.4.1-r3.ebuild 2352 SHA256 ff4c11af7d71a032f036a30c432ae46a9d317b9baa05aa84a4ae74f8e1b9c0ee SHA512 93d2e74d07c2298946d75098b04b9688cf996fd82e9d6d38ef1291515bcdf7a79257b39a9bae293ac0b215cc016451408e812750e41ac9296c7776af405faf7c WHIRLPOOL 7c3bf527445d8445d842eae417740f25e47b380553e9b2342b2352bc9c4fb8f1f9dd14f9c3c97855dc76238990a530deff42242ab9665e1eecf196e746ea6b30
 EBUILD virtualgl-2.5.1.ebuild 2311 SHA256 8df8d5a6a62c165a4a6eeddf096d11e3c9293c7652e95a57b8873f322e3d8d4e SHA512 71aa964664ef87e51d8b6cb0904aeab5401d7615625a247dc4ed2a86e101de2f4c8e7cb564b12098a0170b14a2928ff86a4f8a0845b042c0c07362ef7c6e7ea3 WHIRLPOOL 6bb857c2535e6f25624fd754a1812e4ad7adefce2bb29ea5f5c96772ec397655c5cce3a8f8133393e5dcdf46b3524ac3eeb09df29c071fcedb97ba05c69b9a51
-EBUILD virtualgl-2.5.2.ebuild 2502 SHA256 62856c26d6b27163efd04d7d774638b0e049ebeb41d5619c42eccb43606026d3 SHA512 e65f5a9a4ff8e962fc879b573a57198f37f0e90526d248c59da9941cef905b64e6934ea7dc535799c807b8b9cd1e1a7d64420b5b77b9e00d7211383874fad765 WHIRLPOOL fcdd3d3b3f1c7b506bdd8d72be6eda096f3b208092044dd2bf09282395d3c6d27e67215f384f22e4ccaaa4c8e6599be19a551493daaca9602591680bd0811274
+EBUILD virtualgl-2.5.2.ebuild 2501 SHA256 f07f965ee8d486521652b50c39abcab5da3f3e93ac6e900517bbc01288af4154 SHA512 4d9355a45a50f9c9faf42c9657438df4b197bf0c46e4b5bb8bc2f08c4aee8ec51947c48c8c2963df6199c2552a536ce3286cb759e486100aedeeca91d1c9c5c8 WHIRLPOOL 63064ef3fbbeaa6b194739d3df23767eb01100f92c7043f3041782c8877f5b70b4e0e7daee6c7a386d72e660a182fb862565b678e6a04bb43f974de96af58150
 MISC ChangeLog 4913 SHA256 3c2453f010faf5032e9f0ec8bd5c8f0c9f6e037cfb7b4c7e1911651af4d21fa8 SHA512 f7aee4d547fc7e55d4d6232ef99607a1f6502ccc13ab322b81b9b3128ed8d734bf15a6fdfd53a80133e3b1dd3a50845530ae0c88fd062a2519c44f5fbd44c7c3 WHIRLPOOL 87f2f6cd0e3c1c2fd508aab67b625be343ddb694c99ad2da4fc82516d6885b0ac914ec96d43349ebf8e04e684049ccda9748dc358ed1002070335fa49f3f467b
 MISC ChangeLog-2015 4575 SHA256 392fad0cbc6180c4bb57dec0a4c39937a4dc493c553c95c8a167e622fa443928 SHA512 f0b70469daa1d09f4afc769e48cf92bcdff603af354e7685c0ed54ff31915f95ae6f888937b222b8ed6846d84e077e19d15b0ba9034f42cf197eb408f0a68d80 WHIRLPOOL 804795c0e1cca265b5b620fcfb0de9456386dbfb72236d47bec005440457d47bfce387298e2d59c878c05ce76fb3fa9347139c50a18240df00142cfc7e0e0e61
 MISC metadata.xml 736 SHA256 31265fb384705bed457e2c673f898dfeab747ecaf64652eb037bd17c351158a0 SHA512 b1d37b1974a1db8cb9080279863708a6c1e50a86114ccfb17540980c178093ae6617b1bdfa470e73899277b44af231e41ec2b28504da5e335c0e34d509457600 WHIRLPOOL d07ecf0e3ae44a32cced673cc2dfeca55389ccd9fc1926002844aaf18da5067944f93080416439bb4bcf075c29578be57f0c4a7988aa8360b7b216d76f4c5615
diff --git a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
index 0c640fbb96e4..2f0cd2f41b49 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.5.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/files/${PV}/${MY_P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2.1 wxWinLL-3.1 FLTK"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="libressl ssl"
 
 RDEPEND="
diff --git a/x11-misc/xdg-user-dirs-gtk/Manifest b/x11-misc/xdg-user-dirs-gtk/Manifest
index c5fa81d73db7..6fab59736fed 100644
--- a/x11-misc/xdg-user-dirs-gtk/Manifest
+++ b/x11-misc/xdg-user-dirs-gtk/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-user-dirs-gtk-0.10.tar.xz 116528 SHA256 739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e SHA512 c3ef070244cd1c87312c2c2602dbe7bc3dd26eed632b0d8d779580d7ee6259efdda453ab7bdf4415cc72fad7a74d9dd36476189fe446d5627e4db75d905302f5 WHIRLPOOL 5fc149fd8f08569cf5d1223f6c1b7d7162a3b40554dd7af765b757fb2fad555dc6630ccbdbaf740a715c21519a5a168c303a3fd18ef1971728fad828628465f7
-EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1125 SHA256 07874525928b0e2675ef4688e1a85b23eea9f04ac558903efc85398213d38fc9 SHA512 1de4972c583fdd3bc0cf2382318e9c841d9197e03abefd34988d50466cf964f7c9ccf1ace85c7ddb9e83c53f67efee1afc502cda3683335a66c37c33a4e4610f WHIRLPOOL 544e4308685dae022f762ee2e1c99c373c962001b7ba1acf505ad5f0f8a9075ec2104766cf3dfa4cd3d05d172c682fde03f30e64d00c0528ffbdacd7ef83eff6
+EBUILD xdg-user-dirs-gtk-0.10-r1.ebuild 1124 SHA256 d22231f03db38c29d261d4e48fb0e5e39a49082e433c81ecffa29a84d5a0ab54 SHA512 12d84d3586c3b60e7aaf87b5fd15f8ed7165d7f3416366f4aa4d884bd695c2b3a53bbef5972b861fce671863b2aaedbf00e9a2ffa31afc54348d482e88b67d3f WHIRLPOOL 20bfb1b02b5f0256cabc8208f0c5833499708167f2d3945b73919d46742c20e69191fa4ed00eeeb0ee7d5bbc2b4f0d28e8222f9b22f4808fa97b9aef4c9cf885
 EBUILD xdg-user-dirs-gtk-0.10.ebuild 971 SHA256 f52a79962c86b8846eb53fb0b1e89f7b2ebcb9214a264dbd87e84020f7627572 SHA512 a0329ae6018e58854ee3af912f16b079f919c3a90628d3cdc683774b7a5ec54baf8149746d16eb75c0628e093bfadbfef0df7700886783d0b660877194a49f0f WHIRLPOOL b4956ca8eba8ff2b9a2f905d13164dbe636da470dbbcc8d1d489773b084b6e77db4751eac9e51cf7c916e9112f595edb38e5933c6f23c4e771ae98af45abc4ac
 MISC ChangeLog 3869 SHA256 868ad2d1b7416c04716a22e4593c3256bc34e58a76decc6fafb0ea2f3c3cfe0d SHA512 c7feddf3771c854dedec23eec1ba23c1fd977194f152a7b79c7edf66fa05d45f8dd0d342e2bd068387dc10e4c15021d8f998d0c0575208e50061e1a87ee4bfb4 WHIRLPOOL 8de541d9fddb2765bd06ecc1db088400c9571e938c5fc3773025b6517815a0cb8be60ba5ca4c07e4dec0b4cc3c068329720272c5fd357a633c6cc3d50c9dd998
 MISC ChangeLog-2015 4961 SHA256 6a56a36e887c416d9f0f98486606870679dedc0190cf3d9de644b895bf7a02b7 SHA512 001db61d95ef1c728ef3b206e3d1b2224c1006112ac8aec2e84407f0fd6f697c6ee01e0c7f48d550857e395672346c5022f408d4439d106be11a753bc985040b WHIRLPOOL e387632128a6cf0b93ecfa7b42a9b35c6530fd30221cd4c4f5cb9b61bd5610d3e718a2b14eb640962ad55eedb9cf4b3f7060048f522a24dde40f55b8f9377d8e
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
index 29421204e00d..8e95c693945b 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/xdg-user-dirs"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2017-11-03 18:18:28 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2017-11-03 18:18:28 +0000
commit	fceeaf01a28ee71065cf3798b70b77d3bc4ef199 (patch)
tree	6be36785f6ffa594c4dbd785b3213c995b5195b9
parent	27dfd272ae3be15b1017f733682211afa1c7c0f0 (diff)